fix

apache · Jan 24, 2024 · 9591397 · 9591397
1 parent 170509b
commit 9591397
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/...on-core/src/main/java/org/apache/paimon/mergetree/compact/ChangelogMergeTreeRewriter.java b/...on-core/src/main/java/org/apache/paimon/mergetree/compact/ChangelogMergeTreeRewriter.java
@@ -68,7 +68,7 @@ public ChangelogMergeTreeRewriter(
     protected abstract boolean rewriteChangelog(
             int outputLevel, boolean dropDelete, List<List<SortedRun>> sections);
 
-    protected abstract UpgradeChangelog upgradeChangelog(int outputLevel, DataFileMeta file);
+    protected abstract UpgradeStrategy upgradeChangelog(int outputLevel, DataFileMeta file);
 
     protected abstract MergeFunctionWrapper<ChangelogResult> createMergeWrapper(int outputLevel);
 
@@ -164,7 +164,7 @@ private CompactResult rewriteChangelogCompaction(
 
     @Override
     public CompactResult upgrade(int outputLevel, DataFileMeta file) throws Exception {
-        UpgradeChangelog strategy = upgradeChangelog(outputLevel, file);
+        UpgradeStrategy strategy = upgradeChangelog(outputLevel, file);
         if (strategy.changelog) {
             return rewriteChangelogCompaction(
                     outputLevel,
@@ -177,15 +177,15 @@ public CompactResult upgrade(int outputLevel, DataFileMeta file) throws Exceptio
     }
 
     /** Strategy for upgrade. */
-    protected enum UpgradeChangelog {
+    protected enum UpgradeStrategy {
         NO_CHANGELOG(false, false),
         CHANGELOG_NO_REWRITE(true, false),
         CHANGELOG_WITH_REWRITE(true, true);
 
         private final boolean changelog;
         private final boolean rewrite;
 
-        UpgradeChangelog(boolean changelog, boolean rewrite) {
+        UpgradeStrategy(boolean changelog, boolean rewrite) {
             this.changelog = changelog;
             this.rewrite = rewrite;
         }

diff --git a/...e/src/main/java/org/apache/paimon/mergetree/compact/FirstRowMergeTreeCompactRewriter.java b/...e/src/main/java/org/apache/paimon/mergetree/compact/FirstRowMergeTreeCompactRewriter.java
@@ -36,9 +36,9 @@
 import java.util.Comparator;
 import java.util.List;
 
-import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeChangelog.CHANGELOG_NO_REWRITE;
-import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeChangelog.CHANGELOG_WITH_REWRITE;
-import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeChangelog.NO_CHANGELOG;
+import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeStrategy.CHANGELOG_NO_REWRITE;
+import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeStrategy.CHANGELOG_WITH_REWRITE;
+import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeStrategy.NO_CHANGELOG;
 import static org.apache.paimon.utils.Preconditions.checkArgument;
 
 /**
@@ -80,7 +80,7 @@ protected boolean rewriteChangelog(
     }
 
     @Override
-    protected UpgradeChangelog upgradeChangelog(int outputLevel, DataFileMeta file) {
+    protected UpgradeStrategy upgradeChangelog(int outputLevel, DataFileMeta file) {
         if (file.level() != 0) {
             return NO_CHANGELOG;
         }

diff --git a/.../main/java/org/apache/paimon/mergetree/compact/FullChangelogMergeTreeCompactRewriter.java b/.../main/java/org/apache/paimon/mergetree/compact/FullChangelogMergeTreeCompactRewriter.java
@@ -33,8 +33,8 @@
 import java.util.Comparator;
 import java.util.List;
 
-import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeChangelog.CHANGELOG_NO_REWRITE;
-import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeChangelog.NO_CHANGELOG;
+import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeStrategy.CHANGELOG_NO_REWRITE;
+import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeStrategy.NO_CHANGELOG;
 
 /** A {@link MergeTreeCompactRewriter} which produces changelog files for each full compaction. */
 public class FullChangelogMergeTreeCompactRewriter extends ChangelogMergeTreeRewriter {
@@ -74,7 +74,7 @@ protected boolean rewriteChangelog(
     }
 
     @Override
-    protected UpgradeChangelog upgradeChangelog(int outputLevel, DataFileMeta file) {
+    protected UpgradeStrategy upgradeChangelog(int outputLevel, DataFileMeta file) {
         return outputLevel == maxLevel ? CHANGELOG_NO_REWRITE : NO_CHANGELOG;
     }
 

diff --git a/...ore/src/main/java/org/apache/paimon/mergetree/compact/LookupMergeTreeCompactRewriter.java b/...ore/src/main/java/org/apache/paimon/mergetree/compact/LookupMergeTreeCompactRewriter.java
@@ -34,9 +34,9 @@
 import java.util.Comparator;
 import java.util.List;
 
-import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeChangelog.CHANGELOG_NO_REWRITE;
-import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeChangelog.CHANGELOG_WITH_REWRITE;
-import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeChangelog.NO_CHANGELOG;
+import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeStrategy.CHANGELOG_NO_REWRITE;
+import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeStrategy.CHANGELOG_WITH_REWRITE;
+import static org.apache.paimon.mergetree.compact.ChangelogMergeTreeRewriter.UpgradeStrategy.NO_CHANGELOG;
 
 /**
  * A {@link MergeTreeCompactRewriter} which produces changelog files by lookup for the compaction
@@ -77,7 +77,7 @@ protected boolean rewriteChangelog(
     }
 
     @Override
-    protected UpgradeChangelog upgradeChangelog(int outputLevel, DataFileMeta file) {
+    protected UpgradeStrategy upgradeChangelog(int outputLevel, DataFileMeta file) {
         if (file.level() != 0) {
             return NO_CHANGELOG;
         }