[hudi] branch master updated: [HUDI-690] Filter out inflight compaction in exporter (#1667)

[vinoth]

This is an automated email from the ASF dual-hosted git repository.

vinoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git


The following commit(s) were added to refs/heads/master by this push:
     new 6c45095  [HUDI-690] Filter out inflight compaction in exporter (#1667)
6c45095 is described below

commit 6c450957ced051de6231ad047bce22752210b786
Author: Raymond Xu <2701446+xushi...@users.noreply.github.com>
AuthorDate: Tue May 26 09:23:34 2020 -0700

    [HUDI-690] Filter out inflight compaction in exporter (#1667)
---
 .../org/apache/hudi/common/table/timeline/HoodieDefaultTimeline.java | 4 ++--
 .../main/java/org/apache/hudi/utilities/HoodieSnapshotCopier.java    | 4 ++--
 .../main/java/org/apache/hudi/utilities/HoodieSnapshotExporter.java  | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

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
index 5fd7b0c..2be4a9e 100644
--- 
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
@@ -152,8 +152,8 @@ public class HoodieDefaultTimeline implements 
HoodieTimeline {
   }
 
   /**
-   * Get all instants (commits, delta commits, clean, savepoint, rollback) 
that result in actions, in the active
-   * timeline.
+   * Get all instants (commits, delta commits, compaction, clean, savepoint, 
rollback) that result in actions,
+   * in the active timeline.
    */
   public HoodieTimeline getAllCommitsTimeline() {
     return getTimelineOfActions(CollectionUtils.createSet(COMMIT_ACTION, 
DELTA_COMMIT_ACTION,
diff --git 
a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotCopier.java
 
b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotCopier.java
index b97cd99..651cbbf 100644
--- 
a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotCopier.java
+++ 
b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotCopier.java
@@ -74,10 +74,10 @@ public class HoodieSnapshotCopier implements Serializable {
     final SerializableConfiguration serConf = new 
SerializableConfiguration(jsc.hadoopConfiguration());
     final HoodieTableMetaClient tableMetadata = new 
HoodieTableMetaClient(fs.getConf(), baseDir);
     final BaseFileOnlyView fsView = new 
HoodieTableFileSystemView(tableMetadata,
-        
tableMetadata.getActiveTimeline().getCommitsTimeline().filterCompletedInstants());
+        
tableMetadata.getActiveTimeline().getCommitsAndCompactionTimeline().filterCompletedInstants());
     // Get the latest commit
     Option<HoodieInstant> latestCommit =
-        
tableMetadata.getActiveTimeline().getCommitsTimeline().filterCompletedInstants().lastInstant();
+        
tableMetadata.getActiveTimeline().getCommitsAndCompactionTimeline().filterCompletedInstants().lastInstant();
     if (!latestCommit.isPresent()) {
       LOG.warn("No commits present. Nothing to snapshot");
       return;
diff --git 
a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotExporter.java
 
b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotExporter.java
index 060d928..7e21b4e 100644
--- 
a/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotExporter.java
+++ 
b/hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieSnapshotExporter.java
@@ -146,7 +146,8 @@ public class HoodieSnapshotExporter {
 
   private Option<String> getLatestCommitTimestamp(FileSystem fs, Config cfg) {
     final HoodieTableMetaClient tableMetadata = new 
HoodieTableMetaClient(fs.getConf(), cfg.sourceBasePath);
-    Option<HoodieInstant> latestCommit = 
tableMetadata.getActiveTimeline().getCommitsTimeline().filterCompletedInstants().lastInstant();
+    Option<HoodieInstant> latestCommit = 
tableMetadata.getActiveTimeline().getCommitsAndCompactionTimeline()
+        .filterCompletedInstants().lastInstant();
     return latestCommit.isPresent() ? 
Option.of(latestCommit.get().getTimestamp()) : Option.empty();
   }
 
@@ -251,7 +252,7 @@ public class HoodieSnapshotExporter {
     FileSystem fs = FSUtils.getFs(cfg.sourceBasePath, 
jsc.hadoopConfiguration());
     HoodieTableMetaClient tableMetadata = new 
HoodieTableMetaClient(fs.getConf(), cfg.sourceBasePath);
     return new HoodieTableFileSystemView(tableMetadata, tableMetadata
-        .getActiveTimeline().getCommitsTimeline().filterCompletedInstants());
+        
.getActiveTimeline().getCommitsAndCompactionTimeline().filterCompletedInstants());
   }
 
   public static void main(String[] args) throws IOException {