Backport to branch(3) : Merge ConsensusCommitTestUtils and ConsensusCommitIntegrationTestUtils (#2737)

feeblefakie · brfrn169 · web-flow · commit d09dedb015e9 · 2025-06-05T12:44:59.000+09:00
Co-authored-by: Toshihiro Suzuki &lt;brfrn169@gmail.com&gt;
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminImportTableIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminImportTableIntegrationTestBase.java
@@ -12,7 +12,7 @@ protected final Properties getProperties(String testName) {
     properties.putAll(getProps(testName));
 
     // Add testName as a coordinator namespace suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
 
     return properties;
   }
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminIntegrationTestBase.java
@@ -17,7 +17,7 @@ protected final Properties getProperties(String testName) {
     properties.putAll(getProps(testName));
 
     // Add testName as a coordinator namespace suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
 
     return properties;
   }
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminRepairTableIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminRepairTableIntegrationTestBase.java
@@ -12,7 +12,7 @@ protected final Properties getProperties(String testName) {
     properties.putAll(getProps(testName));
 
     // Add testName as a coordinator namespace suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
 
     return properties;
   }
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitCrossPartitionScanIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitCrossPartitionScanIntegrationTestBase.java
@@ -28,7 +28,7 @@ protected final Properties getProperties(String testName) {
     properties.putAll(getProps(testName));
 
     // Add testName as a coordinator namespace suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
 
     return properties;
   }
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitIntegrationTestBase.java
@@ -31,7 +31,7 @@ protected final Properties getProperties(String testName) {
     properties.putAll(getProps(testName));
 
     // Add testName as a coordinator namespace suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
 
     return properties;
   }
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitIntegrationTestUtils.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitIntegrationTestUtils.java
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitNullMetadataIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitNullMetadataIntegrationTestBase.java
@@ -83,7 +83,7 @@ public void beforeAll() throws Exception {
     Properties properties = getProperties(TEST_NAME);
 
     // Add testName as a coordinator namespace suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, TEST_NAME);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, TEST_NAME);
 
     StorageFactory factory = StorageFactory.create(properties);
     admin = factory.getStorageAdmin();
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitSpecificIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitSpecificIntegrationTestBase.java
@@ -111,7 +111,7 @@ public void beforeAll() throws Exception {
     Properties properties = getProperties(TEST_NAME);
 
     // Add testName as a coordinator namespace suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, TEST_NAME);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, TEST_NAME);
 
     StorageFactory factory = StorageFactory.create(properties);
     admin = factory.getStorageAdmin();
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitTestUtils.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitTestUtils.java
@@ -71,4 +71,11 @@ public static Properties loadConsensusCommitProperties(Properties properties) {
         COORDINATOR_GROUP_COMMIT_METRICS_MONITOR_LOG_ENABLED);
     return properties;
   }
+
+  public static void addSuffixToCoordinatorNamespace(Properties properties, String suffix) {
+    String coordinatorNamespace =
+        properties.getProperty(ConsensusCommitConfig.COORDINATOR_NAMESPACE, Coordinator.NAMESPACE);
+    properties.setProperty(
+        ConsensusCommitConfig.COORDINATOR_NAMESPACE, coordinatorNamespace + "_" + suffix);
+  }
 }
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitWithIncludeMetadataEnabledIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitWithIncludeMetadataEnabledIntegrationTestBase.java
@@ -60,7 +60,7 @@ public void beforeAll() throws Exception {
     Properties properties = getProperties(TEST_NAME);
 
     // Add testName as a coordinator namespace suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, TEST_NAME);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, TEST_NAME);
 
     // Enable to include metadata
     properties.setProperty(ConsensusCommitConfig.INCLUDE_METADATA_ENABLED, "true");
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/TwoPhaseConsensusCommitCrossPartitionScanIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/TwoPhaseConsensusCommitCrossPartitionScanIntegrationTestBase.java
@@ -28,7 +28,7 @@ protected final Properties getProperties1(String testName) {
     properties.putAll(getProps1(testName));
 
     // Add testName as a coordinator namespace suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
 
     return properties;
   }
@@ -39,7 +39,7 @@ protected final Properties getProperties2(String testName) {
     properties.putAll(getProps2(testName));
 
     // Add testName as a coordinator namespace suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
 
     return properties;
   }
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/TwoPhaseConsensusCommitIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/TwoPhaseConsensusCommitIntegrationTestBase.java
@@ -17,7 +17,7 @@ protected final Properties getProperties1(String testName) {
     properties.putAll(getProps1(testName));
 
     // Add testName as a coordinator namespace suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
 
     return properties;
   }
@@ -28,7 +28,7 @@ protected final Properties getProperties2(String testName) {
     properties.putAll(getProps2(testName));
 
     // Add testName as a coordinator namespace suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
 
     return properties;
   }
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/TwoPhaseConsensusCommitSpecificIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/TwoPhaseConsensusCommitSpecificIntegrationTestBase.java
@@ -74,11 +74,11 @@ public void beforeAll() throws Exception {
     initialize();
     Properties properties1 = getProperties1(TEST_NAME);
     // Add testName as a coordinator namespace suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties1, TEST_NAME);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties1, TEST_NAME);
 
     Properties properties2 = getProperties2(TEST_NAME);
     // Add testName as a coordinator namespace suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties2, TEST_NAME);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties2, TEST_NAME);
 
     namespace1 = getNamespace1();
     namespace2 = getNamespace2();
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/TwoPhaseConsensusCommitWithIncludeMetadataEnabledIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/TwoPhaseConsensusCommitWithIncludeMetadataEnabledIntegrationTestBase.java
@@ -60,7 +60,7 @@ public void beforeAll() throws Exception {
     Properties properties = getProperties(TEST_NAME);
 
     // Add testName as a coordinator namespace suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, TEST_NAME);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, TEST_NAME);
 
     // Enable to include metadata
     properties.setProperty(ConsensusCommitConfig.INCLUDE_METADATA_ENABLED, "true");

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ protected final Properties getProperties(String testName) {`
`12`	`12`	`properties.putAll(getProps(testName));`
`13`	`13`
`14`	`14`	`// Add testName as a coordinator namespace suffix`
`15`		`- ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);`
	`15`	`+ ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);`
`16`	`16`
`17`	`17`	`return properties;`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ protected final Properties getProperties(String testName) {`
`17`	`17`	`properties.putAll(getProps(testName));`
`18`	`18`
`19`	`19`	`// Add testName as a coordinator namespace suffix`
`20`		`- ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);`
	`20`	`+ ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);`
`21`	`21`
`22`	`22`	`return properties;`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ protected final Properties getProperties(String testName) {`
`28`	`28`	`properties.putAll(getProps(testName));`
`29`	`29`
`30`	`30`	`// Add testName as a coordinator namespace suffix`
`31`		`- ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);`
	`31`	`+ ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);`
`32`	`32`
`33`	`33`	`return properties;`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ protected final Properties getProperties(String testName) {`
`31`	`31`	`properties.putAll(getProps(testName));`
`32`	`32`
`33`	`33`	`// Add testName as a coordinator namespace suffix`
`34`		`- ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);`
	`34`	`+ ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);`
`35`	`35`
`36`	`36`	`return properties;`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,4 +71,11 @@ public static Properties loadConsensusCommitProperties(Properties properties) {`
`71`	`71`	`COORDINATOR_GROUP_COMMIT_METRICS_MONITOR_LOG_ENABLED);`
`72`	`72`	`return properties;`
`73`	`73`	`}`
	`74`	`+`
	`75`	`+ public static void addSuffixToCoordinatorNamespace(Properties properties, String suffix) {`
	`76`	`+ String coordinatorNamespace =`
	`77`	`+ properties.getProperty(ConsensusCommitConfig.COORDINATOR_NAMESPACE, Coordinator.NAMESPACE);`
	`78`	`+ properties.setProperty(`
	`79`	`+ ConsensusCommitConfig.COORDINATOR_NAMESPACE, coordinatorNamespace + "_" + suffix);`
	`80`	`+ }`
`74`	`81`	`}`