Merge branch 'master' into support-begin-in-read-only-mode

Author: brfrn169

.github/workflows/release-snapshot.yaml

@@ -30,7 +30,7 @@ jobs:
           VERSION=$(./gradlew :core:properties -q | grep "version:" | awk '{print $2}')
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
 
-      - name: Upload SNAPSHOT versions for scalardb, scalardb-schema-loader, and scalardb-integration-test to Maven Snapshot Repository
+      - name: Upload SNAPSHOT versions for scalardb, scalardb-schema-loader, scalardb-data-loader-core, and scalardb-integration-test to Maven Snapshot Repository
         if: contains(steps.version.outputs.version, '-SNAPSHOT')
         run: |
           echo "${{secrets.SIGNING_SECRET_KEY_RING}}" | base64 -d > ~/.gradle/secring.gpg

.github/workflows/upload-artifacts.yaml

@@ -57,7 +57,7 @@ jobs:
         run: |
           docker push ghcr.io/scalar-labs/scalardb-schema-loader:${{ steps.version.outputs.version }}
 
-      - name: Upload scalardb, scalardb-schema-loader, and scalardb-integration-test to Maven Central Repository
+      - name: Upload scalardb, scalardb-schema-loader, scalardb-data-loader-core, and scalardb-integration-test to Maven Central Repository
         run: |
           echo "${{secrets.SIGNING_SECRET_KEY_RING}}" | base64 -d > ~/.gradle/secring.gpg
           ./gradlew publish \

core/src/integration-test/java/com/scalar/db/storage/cassandra/ConsensusCommitCassandraEnv.java

@@ -1,6 +1,5 @@
 package com.scalar.db.storage.cassandra;
 
-import com.scalar.db.transaction.consensuscommit.ConsensusCommitIntegrationTestUtils;
 import com.scalar.db.transaction.consensuscommit.ConsensusCommitTestUtils;
 import java.util.Properties;
 
@@ -11,7 +10,7 @@ public static Properties getProperties(String testName) {
     Properties properties = CassandraEnv.getProperties(testName);
 
     // Add testName as a coordinator schema suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
 
     return ConsensusCommitTestUtils.loadConsensusCommitProperties(properties);
   }

core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitCosmosEnv.java

@@ -1,6 +1,5 @@
 package com.scalar.db.storage.cosmos;
 
-import com.scalar.db.transaction.consensuscommit.ConsensusCommitIntegrationTestUtils;
 import com.scalar.db.transaction.consensuscommit.ConsensusCommitTestUtils;
 import java.util.Map;
 import java.util.Properties;
@@ -12,7 +11,7 @@ public static Properties getProperties(String testName) {
     Properties properties = CosmosEnv.getProperties(testName);
 
     // Add testName as a coordinator schema suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
 
     return ConsensusCommitTestUtils.loadConsensusCommitProperties(properties);
   }

core/src/integration-test/java/com/scalar/db/storage/dynamo/ConsensusCommitDynamoEnv.java

@@ -1,6 +1,5 @@
 package com.scalar.db.storage.dynamo;
 
-import com.scalar.db.transaction.consensuscommit.ConsensusCommitIntegrationTestUtils;
 import com.scalar.db.transaction.consensuscommit.ConsensusCommitTestUtils;
 import java.util.Map;
 import java.util.Properties;
@@ -12,7 +11,7 @@ public static Properties getProperties(String testName) {
     Properties properties = DynamoEnv.getProperties(testName);
 
     // Add testName as a coordinator schema suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
 
     return ConsensusCommitTestUtils.loadConsensusCommitProperties(properties);
   }

core/src/integration-test/java/com/scalar/db/storage/jdbc/ConsensusCommitJdbcEnv.java

@@ -1,6 +1,5 @@
 package com.scalar.db.storage.jdbc;
 
-import com.scalar.db.transaction.consensuscommit.ConsensusCommitIntegrationTestUtils;
 import com.scalar.db.transaction.consensuscommit.ConsensusCommitTestUtils;
 import java.util.Properties;
 
@@ -11,7 +10,7 @@ public static Properties getProperties(String testName) {
     Properties properties = JdbcEnv.getProperties(testName);
 
     // Add testName as a coordinator schema suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
 
     return ConsensusCommitTestUtils.loadConsensusCommitProperties(properties);
   }

core/src/integration-test/java/com/scalar/db/storage/multistorage/MultiStorageSchemaLoaderIntegrationTest.java

