test refactor + use junit5

Author: deniskuzZ

ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/CompactorTest.java

@@ -724,26 +724,36 @@ protected long compactInTxn(CompactionRequest rqst) throws Exception {
 
   long compactInTxn(CompactionRequest rqst, CommitAction commitAction) throws Exception {
     txnHandler.compact(rqst);
+
     FindNextCompactRequest findNextCompactRequest = new FindNextCompactRequest();
     findNextCompactRequest.setWorkerId("fred");
     findNextCompactRequest.setWorkerVersion(WORKER_VERSION);
+
     CompactionInfo ci = txnHandler.findNextToCompact(findNextCompactRequest);
     ci.runAs = rqst.getRunas() == null ? System.getProperty("user.name") : rqst.getRunas();
+
     long compactorTxnId = openTxn(TxnType.COMPACTION);
+
     // Need to create a valid writeIdList to set the highestWriteId in ci
-    ValidTxnList validTxnList = TxnCommonUtils.createValidReadTxnList(txnHandler.getOpenTxns(), compactorTxnId);
-    GetValidWriteIdsRequest writeIdsRequest = new GetValidWriteIdsRequest();
+    ValidTxnList validTxnList = TxnCommonUtils.createValidReadTxnList(
+        txnHandler.getOpenTxns(Collections.singletonList(TxnType.READ_ONLY)), compactorTxnId);
+
+    GetValidWriteIdsRequest writeIdsRequest = new GetValidWriteIdsRequest(
+        Collections.singletonList(ci.getFullTableName()));
     writeIdsRequest.setValidTxnList(validTxnList.writeToString());
-    writeIdsRequest.setFullTableNames(
-        Collections.singletonList(TxnUtils.getFullTableName(rqst.getDbname(), rqst.getTablename())));
+
     // with this ValidWriteIdList is capped at whatever HWM validTxnList has
     ValidCompactorWriteIdList tblValidWriteIds = TxnUtils.createValidCompactWriteIdList(
-        txnHandler.getValidWriteIds(writeIdsRequest).getTblValidWriteIds().getFirst());
+        txnHandler.getValidWriteIds(writeIdsRequest).getTblValidWriteIds()
+            .getFirst());
 
     ci.highestWriteId = tblValidWriteIds.getHighWatermark();
     txnHandler.updateCompactorState(ci, compactorTxnId);
 
     switch (commitAction) {
+      case MARK_COMPACTED ->
+        txnHandler.markCompacted(ci);
+
       case COMMIT -> {
         txnHandler.markCompacted(ci);
         txnHandler.commitTxn(new CommitTxnRequest(compactorTxnId));
@@ -760,6 +770,7 @@ long compactInTxn(CompactionRequest rqst, CommitAction commitAction) throws Exce
   enum CommitAction {
     COMMIT,
     ABORT,
+    MARK_COMPACTED,
     NONE
   }
 

ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestAbortCleanupUsingCompactionCycle.java

@@ -18,13 +18,15 @@
 package org.apache.hadoop.hive.ql.txn.compactor;
 
 import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
+import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars;
 import org.junit.jupiter.api.BeforeEach;
 
 public class TestAbortCleanupUsingCompactionCycle extends TestCleaner {
-  @Override
+
   @BeforeEach
+  @Override
   public void setup() throws Exception {
     super.setup();
-    MetastoreConf.setBoolVar(conf, MetastoreConf.ConfVars.COMPACTOR_CLEAN_ABORTS_USING_CLEANER, false);
+    MetastoreConf.setBoolVar(conf, ConfVars.COMPACTOR_CLEAN_ABORTS_USING_CLEANER, false);
   }
 }

ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestAbortCleanupUsingCompactionCycleWithMinHistoryWriteId.java

@@ -18,14 +18,16 @@
 package org.apache.hadoop.hive.ql.txn.compactor;
 
 import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
+import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars;
 import org.junit.jupiter.api.BeforeEach;
 
 public class TestAbortCleanupUsingCompactionCycleWithMinHistoryWriteId extends TestCleaner {
-  @Override
+
   @BeforeEach
+  @Override
   public void setup() throws Exception {
     super.setup();
-    MetastoreConf.setBoolVar(conf, MetastoreConf.ConfVars.COMPACTOR_CLEAN_ABORTS_USING_CLEANER, false);
+    MetastoreConf.setBoolVar(conf, ConfVars.COMPACTOR_CLEAN_ABORTS_USING_CLEANER, false);
   }
 
   @Override