fixed

apache · Mar 6, 2024 · fd9027e · fd9027e
1 parent db3e615
commit fd9027e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/paimon-core/src/main/java/org/apache/paimon/table/AbstractFileStoreTable.java b/paimon-core/src/main/java/org/apache/paimon/table/AbstractFileStoreTable.java
@@ -493,7 +493,8 @@ public TagManager tagManager() {
 
     @Override
     public BranchManager branchManager() {
-        return new BranchManager(fileIO, path, snapshotManager(), tagManager(), schemaManager());
+        return new BranchManager(
+                fileIO, path, snapshotManager(), tagManager(), schemaManager(), rollbackHelper());
     }
 
     private RollbackHelper rollbackHelper() {

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
@@ -26,6 +26,7 @@
 import org.apache.paimon.schema.TableSchema;
 import org.apache.paimon.table.FileStoreTable;
 import org.apache.paimon.table.FileStoreTableFactory;
+import org.apache.paimon.table.RollbackHelper;
 import org.apache.paimon.tag.TableTag;
 
 import org.slf4j.Logger;
@@ -57,18 +58,21 @@ public class BranchManager {
     private final SnapshotManager snapshotManager;
     private final TagManager tagManager;
     private final SchemaManager schemaManager;
+    private final RollbackHelper rollbackHelper;
 
     public BranchManager(
             FileIO fileIO,
             Path path,
             SnapshotManager snapshotManager,
             TagManager tagManager,
-            SchemaManager schemaManager) {
+            SchemaManager schemaManager,
+            RollbackHelper rollbackHelper) {
         this.fileIO = fileIO;
         this.tablePath = path;
         this.snapshotManager = snapshotManager;
         this.tagManager = tagManager;
         this.schemaManager = schemaManager;
+        this.rollbackHelper = rollbackHelper;
     }
 
     /** Commit specify branch to main. */
@@ -214,6 +218,9 @@ private void calculateCopyMainBranchToTargetBranch(String branchName) throws IOE
                 fileIO.copyFileUtf8(
                         snapshotManager.snapshotPath(snapshot.id()),
                         snapshotManager.snapshotPath(branchName, snapshot.id()));
+            } else {
+                // clear useless files
+                rollbackHelper.cleanLargerThan(snapshot);
             }
         }