Rework of comments

Author: Venu Reddy

ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/handler/CompactionCleaner.java

@@ -158,7 +158,6 @@ private void clean(CompactionInfo ci, long minOpenTxn, boolean metricsEnabled) t
           cleanUsingAcidDir(ci, t, path, cleanerWaterMark);
         }
       } else {
-        ci.setSoftDelete(true);
         cleanUsingLocation(ci, location, false);
       }
     } catch (Exception e) {
@@ -177,6 +176,7 @@ private void clean(CompactionInfo ci, long minOpenTxn, boolean metricsEnabled) t
 
   private void cleanUsingLocation(CompactionInfo ci, String path, boolean requiresLock) throws MetaException {
     List<Path> deleted;
+    ci.setSoftDelete(true);
     if (requiresLock) {
       LockRequest lockRequest = createLockRequest(ci);
       LockResponse res = null;

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/jdbc/functions/MarkCleanedFunction.java

@@ -50,7 +50,12 @@ public MarkCleanedFunction(CompactionInfo info) {
   public Void execute(MultiDataSourceJdbcResource jdbcResource) throws MetaException {
     NamedParameterJdbcTemplate jdbcTemplate = jdbcResource.getJdbcTemplate();
     MapSqlParameterSource param;
-    if (!info.isAbortedTxnCleanup() && !info.isSoftDelete()) {
+    if (info.isSoftDelete()) {
+      // Remove compaction queue record and return
+      removeCompactionAndAbortRetryEntries(info, jdbcTemplate);
+      return null;
+    }
+    if (!info.isAbortedTxnCleanup()) {
       param = new MapSqlParameterSource()
           .addValue("id", info.id)
           .addValue("succeeded", Character.toString(SUCCEEDED_STATE), Types.CHAR);
@@ -85,10 +90,6 @@ public Void execute(MultiDataSourceJdbcResource jdbcResource) throws MetaExcepti
      */
     removeCompactionAndAbortRetryEntries(info, jdbcTemplate);
 
-    if (info.isSoftDelete()) {
-      return null;
-    }
-
     if (!info.isAbortedTxnCleanup()) {
       // Remove entries from completed_txn_components as well, so we don't start looking there
       // again but only up to the highest write ID include in this compaction job.