fix comments

apache · Apr 1, 2024 · cabfcb6 · cabfcb6
1 parent d871ee5
commit cabfcb6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/paimon-core/src/main/java/org/apache/paimon/Changelog.java b/paimon-core/src/main/java/org/apache/paimon/Changelog.java
@@ -33,13 +33,12 @@
 /**
  * The metadata of changelog. It generates from the snapshot file during expiration. So that the
  * changelog of the table can outlive the snapshot's lifecycle. A table's changelog can come from
- * two source:
+ * one source:
  * <li>The changelog file. Eg: from the changelog-producer = 'input'
- * <li>The delta files in the APPEND commits when the changelog-producer = 'none'
  */
 public class Changelog extends Snapshot {
 
-    private static final int CURRENT_VERSION = 1;
+    private static final int CURRENT_VERSION = Snapshot.CURRENT_VERSION;
 
     public Changelog(
             long id,

diff --git a/paimon-core/src/main/java/org/apache/paimon/Snapshot.java b/paimon-core/src/main/java/org/apache/paimon/Snapshot.java
@@ -69,7 +69,7 @@ public class Snapshot {
     public static final long FIRST_SNAPSHOT_ID = 1;
 
     public static final int TABLE_STORE_02_VERSION = 1;
-    private static final int CURRENT_VERSION = 3;
+    protected static final int CURRENT_VERSION = 3;
 
     protected static final String FIELD_VERSION = "version";
     protected static final String FIELD_ID = "id";

diff --git a/paimon-core/src/main/java/org/apache/paimon/operation/AbstractFileStoreScan.java b/paimon-core/src/main/java/org/apache/paimon/operation/AbstractFileStoreScan.java
@@ -18,7 +18,6 @@
 
 package org.apache.paimon.operation;
 
-import org.apache.paimon.Changelog;
 import org.apache.paimon.CoreOptions;
 import org.apache.paimon.Snapshot;
 import org.apache.paimon.data.BinaryRow;
@@ -387,10 +386,6 @@ private List<ManifestFileMeta> readManifests(Snapshot snapshot) {
             case DELTA:
                 return snapshot.deltaManifests(manifestList);
             case CHANGELOG:
-                if (snapshot instanceof Changelog) {
-                    return snapshot.changelogManifests(manifestList);
-                }
-
                 if (snapshot.version() > Snapshot.TABLE_STORE_02_VERSION) {
                     return snapshot.changelogManifests(manifestList);
                 }

diff --git a/paimon-core/src/main/java/org/apache/paimon/table/ExpireSnapshotsImpl.java b/paimon-core/src/main/java/org/apache/paimon/table/ExpireSnapshotsImpl.java
@@ -243,6 +243,7 @@ public int expireUntil(long earliestId, long endExclusiveId) {
                                     snapshot.changelogRecordCount(),
                                     snapshot.watermark(),
                                     null);
+                    commitChangelog(changelog);
                     snapshotDeletion.cleanUnusedManifests(snapshot, skippingSet, false);
                 } else {
                     // no changelog
@@ -264,14 +265,9 @@ public int expireUntil(long earliestId, long endExclusiveId) {
                                     snapshot.changelogRecordCount(),
                                     snapshot.watermark(),
                                     snapshot.statistics());
+                    commitChangelog(changelog);
                     snapshotDeletion.cleanUnusedManifests(snapshot, skippingSet, true);
                 }
-                try {
-                    snapshotManager.commitChangelog(changelog, id);
-                    snapshotManager.commitLongLivedChangelogLatestHint(id);
-                } catch (IOException e) {
-                    throw new UncheckedIOException(e);
-                }
             } else {
                 snapshotDeletion.cleanUnusedManifests(snapshot, skippingSet, true);
             }
@@ -282,6 +278,15 @@ public int expireUntil(long earliestId, long endExclusiveId) {
         return (int) (endExclusiveId - beginInclusiveId);
     }
 
+    private void commitChangelog(Changelog changelog) {
+        try {
+            snapshotManager.commitChangelog(changelog, changelog.id());
+            snapshotManager.commitLongLivedChangelogLatestHint(changelog.id());
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
     private void writeEarliestHint(long earliest) {
         try {
             snapshotManager.commitEarliestHint(earliest);

diff --git a/paimon-core/src/main/java/org/apache/paimon/table/RollbackHelper.java b/paimon-core/src/main/java/org/apache/paimon/table/RollbackHelper.java
@@ -156,9 +156,6 @@ private List<Changelog> cleanLongLivedChangelogDataFiles(Snapshot retainedSnapsh
             if (changelog.changelogManifestList() != null) {
                 snapshotDeletion.deleteAddedDataFiles(changelog.changelogManifestList());
             }
-            if (changelog.deltaManifestList() != null) {
-                snapshotDeletion.deleteAddedDataFiles(changelog.deltaManifestList());
-            }
         }
 
         // delete directories