fixed

sunxiaojian · Feb 26, 2024 · 080cfaa · 080cfaa
1 parent b060e12
commit 080cfaa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/paimon-core/src/main/java/org/apache/paimon/utils/BranchManager.java b/paimon-core/src/main/java/org/apache/paimon/utils/BranchManager.java
@@ -220,7 +220,7 @@ private boolean cleanMainBranch(TableBranch fromBranch) throws IOException {
         Snapshot fromSnapshot = snapshotManager.snapshot(fromBranch.getCreatedFromSnapshot());
         while (snapshots.hasNext()) {
             Snapshot snapshot = snapshots.next();
-            if (snapshot.timeMillis() >= fromSnapshot.timeMillis()) {
+            if (snapshot.id() >= fromSnapshot.id()) {
                 fileIO.delete(snapshotManager.snapshotPath(snapshot.id()), true);
             }
         }
@@ -291,7 +291,7 @@ private void calculateCopyMainBranchToTargetBranch(String branchName) throws IOE
                 // If it already exists, skip it directly
                 continue;
             }
-            if (snapshot.timeMillis() < fromSnapshot.timeMillis()) {
+            if (snapshot.id() < fromSnapshot.id()) {
                 fileIO.copyFileUtf8(
                         snapshotManager.snapshotPath(snapshot.id()),
                         snapshotManager.branchSnapshotPath(branchName, snapshot.id()));
@@ -307,7 +307,7 @@ private void calculateCopyMainBranchToTargetBranch(String branchName) throws IOE
                 // If it already exists, skip it directly
                 continue;
             }
-            if (tableSchema.timeMillis() < fromSnapshot.timeMillis()) {
+            if (tableSchema.id() < fromSnapshot.schemaId()) {
                 fileIO.copyFileUtf8(
                         schemaManager.toSchemaPath(schemaId),
                         schemaManager.branchSchemaPath(branchName, schemaId));

diff --git a/paimon-core/src/main/java/org/apache/paimon/utils/SnapshotManager.java b/paimon-core/src/main/java/org/apache/paimon/utils/SnapshotManager.java
@@ -259,7 +259,7 @@ public Iterator<Snapshot> snapshots() throws IOException {
 
     public Iterator<Snapshot> snapshotsWithBranch(String branchName) throws IOException {
         return listVersionedFiles(fileIO, snapshotDirByBranch(branchName), SNAPSHOT_PREFIX)
-                .map(this::snapshot)
+                .map(snapshotId -> snapshot(branchName, snapshotId))
                 .sorted(Comparator.comparingLong(Snapshot::id))
                 .iterator();
     }

diff --git a/.../paimon-flink-common/src/test/java/org/apache/paimon/flink/action/BranchActionITCase.java b/.../paimon-flink-common/src/test/java/org/apache/paimon/flink/action/BranchActionITCase.java
@@ -25,6 +25,7 @@
 import org.apache.paimon.types.DataTypes;
 import org.apache.paimon.types.RowType;
 import org.apache.paimon.utils.BranchManager;
+import org.apache.paimon.utils.SnapshotManager;
 import org.apache.paimon.utils.TagManager;
 
 import org.junit.jupiter.api.Test;
@@ -128,7 +129,14 @@ void testMergeBranchToTargetBranch() throws Exception {
                 String.format(
                         "CALL sys.merge_branch('%s.%s', 'merge_branch_name')",
                         database, tableName));
-        assertThat(branchManager.branchExists("merge_branch_name")).isFalse();
+        assertThat(branchManager.branchExists("merge_branch_name")).isTrue();
+        assertThat(tagManager.tagExists("tag3")).isFalse();
+
+        // Check snapshot
+        SnapshotManager snapshotManager = table.snapshotManager();
+        assertThat(snapshotManager.snapshotExists(3)).isFalse();
+        assertThat(snapshotManager.snapshotExists(4)).isFalse();
+        assertThat(snapshotManager.snapshotExists(5)).isFalse();
     }
 
     @Test