Skip to content

Commit 2be52e5

Browse files
inv-jishnuinv-jishnu
committed
Resolved conflicts and merged changes from master
2 parents 37c7b3b + 4c5686c commit 2be52e5

File tree

115 files changed

+5139
-925
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+5139
-925
lines changed

‎.github/workflows/release-snapshot.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
VERSION=$(./gradlew :core:properties -q | grep "version:" | awk '{print $2}')
3131
echo "version=${VERSION}" >> $GITHUB_OUTPUT
3232
33-
- name: Upload SNAPSHOT versions for scalardb, scalardb-schema-loader, and scalardb-integration-test to Maven Snapshot Repository
33+
- name: Upload SNAPSHOT versions for scalardb, scalardb-schema-loader, scalardb-data-loader-core, and scalardb-integration-test to Maven Snapshot Repository
3434
if: contains(steps.version.outputs.version, '-SNAPSHOT')
3535
run: |
3636
echo "${{secrets.SIGNING_SECRET_KEY_RING}}" | base64 -d > ~/.gradle/secring.gpg

‎.github/workflows/upload-artifacts.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
run: |
5858
docker push ghcr.io/scalar-labs/scalardb-schema-loader:${{ steps.version.outputs.version }}
5959
60-
- name: Upload scalardb, scalardb-schema-loader, and scalardb-integration-test to Maven Central Repository
60+
- name: Upload scalardb, scalardb-schema-loader, scalardb-data-loader-core, and scalardb-integration-test to Maven Central Repository
6161
run: |
6262
echo "${{secrets.SIGNING_SECRET_KEY_RING}}" | base64 -d > ~/.gradle/secring.gpg
6363
./gradlew publish \

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ subprojects {
3030
awssdkVersion = '2.31.3'
3131
commonsDbcp2Version = '2.13.0'
3232
mysqlDriverVersion = '8.4.0'
33-
postgresqlDriverVersion = '42.7.5'
33+
postgresqlDriverVersion = '42.7.6'
3434
oracleDriverVersion = '23.8.0.25.04'
3535
sqlserverDriverVersion = '12.8.1.jre8'
3636
sqliteDriverVersion = '3.49.1.0'

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.scalar.db.storage.cassandra;
22

3-
import com.scalar.db.common.ConsensusCommitTestUtils;
4-
import com.scalar.db.transaction.consensuscommit.ConsensusCommitIntegrationTestUtils;
3+
import com.scalar.db.transaction.consensuscommit.ConsensusCommitTestUtils;
54
import java.util.Properties;
65

76
public final class ConsensusCommitCassandraEnv {
@@ -11,7 +10,7 @@ public static Properties getProperties(String testName) {
1110
Properties properties = CassandraEnv.getProperties(testName);
1211

1312
// Add testName as a coordinator schema suffix
14-
ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
13+
ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
1514

1615
return ConsensusCommitTestUtils.loadConsensusCommitProperties(properties);
1716
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.scalar.db.storage.cosmos;
22

3-
import com.scalar.db.common.ConsensusCommitTestUtils;
4-
import com.scalar.db.transaction.consensuscommit.ConsensusCommitIntegrationTestUtils;
3+
import com.scalar.db.transaction.consensuscommit.ConsensusCommitTestUtils;
54
import java.util.Map;
65
import java.util.Properties;
76

@@ -12,7 +11,7 @@ public static Properties getProperties(String testName) {
1211
Properties properties = CosmosEnv.getProperties(testName);
1312

1413
// Add testName as a coordinator schema suffix
15-
ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
14+
ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
1615

1716
return ConsensusCommitTestUtils.loadConsensusCommitProperties(properties);
1817
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.scalar.db.storage.dynamo;
22

3-
import com.scalar.db.common.ConsensusCommitTestUtils;
4-
import com.scalar.db.transaction.consensuscommit.ConsensusCommitIntegrationTestUtils;
3+
import com.scalar.db.transaction.consensuscommit.ConsensusCommitTestUtils;
54
import java.util.Map;
65
import java.util.Properties;
76

@@ -12,7 +11,7 @@ public static Properties getProperties(String testName) {
1211
Properties properties = DynamoEnv.getProperties(testName);
1312

1413
// Add testName as a coordinator schema suffix
15-
ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
14+
ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
1615

1716
return ConsensusCommitTestUtils.loadConsensusCommitProperties(properties);
1817
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.scalar.db.storage.jdbc;
22

3-
import com.scalar.db.common.ConsensusCommitTestUtils;
4-
import com.scalar.db.transaction.consensuscommit.ConsensusCommitIntegrationTestUtils;
3+
import com.scalar.db.transaction.consensuscommit.ConsensusCommitTestUtils;
54
import java.util.Properties;
65

76
public final class ConsensusCommitJdbcEnv {
@@ -11,7 +10,7 @@ public static Properties getProperties(String testName) {
1110
Properties properties = JdbcEnv.getProperties(testName);
1211

1312
// Add testName as a coordinator schema suffix
14-
ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
13+
ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
1514

1615
return ConsensusCommitTestUtils.loadConsensusCommitProperties(properties);
1716
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.scalar.db.storage.multistorage;
22

3-
import com.scalar.db.common.ConsensusCommitTestUtils;
43
import com.scalar.db.config.DatabaseConfig;
54
import com.scalar.db.storage.cassandra.CassandraAdmin;
65
import com.scalar.db.transaction.consensuscommit.ConsensusCommitNullMetadataIntegrationTestBase;
6+
import com.scalar.db.transaction.consensuscommit.ConsensusCommitTestUtils;
77
import com.scalar.db.transaction.consensuscommit.Coordinator;
88
import java.util.Collections;
99
import java.util.Map;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.scalar.db.storage.multistorage;
22

3-
import com.scalar.db.common.ConsensusCommitTestUtils;
43
import com.scalar.db.config.DatabaseConfig;
54
import com.scalar.db.storage.cassandra.CassandraAdmin;
65
import com.scalar.db.transaction.consensuscommit.ConsensusCommitSpecificIntegrationTestBase;
6+
import com.scalar.db.transaction.consensuscommit.ConsensusCommitTestUtils;
77
import com.scalar.db.transaction.consensuscommit.Coordinator;
88
import java.util.Collections;
99
import java.util.Map;

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.google.common.util.concurrent.Uninterruptibles;
55
import com.scalar.db.config.DatabaseConfig;
66
import com.scalar.db.schemaloader.SchemaLoaderIntegrationTestBase;
7-
import com.scalar.db.transaction.consensuscommit.ConsensusCommitIntegrationTestUtils;
7+
import com.scalar.db.transaction.consensuscommit.ConsensusCommitTestUtils;
88
import com.scalar.db.transaction.consensuscommit.Coordinator;
99
import com.scalar.db.util.AdminTestUtils;
1010
import java.nio.file.Path;
@@ -59,20 +59,18 @@ protected Properties getProperties(String testName) {
5959
DatabaseConfig.DEFAULT_SYSTEM_NAMESPACE_NAME + "_" + testName);
6060

6161
// Add testName as a coordinator schema suffix
62-
ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
62+
ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, testName);
6363

6464
return properties;
6565
}
6666

6767
@Override
6868
protected AdminTestUtils getAdminTestUtils(String testName) {
6969
Properties propertiesForCassandra = MultiStorageEnv.getPropertiesForCassandra(testName);
70-
ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(
71-
propertiesForCassandra, testName);
70+
ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(propertiesForCassandra, testName);
7271

7372
Properties propertiesForJdbc = MultiStorageEnv.getPropertiesForJdbc(testName);
74-
ConsensusCommitIntegrationTestUtils.addSuffixToCoordinatorNamespace(
75-
propertiesForJdbc, testName);
73+
ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(propertiesForJdbc, testName);
7674

7775
return new MultiStorageAdminTestUtils(propertiesForCassandra, propertiesForJdbc);
7876
}

0 commit comments

Comments
 (0)