From 0bc22b68a753981ad6b0b5ee49ec7f0bc2c23c3b Mon Sep 17 00:00:00 2001
From: Manoj Govindassamy <manoj.govindassamy@gmail.com>
Date: Fri, 19 Nov 2021 11:33:33 -0800
Subject: [PATCH] [HUDI-2796] Metadata table support for Restore action to
 first commit

 - Test fixes and other minor review comments
---
 .../apache/hudi/metadata/HoodieBackedTableMetadataWriter.java | 3 ---
 .../hudi/client/functional/TestHoodieBackedMetadata.java      | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadataWriter.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadataWriter.java
index ffb7d6f57376..5ae85cc4a545 100644
--- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadataWriter.java
+++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadataWriter.java
@@ -362,7 +362,6 @@ private <T extends SpecificRecordBase> boolean isBootstrapNeeded(Option<HoodieIn
    */
   private <T extends SpecificRecordBase> boolean isCommitRevertedByInFlightAction(Option<T> actionMetadata,
                                                                                   final String latestMetadataInstantTimestamp) {
-
     if (!actionMetadata.isPresent()) {
       return false;
     }
@@ -384,7 +383,6 @@ private <T extends SpecificRecordBase> boolean isCommitRevertedByInFlightAction(
           return true;
         }
         break;
-
       case HoodieTimeline.RESTORE_ACTION:
         List<HoodieInstantInfo> restoredInstants =
             ((HoodieRestoreMetadata) actionMetadata.get()).getRestoreInstantInfo();
@@ -396,7 +394,6 @@ private <T extends SpecificRecordBase> boolean isCommitRevertedByInFlightAction(
           return true;
         }
         break;
-
       default:
         return false;
     }
diff --git a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieBackedMetadata.java b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieBackedMetadata.java
index 9cf6ed4bccda..59e12a1515ad 100644
--- a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieBackedMetadata.java
+++ b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieBackedMetadata.java
@@ -361,7 +361,7 @@ public void testRollbackOperations(HoodieTableType tableType) throws Exception {
   @Test
   public void testManualRollbacks() throws Exception {
     HoodieTableType tableType = COPY_ON_WRITE;
-    init(tableType, true);
+    init(tableType, false);
     // Setting to archive more aggressively on the Metadata Table than the Dataset
     final int maxDeltaCommitsBeforeCompaction = 4;
     final int minArchiveCommitsMetadata = 2;
@@ -871,7 +871,7 @@ public void testReader() throws Exception {
    */
   @Test
   public void testCleaningArchivingAndCompaction() throws Exception {
-    init(HoodieTableType.COPY_ON_WRITE, true);
+    init(HoodieTableType.COPY_ON_WRITE, false);
     HoodieSparkEngineContext engineContext = new HoodieSparkEngineContext(jsc);
 
     final int maxDeltaCommitsBeforeCompaction = 3;