From 04afac977d4bd615c217349083b5f86cfa8060c4 Mon Sep 17 00:00:00 2001 From: leesf <490081539@qq.com> Date: Thu, 9 Jan 2020 17:43:34 +0800 Subject: [PATCH] [HUDI-248] CLI doesn't allow rolling back a Delta commit --- .../org/apache/hudi/cli/commands/CommitsCommand.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CommitsCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CommitsCommand.java index a7cf32a05..c0f8ead41 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CommitsCommand.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/CommitsCommand.java @@ -95,11 +95,10 @@ public class CommitsCommand implements CommandMarker { @CliOption(key = {"sparkProperties"}, help = "Spark Properties File Path") final String sparkPropertiesPath) throws Exception { HoodieActiveTimeline activeTimeline = HoodieCLI.getTableMetaClient().getActiveTimeline(); - HoodieTimeline timeline = activeTimeline.getCommitsTimeline().filterCompletedInstants(); - HoodieInstant commitInstant = new HoodieInstant(false, HoodieTimeline.COMMIT_ACTION, commitTime); - - if (!timeline.containsInstant(commitInstant)) { - return "Commit " + commitTime + " not found in Commits " + timeline; + HoodieTimeline completedTimeline = activeTimeline.getCommitsTimeline().filterCompletedInstants(); + HoodieTimeline filteredTimeline = completedTimeline.filter(instant -> instant.getTimestamp().equals(commitTime)); + if (filteredTimeline.empty()) { + return "Commit " + commitTime + " not found in Commits " + completedTimeline; } SparkLauncher sparkLauncher = SparkUtil.initLauncher(sparkPropertiesPath);