Skip to content

Commit f9c1da5

Browse files
KodaiDKodaiD
committed
Resolve conflicts
2 parents 0de9149 + 38fdc5a commit f9c1da5

29 files changed

+2393
-1989
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2187,7 +2187,7 @@ jobs:
21872187

21882188
- name: Upload Gradle test reports
21892189
if: always()
2190-
uses: actions/upload-artifact@v4
2190+
uses: actions/upload-artifact@v5
21912191
with:
21922192
name: blob_storage_integration_test_reports_${{ matrix.mode.label }}
21932193
path: core/build/reports/tests/integrationTestObjectStorage

‎build.gradle‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ subprojects {
2828
slf4jVersion = '1.7.36'
2929
cassandraDriverVersion = '3.11.5'
3030
azureCosmosVersion = '4.75.0'
31-
azureBlobStorageVersion = '12.31.3'
31+
azureBlobStorageVersion = '12.32.0'
3232
jooqVersion = '3.14.16'
33-
awssdkVersion = '2.37.3'
33+
awssdkVersion = '2.38.2'
3434
commonsDbcp2Version = '2.13.0'
3535
mysqlDriverVersion = '8.4.0'
3636
postgresqlDriverVersion = '42.7.8'
3737
oracleDriverVersion = '23.26.0.0.0'
3838
sqlserverDriverVersion = '12.8.2.jre8'
39-
sqliteDriverVersion = '3.50.3.0'
39+
sqliteDriverVersion = '3.51.0.0'
4040
yugabyteDriverVersion = '42.7.3-yb-4'
4141
db2DriverVersion = '12.1.2.0'
4242
mariadDbDriverVersion = '3.5.6'
@@ -109,7 +109,8 @@ jreleaser {
109109
def stagingRepositories = ['core/build/staging-deploy',
110110
'integration-test/build/staging-deploy',
111111
'schema-loader/build/staging-deploy',
112-
'data-loader/core/build/staging-deploy']
112+
'data-loader/core/build/staging-deploy',
113+
'data-loader/cli/build/staging-deploy']
113114
mavenCentral {
114115
sonatype {
115116
active = 'RELEASE'

‎core/build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,9 @@ dependencies {
188188
exclude group: 'org.slf4j', module: 'slf4j-api'
189189
}
190190
// The Java connector library used to establish simply a secure connection to AlloyDB on GCP
191-
implementation("com.google.cloud:alloydb-jdbc-connector:${alloyDbJdbcConnectorVersion}")
191+
implementation("com.google.cloud:alloydb-jdbc-connector:${alloyDbJdbcConnectorVersion}") {
192+
exclude group: 'org.slf4j', module: 'slf4j-api'
193+
}
192194
implementation "org.apache.commons:commons-text:${commonsTextVersion}"
193195
testImplementation platform("org.junit:junit-bom:${junitVersion}")
194196
testImplementation 'org.junit.jupiter:junit-jupiter'

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,26 @@ public JdbcAdminTestUtils(Properties properties) {
3030
@Override
3131
public void dropNamespacesTable() throws Exception {
3232
execute(
33-
"DROP TABLE " + rdbEngine.encloseFullTableName(metadataSchema, JdbcAdmin.NAMESPACES_TABLE));
33+
"DROP TABLE "
34+
+ rdbEngine.encloseFullTableName(metadataSchema, NamespaceMetadataService.TABLE_NAME));
3435
}
3536

3637
@Override
3738
public void dropMetadataTable() throws Exception {
38-
dropTable(metadataSchema, JdbcAdmin.METADATA_TABLE);
39+
dropTable(metadataSchema, TableMetadataService.TABLE_NAME);
3940
}
4041

4142
@Override
4243
public void truncateNamespacesTable() throws Exception {
4344
String truncateTableStatement =
44-
rdbEngine.truncateTableSql(metadataSchema, JdbcAdmin.NAMESPACES_TABLE);
45+
rdbEngine.truncateTableSql(metadataSchema, NamespaceMetadataService.TABLE_NAME);
4546
execute(truncateTableStatement);
4647
}
4748

4849
@Override
4950
public void truncateMetadataTable() throws Exception {
5051
String truncateTableStatement =
51-
rdbEngine.truncateTableSql(metadataSchema, JdbcAdmin.METADATA_TABLE);
52+
rdbEngine.truncateTableSql(metadataSchema, TableMetadataService.TABLE_NAME);
5253
execute(truncateTableStatement);
5354
}
5455

@@ -57,7 +58,7 @@ public void truncateMetadataTable() throws Exception {
5758
public void corruptMetadata(String namespace, String table) throws Exception {
5859
String insertCorruptedMetadataStatement =
5960
"INSERT INTO "
60-
+ rdbEngine.encloseFullTableName(metadataSchema, JdbcAdmin.METADATA_TABLE)
61+
+ rdbEngine.encloseFullTableName(metadataSchema, TableMetadataService.TABLE_NAME)
6162
+ " VALUES ('"
6263
+ getFullTableName(namespace, table)
6364
+ "','corrupted','corrupted','corrupted','corrupted','0','0')";
@@ -68,9 +69,9 @@ public void corruptMetadata(String namespace, String table) throws Exception {
6869
public void deleteMetadata(String namespace, String table) throws Exception {
6970
String deleteMetadataStatement =
7071
"DELETE FROM "
71-
+ rdbEngine.encloseFullTableName(metadataSchema, JdbcAdmin.METADATA_TABLE)
72+
+ rdbEngine.encloseFullTableName(metadataSchema, TableMetadataService.TABLE_NAME)
7273
+ " WHERE "
73-
+ rdbEngine.enclose(JdbcAdmin.METADATA_COL_FULL_TABLE_NAME)
74+
+ rdbEngine.enclose(TableMetadataService.COL_FULL_TABLE_NAME)
7475
+ " = ?";
7576
try (Connection connection = dataSource.getConnection();
7677
PreparedStatement preparedStatement =

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
import com.scalar.db.storage.cassandra.CassandraAdmin;
1010
import com.scalar.db.storage.cassandra.CassandraConfig;
1111
import com.scalar.db.storage.cassandra.ClusterManager;
12-
import com.scalar.db.storage.jdbc.JdbcAdmin;
1312
import com.scalar.db.storage.jdbc.JdbcConfig;
1413
import com.scalar.db.storage.jdbc.JdbcTestUtils;
1514
import com.scalar.db.storage.jdbc.JdbcUtils;
15+
import com.scalar.db.storage.jdbc.NamespaceMetadataService;
1616
import com.scalar.db.storage.jdbc.RdbEngineFactory;
1717
import com.scalar.db.storage.jdbc.RdbEngineStrategy;
18+
import com.scalar.db.storage.jdbc.TableMetadataService;
1819
import com.scalar.db.util.AdminTestUtils;
1920
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2021
import java.sql.Connection;
@@ -61,7 +62,8 @@ public void dropNamespacesTable() throws SQLException {
6162
// for JDBC
6263
execute(
6364
"DROP TABLE "
64-
+ rdbEngine.encloseFullTableName(jdbcMetadataSchema, JdbcAdmin.NAMESPACES_TABLE));
65+
+ rdbEngine.encloseFullTableName(
66+
jdbcMetadataSchema, NamespaceMetadataService.TABLE_NAME));
6567
}
6668

6769
@Override
@@ -71,7 +73,7 @@ public void dropMetadataTable() throws SQLException {
7173
// for JDBC
7274
execute(
7375
"DROP TABLE "
74-
+ rdbEngine.encloseFullTableName(jdbcMetadataSchema, JdbcAdmin.METADATA_TABLE));
76+
+ rdbEngine.encloseFullTableName(jdbcMetadataSchema, TableMetadataService.TABLE_NAME));
7577
}
7678

7779
@Override
@@ -86,7 +88,7 @@ public void truncateNamespacesTable() throws SQLException {
8688

8789
// for JDBC
8890
String truncateTableStatement =
89-
rdbEngine.truncateTableSql(jdbcMetadataSchema, JdbcAdmin.NAMESPACES_TABLE);
91+
rdbEngine.truncateTableSql(jdbcMetadataSchema, NamespaceMetadataService.TABLE_NAME);
9092
execute(truncateTableStatement);
9193
}
9294

@@ -97,7 +99,7 @@ public void truncateMetadataTable() throws Exception {
9799
// for JDBC
98100
String truncateTableStatement =
99101
"TRUNCATE TABLE "
100-
+ rdbEngine.encloseFullTableName(jdbcMetadataSchema, JdbcAdmin.METADATA_TABLE);
102+
+ rdbEngine.encloseFullTableName(jdbcMetadataSchema, TableMetadataService.TABLE_NAME);
101103
execute(truncateTableStatement);
102104
}
103105

@@ -109,7 +111,7 @@ public void corruptMetadata(String namespace, String table) throws Exception {
109111
// for JDBC
110112
String insertCorruptedMetadataStatement =
111113
"INSERT INTO "
112-
+ rdbEngine.encloseFullTableName(jdbcMetadataSchema, JdbcAdmin.METADATA_TABLE)
114+
+ rdbEngine.encloseFullTableName(jdbcMetadataSchema, TableMetadataService.TABLE_NAME)
113115
+ " VALUES ('"
114116
+ getFullTableName(namespace, table)
115117
+ "','corrupted','corrupted','corrupted','corrupted','0','0')";
@@ -123,9 +125,9 @@ public void deleteMetadata(String namespace, String table) throws Exception {
123125
// for JDBC
124126
String deleteMetadataStatement =
125127
"DELETE FROM "
126-
+ rdbEngine.encloseFullTableName(jdbcMetadataSchema, JdbcAdmin.METADATA_TABLE)
128+
+ rdbEngine.encloseFullTableName(jdbcMetadataSchema, TableMetadataService.TABLE_NAME)
127129
+ " WHERE "
128-
+ rdbEngine.enclose(JdbcAdmin.METADATA_COL_FULL_TABLE_NAME)
130+
+ rdbEngine.enclose(TableMetadataService.COL_FULL_TABLE_NAME)
129131
+ " = ?";
130132
try (Connection connection = dataSource.getConnection();
131133
PreparedStatement preparedStatement =

‎core/src/integration-test/java/com/scalar/db/storage/objectstorage/ConsensusCommitAdminIntegrationTestWithObjectStorage.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.scalar.db.storage.objectstorage;
22

3+
import com.scalar.db.api.TableMetadata;
34
import com.scalar.db.transaction.consensuscommit.ConsensusCommitAdminIntegrationTestBase;
45
import com.scalar.db.util.AdminTestUtils;
56
import java.util.Properties;
@@ -13,6 +14,14 @@ protected Properties getProps(String testName) {
1314
return ObjectStorageEnv.getProperties(testName);
1415
}
1516

17+
@Override
18+
protected TableMetadata getTableMetadata() {
19+
return TableMetadata.newBuilder(TABLE_METADATA)
20+
.removeSecondaryIndex(COL_NAME5)
21+
.removeSecondaryIndex(COL_NAME6)
22+
.build();
23+
}
24+
1625
@Override
1726
protected AdminTestUtils getAdminTestUtils(String testName) {
1827
return new ObjectStorageAdminTestUtils(getProperties(testName));

‎core/src/integration-test/java/com/scalar/db/storage/objectstorage/ConsensusCommitAdminRepairIntegrationTestWithObjectStorage.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,39 @@
11
package com.scalar.db.storage.objectstorage;
22

3+
import com.scalar.db.api.Scan;
4+
import com.scalar.db.api.TableMetadata;
5+
import com.scalar.db.io.DataType;
36
import com.scalar.db.transaction.consensuscommit.ConsensusCommitAdminRepairIntegrationTestBase;
47
import java.util.Properties;
58

69
public class ConsensusCommitAdminRepairIntegrationTestWithObjectStorage
710
extends ConsensusCommitAdminRepairIntegrationTestBase {
811

12+
@Override
13+
protected TableMetadata getTableMetadata() {
14+
return TableMetadata.newBuilder()
15+
.addColumn(COL_NAME1, DataType.INT)
16+
.addColumn(COL_NAME2, DataType.TEXT)
17+
.addColumn(COL_NAME3, DataType.TEXT)
18+
.addColumn(COL_NAME4, DataType.INT)
19+
.addColumn(COL_NAME5, DataType.INT)
20+
.addColumn(COL_NAME6, DataType.TEXT)
21+
.addColumn(COL_NAME7, DataType.BIGINT)
22+
.addColumn(COL_NAME8, DataType.FLOAT)
23+
.addColumn(COL_NAME9, DataType.DOUBLE)
24+
.addColumn(COL_NAME10, DataType.BOOLEAN)
25+
.addColumn(COL_NAME11, DataType.BLOB)
26+
.addColumn(COL_NAME12, DataType.DATE)
27+
.addColumn(COL_NAME13, DataType.TIME)
28+
.addColumn(COL_NAME14, DataType.TIMESTAMPTZ)
29+
.addColumn(COL_NAME15, DataType.TIMESTAMP)
30+
.addPartitionKey(COL_NAME2)
31+
.addPartitionKey(COL_NAME1)
32+
.addClusteringKey(COL_NAME4, Scan.Ordering.Order.ASC)
33+
.addClusteringKey(COL_NAME3, Scan.Ordering.Order.DESC)
34+
.build();
35+
}
36+
937
@Override
1038
protected Properties getProps(String testName) {
1139
return ObjectStorageEnv.getProperties(testName);

‎core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageAdminCaseSensitivityIntegrationTest.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package com.scalar.db.storage.objectstorage;
22

33
import com.scalar.db.api.DistributedStorageAdminCaseSensitivityIntegrationTestBase;
4+
import com.scalar.db.api.Scan;
5+
import com.scalar.db.api.TableMetadata;
6+
import com.scalar.db.io.DataType;
47
import com.scalar.db.util.AdminTestUtils;
58
import java.util.Map;
69
import java.util.Properties;
@@ -14,6 +17,30 @@ protected Properties getProperties(String testName) {
1417
return ObjectStorageEnv.getProperties(testName);
1518
}
1619

20+
@Override
21+
protected TableMetadata getTableMetadata() {
22+
return TableMetadata.newBuilder()
23+
.addColumn(getColumnName1(), DataType.INT)
24+
.addColumn(getColumnName2(), DataType.TEXT)
25+
.addColumn(getColumnName3(), DataType.TEXT)
26+
.addColumn(getColumnName4(), DataType.INT)
27+
.addColumn(getColumnName5(), DataType.INT)
28+
.addColumn(getColumnName6(), DataType.TEXT)
29+
.addColumn(getColumnName7(), DataType.BIGINT)
30+
.addColumn(getColumnName8(), DataType.FLOAT)
31+
.addColumn(getColumnName9(), DataType.DOUBLE)
32+
.addColumn(getColumnName10(), DataType.BOOLEAN)
33+
.addColumn(getColumnName11(), DataType.BLOB)
34+
.addColumn(getColumnName12(), DataType.DATE)
35+
.addColumn(getColumnName13(), DataType.TIME)
36+
.addColumn(getColumnName14(), DataType.TIMESTAMPTZ)
37+
.addPartitionKey(getColumnName2())
38+
.addPartitionKey(getColumnName1())
39+
.addClusteringKey(getColumnName4(), Scan.Ordering.Order.ASC)
40+
.addClusteringKey(getColumnName3(), Scan.Ordering.Order.DESC)
41+
.build();
42+
}
43+
1744
@Override
1845
protected Map<String, String> getCreationOptions() {
1946
return ObjectStorageEnv.getCreationOptions();

‎core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageAdminIntegrationTest.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package com.scalar.db.storage.objectstorage;
22

33
import com.scalar.db.api.DistributedStorageAdminIntegrationTestBase;
4+
import com.scalar.db.api.Scan;
5+
import com.scalar.db.api.TableMetadata;
6+
import com.scalar.db.io.DataType;
47
import com.scalar.db.util.AdminTestUtils;
58
import java.util.Properties;
69
import org.junit.jupiter.api.Disabled;
@@ -12,6 +15,30 @@ protected Properties getProperties(String testName) {
1215
return ObjectStorageEnv.getProperties(testName);
1316
}
1417

18+
@Override
19+
protected TableMetadata getTableMetadata() {
20+
return TableMetadata.newBuilder()
21+
.addColumn(getColumnName1(), DataType.INT)
22+
.addColumn(getColumnName2(), DataType.TEXT)
23+
.addColumn(getColumnName3(), DataType.TEXT)
24+
.addColumn(getColumnName4(), DataType.INT)
25+
.addColumn(getColumnName5(), DataType.INT)
26+
.addColumn(getColumnName6(), DataType.TEXT)
27+
.addColumn(getColumnName7(), DataType.BIGINT)
28+
.addColumn(getColumnName8(), DataType.FLOAT)
29+
.addColumn(getColumnName9(), DataType.DOUBLE)
30+
.addColumn(getColumnName10(), DataType.BOOLEAN)
31+
.addColumn(getColumnName11(), DataType.BLOB)
32+
.addColumn(getColumnName12(), DataType.DATE)
33+
.addColumn(getColumnName13(), DataType.TIME)
34+
.addColumn(getColumnName14(), DataType.TIMESTAMPTZ)
35+
.addPartitionKey(getColumnName2())
36+
.addPartitionKey(getColumnName1())
37+
.addClusteringKey(getColumnName4(), Scan.Ordering.Order.ASC)
38+
.addClusteringKey(getColumnName3(), Scan.Ordering.Order.DESC)
39+
.build();
40+
}
41+
1542
@Override
1643
protected boolean isIndexOnBooleanColumnSupported() {
1744
return false;

‎core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageAdminRepairIntegrationTest.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,40 @@
11
package com.scalar.db.storage.objectstorage;
22

33
import com.scalar.db.api.DistributedStorageAdminRepairIntegrationTestBase;
4+
import com.scalar.db.api.Scan;
5+
import com.scalar.db.api.TableMetadata;
6+
import com.scalar.db.io.DataType;
47
import java.util.Properties;
58
import org.junit.jupiter.api.Disabled;
69

710
public class ObjectStorageAdminRepairIntegrationTest
811
extends DistributedStorageAdminRepairIntegrationTestBase {
912

13+
@Override
14+
protected TableMetadata getTableMetadata() {
15+
return TableMetadata.newBuilder()
16+
.addColumn(COL_NAME1, DataType.INT)
17+
.addColumn(COL_NAME2, DataType.TEXT)
18+
.addColumn(COL_NAME3, DataType.TEXT)
19+
.addColumn(COL_NAME4, DataType.INT)
20+
.addColumn(COL_NAME5, DataType.INT)
21+
.addColumn(COL_NAME6, DataType.TEXT)
22+
.addColumn(COL_NAME7, DataType.BIGINT)
23+
.addColumn(COL_NAME8, DataType.FLOAT)
24+
.addColumn(COL_NAME9, DataType.DOUBLE)
25+
.addColumn(COL_NAME10, DataType.BOOLEAN)
26+
.addColumn(COL_NAME11, DataType.BLOB)
27+
.addColumn(COL_NAME12, DataType.DATE)
28+
.addColumn(COL_NAME13, DataType.TIME)
29+
.addColumn(COL_NAME14, DataType.TIMESTAMPTZ)
30+
.addColumn(COL_NAME15, DataType.TIMESTAMP)
31+
.addPartitionKey(COL_NAME2)
32+
.addPartitionKey(COL_NAME1)
33+
.addClusteringKey(COL_NAME4, Scan.Ordering.Order.ASC)
34+
.addClusteringKey(COL_NAME3, Scan.Ordering.Order.DESC)
35+
.build();
36+
}
37+
1038
@Override
1139
protected Properties getProperties(String testName) {
1240
return ObjectStorageEnv.getProperties(testName);

0 commit comments

Comments
 (0)