add filterMorCompactionInstants for append

XuQianJin-Stars · Sep 18, 2022 · 2ebd741 · 2ebd741
1 parent 649283e
commit 2ebd741
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieAppendHandle.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieAppendHandle.java
@@ -149,7 +149,7 @@ private void init(HoodieRecord record) {
       List<String> logFiles = new ArrayList<>();
 
       Option<HoodieInstant> maxCompleteInstant = hoodieTable.getMetaClient().getActiveTimeline().getWriteTimeline()
-          .filterCompletedCompactionInstants().lastInstant();
+          .filterMorCompactionInstants().lastInstant();
       if (maxCompleteInstant.isPresent()) {
         if (fileSlice.isPresent()) {
           baseInstantTime = fileSlice.get().getBaseInstantTime();

diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieDefaultTimeline.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieDefaultTimeline.java
@@ -109,10 +109,11 @@ public HoodieTimeline filterCompletedAndCompactionInstants() {
   }
 
   @Override
-  public HoodieTimeline filterCompletedCompactionInstants() {
+  public HoodieTimeline filterMorCompactionInstants() {
     // Note: use for mor.
-    return new HoodieDefaultTimeline(instants.stream().filter(s -> s.isCompleted()
-        && s.getAction().equals(HoodieTimeline.COMMIT_ACTION)), details);
+    return new HoodieDefaultTimeline(instants.stream().filter(s ->
+        ((s.isRequested() || s.isInflight()) && s.getAction().equals(HoodieTimeline.COMPACTION_ACTION))
+            || (s.isCompleted() && s.getAction().equals(HoodieTimeline.COMMIT_ACTION))), details);
   }
 
   @Override

diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieTimeline.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieTimeline.java
@@ -146,7 +146,7 @@ public interface HoodieTimeline extends Serializable {
    *
    * @return New instance of HoodieTimeline with just completed compaction instants
    */
-  HoodieTimeline filterCompletedCompactionInstants();
+  HoodieTimeline filterMorCompactionInstants();
 
   /**
    * Timeline to just include commits (commit/deltacommit), compaction and replace actions.