@@ -4,7 +4,7 @@
 import com.google.common.util.concurrent.Uninterruptibles;
 import com.scalar.db.config.DatabaseConfig;
 import com.scalar.db.schemaloader.SchemaLoaderIntegrationTestBase;
-import com.scalar.db.transaction.consensuscommit.ConsensusCommitIntegrationTestUtils;
+import com.scalar.db.transaction.consensuscommit.ConsensusCommitTestUtils;
 import com.scalar.db.transaction.consensuscommit.Coordinator;
 import com.scalar.db.util.AdminTestUtils;
 import java.nio.file.Path;
@@ -59,20 +59,18 @@ protected Properties getProperties(String testName) {
         DatabaseConfig.DEFAULT_SYSTEM_NAMESPACE_NAME + "_" + testName);
 
     // Add testName as a coordinator schema suffix
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
 
     return properties;
   }
 
   @Override
   protected AdminTestUtils getAdminTestUtils(String testName) {
     Properties propertiesForCassandra = MultiStorageEnv.getPropertiesForCassandra(testName);
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(
-        propertiesForCassandra, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(propertiesForCassandra, testName);
 
     Properties propertiesForJdbc = MultiStorageEnv.getPropertiesForJdbc(testName);
-    ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(
-        propertiesForJdbc, testName);
+    ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(propertiesForJdbc, testName);
 
     return new MultiStorageAdminTestUtils(propertiesForCassandra, propertiesForJdbc);
   }

core/src/main/java/com/scalar/db/api/DistributedTransaction.java

@@ -73,7 +73,7 @@ public interface DistributedTransaction extends TransactionCrudOperable {
    *     (e.g., a conflict error). You can retry the transaction from the beginning
    * @throws CommitException if the transaction fails to commit due to transient or nontransient
    *     faults. You can try retrying the transaction from the beginning, but the transaction may
-   *     still fail if the cause is nontranient
+   *     still fail if the cause is nontransient
    * @throws UnknownTransactionStatusException if the status of the commit is unknown
    */
   void commit() throws CommitConflictException, CommitException, UnknownTransactionStatusException;

core/src/main/java/com/scalar/db/api/TransactionCrudOperable.java

@@ -16,7 +16,7 @@ public interface TransactionCrudOperable extends CrudOperable<CrudException> {
    *     (e.g., a conflict error). You can retry the transaction from the beginning
    * @throws CrudException if the transaction CRUD operation fails due to transient or nontransient
    *     faults. You can try retrying the transaction from the beginning, but the transaction may
-   *     still fail if the cause is nontranient
+   *     still fail if the cause is nontransient
    */
   @Override
   Optional<Result> get(Get get) throws CrudConflictException, CrudException;
@@ -28,7 +28,7 @@ public interface TransactionCrudOperable extends CrudOperable<CrudException> {
    *     (e.g., a conflict error). You can retry the transaction from the beginning
    * @throws CrudException if the transaction CRUD operation fails due to transient or nontransient
    *     faults. You can try retrying the transaction from the beginning, but the transaction may
-   *     still fail if the cause is nontranient
+   *     still fail if the cause is nontransient
    */
   @Override
   List<Result> scan(Scan scan) throws CrudConflictException, CrudException;
@@ -40,7 +40,7 @@ public interface TransactionCrudOperable extends CrudOperable<CrudException> {
    *     (e.g., a conflict error). You can retry the transaction from the beginning
    * @throws CrudException if the transaction CRUD operation fails due to transient or nontransient
    *     faults. You can try retrying the transaction from the beginning, but the transaction may
-   *     still fail if the cause is nontranient
+   *     still fail if the cause is nontransient
    */
   @Override
   Scanner getScanner(Scan scan) throws CrudConflictException, CrudException;
@@ -52,7 +52,7 @@ public interface TransactionCrudOperable extends CrudOperable<CrudException> {
    *     (e.g., a conflict error). You can retry the transaction from the beginning
    * @throws CrudException if the transaction CRUD operation fails due to transient or nontransient
    *     faults. You can try retrying the transaction from the beginning, but the transaction may
-   *     still fail if the cause is nontranient
+   *     still fail if the cause is nontransient
    * @throws UnsatisfiedConditionException if a condition is specified, and if the condition is not
    *     satisfied or the entry does not exist
    * @deprecated As of release 3.13.0. Will be removed in release 5.0.0.
@@ -68,7 +68,7 @@ public interface TransactionCrudOperable extends CrudOperable<CrudException> {
    *     (e.g., a conflict error). You can retry the transaction from the beginning
    * @throws CrudException if the transaction CRUD operation fails due to transient or nontransient
    *     faults. You can try retrying the transaction from the beginning, but the transaction may
-   *     still fail if the cause is nontranient
+   *     still fail if the cause is nontransient
    * @throws UnsatisfiedConditionException if a condition is specified, and if the condition is not
    *     satisfied or the entry does not exist
    * @deprecated As of release 3.13.0. Will be removed in release 5.0.0. Use {@link #mutate(List)}
@@ -86,7 +86,7 @@ void put(List<Put> puts)
    *     (e.g., a conflict error). You can retry the transaction from the beginning
    * @throws CrudException if the transaction CRUD operation fails due to transient or nontransient
    *     faults. You can try retrying the transaction from the beginning, but the transaction may
-   *     still fail if the cause is nontranient
+   *     still fail if the cause is nontransient
    */
   @Override
   void insert(Insert insert) throws CrudConflictException, CrudException;
@@ -98,7 +98,7 @@ void put(List<Put> puts)
    *     (e.g., a conflict error). You can retry the transaction from the beginning
    * @throws CrudException if the transaction CRUD operation fails due to transient or nontransient
    *     faults. You can try retrying the transaction from the beginning, but the transaction may
-   *     still fail if the cause is nontranient
+   *     still fail if the cause is nontransient
    */
   @Override
   void upsert(Upsert upsert) throws CrudConflictException, CrudException;
@@ -110,7 +110,7 @@ void put(List<Put> puts)
    *     (e.g., a conflict error). You can retry the transaction from the beginning
    * @throws CrudException if the transaction CRUD operation fails due to transient or nontransient
    *     faults. You can try retrying the transaction from the beginning, but the transaction may
-   *     still fail if the cause is nontranient
+   *     still fail if the cause is nontransient
    * @throws UnsatisfiedConditionException if a condition is specified, and if the condition is not
    *     satisfied or the entry does not exist
    */
@@ -125,7 +125,7 @@ void update(Update update)
    *     (e.g., a conflict error). You can retry the transaction from the beginning
    * @throws CrudException if the transaction CRUD operation fails due to transient or nontransient
    *     faults. You can try retrying the transaction from the beginning, but the transaction may
-   *     still fail if the cause is nontranient
+   *     still fail if the cause is nontransient
    * @throws UnsatisfiedConditionException if a condition is specified, and if the condition is not
    *     satisfied or the entry does not exist
    */
@@ -140,7 +140,7 @@ void delete(Delete delete)
    *     (e.g., a conflict error). You can retry the transaction from the beginning
    * @throws CrudException if the transaction CRUD operation fails due to transient or nontransient
    *     faults. You can try retrying the transaction from the beginning, but the transaction may
-   *     still fail if the cause is nontranient
+   *     still fail if the cause is nontransient
    * @throws UnsatisfiedConditionException if a condition is specified, and if the condition is not
    *     satisfied or the entry does not exist
    * @deprecated As of release 3.13.0. Will be removed in release 5.0.0. Use {@link #mutate(List)}
@@ -158,7 +158,7 @@ void delete(List<Delete> deletes)
    *     (e.g., a conflict error). You can retry the transaction from the beginning
    * @throws CrudException if the transaction CRUD operation fails due to transient or nontransient
    *     faults. You can try retrying the transaction from the beginning, but the transaction may
-   *     still fail if the cause is nontranient
+   *     still fail if the cause is nontransient
    * @throws UnsatisfiedConditionException if a condition is specified in a {@link Put}, {@link
    *     Delete}, or {@link Update} command, and if the condition is not satisfied or the entry does
    *     not exist
@@ -175,7 +175,7 @@ interface Scanner extends CrudOperable.Scanner<CrudException> {
      *     (e.g., a conflict error). You can retry the transaction from the beginning
      * @throws CrudException if the transaction CRUD operation fails due to transient or
      *     nontransient faults. You can try retrying the transaction from the beginning, but the
-     *     transaction may still fail if the cause is nontranient
+     *     transaction may still fail if the cause is nontransient
      */
     @Override
     Optional<Result> one() throws CrudConflictException, CrudException;
@@ -187,7 +187,7 @@ interface Scanner extends CrudOperable.Scanner<CrudException> {
      *     (e.g., a conflict error). You can retry the transaction from the beginning
      * @throws CrudException if the transaction CRUD operation fails due to transient or
      *     nontransient faults. You can try retrying the transaction from the beginning, but the
-     *     transaction may still fail if the cause is nontranient
+     *     transaction may still fail if the cause is nontransient
      */
     @Override
     List<Result> all() throws CrudConflictException, CrudException;