Skip to content

Commit 3ae5afe

Browse files
Torch3333Torch3333
committed
Merge remote-tracking branch 'origin/master' into tidb_support
# Conflicts: # .github/workflows/ci.yaml
2 parents 9213310 + d15013f commit 3ae5afe

File tree

100 files changed

+4998
-1736
lines changed

Some content is hidden

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

100 files changed

+4998
-1736
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 187 additions & 30 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
uses: actions/checkout@v5
6464

6565
- name: Setup Gradle
66-
uses: gradle/actions/setup-gradle@v4
66+
uses: gradle/actions/setup-gradle@v5
6767

6868
- name: Build scalardb-schema-loader jar
6969
run: ./gradlew :schema-loader:shadowJar

‎.github/workflows/data-loader-ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
java-version: 8
2020

2121
- name: Setup Gradle
22-
uses: gradle/actions/setup-gradle@v4
22+
uses: gradle/actions/setup-gradle@v5
2323

2424
- name: Gradle Data Loader CLI build
2525
run: ./gradlew :data-loader:cli:build --no-daemon --stacktrace

‎.github/workflows/permission-check.yaml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
distribution: ${{ env.JAVA_VENDOR }}
2626

2727
- name: Setup Gradle
28-
uses: gradle/actions/setup-gradle@v4
28+
uses: gradle/actions/setup-gradle@v5
2929

3030
- name: Start Cassandra with authentication enabled
3131
run: |
@@ -64,7 +64,7 @@ jobs:
6464
distribution: ${{ env.JAVA_VENDOR }}
6565

6666
- name: Setup Gradle
67-
uses: gradle/actions/setup-gradle@v4
67+
uses: gradle/actions/setup-gradle@v5
6868

6969
- name: Start Cassandra with authentication enabled
7070
run: |
@@ -103,7 +103,7 @@ jobs:
103103
distribution: ${{ env.JAVA_VENDOR }}
104104

105105
- name: Setup Gradle
106-
uses: gradle/actions/setup-gradle@v4
106+
uses: gradle/actions/setup-gradle@v5
107107

108108
- name: Execute Gradle 'integrationTestDynamoPermission' task
109109
run: ./gradlew integrationTestDynamoPermission -Dscalardb.dynamo.emulator_used=false -Dscalardb.dynamo.region=ap-northeast-1 -Dscalardb.dynamo.access_key_id=${{ env.DYNAMO_ACCESS_KEY_ID }} -Dscalardb.dynamo.secret_access_key=${{ env.DYNAMO_SECRET_ACCESS_KEY }}
@@ -132,7 +132,7 @@ jobs:
132132
distribution: ${{ env.JAVA_VENDOR }}
133133

134134
- name: Setup Gradle
135-
uses: gradle/actions/setup-gradle@v4
135+
uses: gradle/actions/setup-gradle@v5
136136

137137
- name: Execute Gradle 'integrationTestJdbcPermission' task
138138
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:mysql://localhost:3306/ -Dscalardb.jdbc.username=root -Dscalardb.jdbc.password=mysql
@@ -161,7 +161,7 @@ jobs:
161161
distribution: ${{ env.JAVA_VENDOR }}
162162

163163
- name: Setup Gradle
164-
uses: gradle/actions/setup-gradle@v4
164+
uses: gradle/actions/setup-gradle@v5
165165

166166
- name: Execute Gradle 'integrationTestJdbcPermission' task
167167
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:mysql://localhost:3306/ -Dscalardb.jdbc.username=root -Dscalardb.jdbc.password=mysql
@@ -190,7 +190,7 @@ jobs:
190190
distribution: ${{ env.JAVA_VENDOR }}
191191

192192
- name: Setup Gradle
193-
uses: gradle/actions/setup-gradle@v4
193+
uses: gradle/actions/setup-gradle@v5
194194

195195
- name: Execute Gradle 'integrationTestJdbcPermission' task
196196
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:mysql://localhost:3306/ -Dscalardb.jdbc.username=root -Dscalardb.jdbc.password=mysql
@@ -225,7 +225,7 @@ jobs:
225225
distribution: ${{ env.JAVA_VENDOR }}
226226

227227
- name: Setup Gradle
228-
uses: gradle/actions/setup-gradle@v4
228+
uses: gradle/actions/setup-gradle@v5
229229

230230
- name: Execute Gradle 'integrationTestJdbcPermission' task
231231
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:postgresql://localhost:5432/postgres -Dscalardb.jdbc.username=postgres -Dscalardb.jdbc.password=postgres
@@ -260,7 +260,7 @@ jobs:
260260
distribution: ${{ env.JAVA_VENDOR }}
261261

262262
- name: Setup Gradle
263-
uses: gradle/actions/setup-gradle@v4
263+
uses: gradle/actions/setup-gradle@v5
264264

265265
- name: Execute Gradle 'integrationTestJdbcPermission' task
266266
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:postgresql://localhost:5432/postgres -Dscalardb.jdbc.username=postgres -Dscalardb.jdbc.password=postgres
@@ -295,7 +295,7 @@ jobs:
295295
distribution: ${{ env.JAVA_VENDOR }}
296296

297297
- name: Setup Gradle
298-
uses: gradle/actions/setup-gradle@v4
298+
uses: gradle/actions/setup-gradle@v5
299299

300300
- name: Execute Gradle 'integrationTestJdbcPermission' task
301301
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:postgresql://localhost:5432/postgres -Dscalardb.jdbc.username=postgres -Dscalardb.jdbc.password=postgres
@@ -330,7 +330,7 @@ jobs:
330330
distribution: ${{ env.JAVA_VENDOR }}
331331

332332
- name: Setup Gradle
333-
uses: gradle/actions/setup-gradle@v4
333+
uses: gradle/actions/setup-gradle@v5
334334

335335
- name: Execute Gradle 'integrationTestJdbcPermission' task
336336
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:postgresql://localhost:5432/postgres -Dscalardb.jdbc.username=postgres -Dscalardb.jdbc.password=postgres
@@ -365,7 +365,7 @@ jobs:
365365
distribution: ${{ env.JAVA_VENDOR }}
366366

367367
- name: Setup Gradle
368-
uses: gradle/actions/setup-gradle@v4
368+
uses: gradle/actions/setup-gradle@v5
369369

370370
- name: Execute Gradle 'integrationTestJdbcPermission' task
371371
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:postgresql://localhost:5432/postgres -Dscalardb.jdbc.username=postgres -Dscalardb.jdbc.password=postgres
@@ -400,7 +400,7 @@ jobs:
400400
distribution: ${{ env.JAVA_VENDOR }}
401401

402402
- name: Setup Gradle
403-
uses: gradle/actions/setup-gradle@v4
403+
uses: gradle/actions/setup-gradle@v5
404404

405405
- name: Execute Gradle 'integrationTestJdbcPermission' task
406406
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:oracle:thin:@//localhost:1521/ORCLPDB1 -Dscalardb.jdbc.username=SYSTEM -Dscalardb.jdbc.password=Oracle
@@ -442,7 +442,7 @@ jobs:
442442
distribution: ${{ env.JAVA_VENDOR }}
443443

444444
- name: Setup Gradle
445-
uses: gradle/actions/setup-gradle@v4
445+
uses: gradle/actions/setup-gradle@v5
446446

447447
- name: Execute Gradle 'integrationTestJdbcPermission' task
448448
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:oracle:thin:@//localhost:1521/XEPDB1 -Dscalardb.jdbc.username=SYSTEM -Dscalardb.jdbc.password=Oracle
@@ -497,7 +497,7 @@ jobs:
497497
distribution: ${{ env.JAVA_VENDOR }}
498498

499499
- name: Setup Gradle
500-
uses: gradle/actions/setup-gradle@v4
500+
uses: gradle/actions/setup-gradle@v5
501501

502502
- name: Execute Gradle 'integrationTestJdbcPermission' task
503503
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:oracle:thin:@//localhost:1521/FREEPDB1 -Dscalardb.jdbc.username=SYSTEM -Dscalardb.jdbc.password=Oracle
@@ -534,7 +534,7 @@ jobs:
534534
distribution: ${{ env.JAVA_VENDOR }}
535535

536536
- name: Setup Gradle
537-
uses: gradle/actions/setup-gradle@v4
537+
uses: gradle/actions/setup-gradle@v5
538538

539539
- name: Execute Gradle 'integrationTestJdbcPermission' task
540540
run: ./gradlew integrationTestJdbcPermission "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=true;trustServerCertificate=true" "-Dscalardb.jdbc.username=sa" "-Dscalardb.jdbc.password=SqlServer17" "-Dfile.encoding=UTF-8"
@@ -571,7 +571,7 @@ jobs:
571571
distribution: ${{ env.JAVA_VENDOR }}
572572

573573
- name: Setup Gradle
574-
uses: gradle/actions/setup-gradle@v4
574+
uses: gradle/actions/setup-gradle@v5
575575

576576
- name: Execute Gradle 'integrationTestJdbcPermission' task
577577
run: ./gradlew integrationTestJdbcPermission "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=true;trustServerCertificate=true" "-Dscalardb.jdbc.username=sa" "-Dscalardb.jdbc.password=SqlServer19"
@@ -608,7 +608,7 @@ jobs:
608608
distribution: ${{ env.JAVA_VENDOR }}
609609

610610
- name: Setup Gradle
611-
uses: gradle/actions/setup-gradle@v4
611+
uses: gradle/actions/setup-gradle@v5
612612

613613
- name: Execute Gradle 'integrationTestJdbcPermission' task
614614
run: ./gradlew integrationTestJdbcPermission "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=true;trustServerCertificate=true" "-Dscalardb.jdbc.username=sa" "-Dscalardb.jdbc.password=SqlServer22"
@@ -638,7 +638,7 @@ jobs:
638638
distribution: ${{ env.JAVA_VENDOR }}
639639

640640
- name: Setup Gradle
641-
uses: gradle/actions/setup-gradle@v4
641+
uses: gradle/actions/setup-gradle@v5
642642

643643
- name: Execute Gradle 'integrationTestJdbcPermission' task
644644
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:mariadb://localhost:3306 -Dscalardb.jdbc.username=root -Dscalardb.jdbc.password=mysql
@@ -668,7 +668,7 @@ jobs:
668668
distribution: ${{ env.JAVA_VENDOR }}
669669

670670
- name: Setup Gradle
671-
uses: gradle/actions/setup-gradle@v4
671+
uses: gradle/actions/setup-gradle@v5
672672

673673
- name: Execute Gradle 'integrationTestJdbcPermission' task
674674
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:mariadb://localhost:3306 -Dscalardb.jdbc.username=root -Dscalardb.jdbc.password=mysql
@@ -698,7 +698,7 @@ jobs:
698698
distribution: ${{ env.JAVA_VENDOR }}
699699

700700
- name: Setup Gradle
701-
uses: gradle/actions/setup-gradle@v4
701+
uses: gradle/actions/setup-gradle@v5
702702

703703
- name: Execute Gradle 'integrationTestJdbcPermission' task
704704
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:yugabytedb://localhost:5433/yugabyte?load-balance=any -Dscalardb.jdbc.username=yugabyte -Dscalardb.jdbc.password=yugabyte -Dscalar.db.jdbc.connection_pool.max_total=12 -Dscalar.db.jdbc.table_metadata.connection_pool.max_total=4 -Dscalar.db.jdbc.admin.connection_pool.max_total=4
@@ -736,7 +736,7 @@ jobs:
736736
distribution: ${{ env.JAVA_VENDOR }}
737737

738738
- name: Setup Gradle
739-
uses: gradle/actions/setup-gradle@v4
739+
uses: gradle/actions/setup-gradle@v5
740740

741741
- name: Wait for the container to be ready
742742
timeout-minutes: 10
@@ -790,7 +790,7 @@ jobs:
790790
distribution: ${{ env.JAVA_VENDOR }}
791791

792792
- name: Setup Gradle
793-
uses: gradle/actions/setup-gradle@v4
793+
uses: gradle/actions/setup-gradle@v5
794794

795795
- name: Wait for the container to be ready
796796
timeout-minutes: 10

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
distribution: 'temurin'
2323

2424
- name: Setup Gradle
25-
uses: gradle/actions/setup-gradle@v4
25+
uses: gradle/actions/setup-gradle@v5
2626

2727
- name: Set version
2828
id: version

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
distribution: 'temurin'
4242

4343
- name: Setup Gradle
44-
uses: gradle/actions/setup-gradle@v4
44+
uses: gradle/actions/setup-gradle@v5
4545

4646
- name: Prepare artifacts in staging-deploy directories
4747
run: ./gradlew publish

‎build.gradle‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,20 @@ subprojects {
2929
cassandraDriverVersion = '3.11.5'
3030
azureCosmosVersion = '4.74.0'
3131
jooqVersion = '3.14.16'
32-
awssdkVersion = '2.34.0'
32+
awssdkVersion = '2.35.0'
3333
commonsDbcp2Version = '2.13.0'
3434
mysqlDriverVersion = '8.4.0'
3535
postgresqlDriverVersion = '42.7.8'
3636
oracleDriverVersion = '23.9.0.25.07'
37-
sqlserverDriverVersion = '12.8.1.jre8'
37+
sqlserverDriverVersion = '12.8.2.jre8'
3838
sqliteDriverVersion = '3.50.3.0'
3939
yugabyteDriverVersion = '42.7.3-yb-4'
4040
db2DriverVersion = '12.1.2.0'
4141
mariadDbDriverVersion = '3.5.6'
42+
alloyDbJdbcConnectorVersion = '1.2.6'
4243
picocliVersion = '4.7.7'
4344
commonsTextVersion = '1.14.0'
44-
junitVersion = '5.13.4'
45+
junitVersion = '5.14.0'
4546
commonsLangVersion = '3.19.0'
4647
assertjVersion = '3.27.6'
4748
mockitoVersion = '4.11.0'

‎core/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ dependencies {
173173
implementation ("org.mariadb.jdbc:mariadb-java-client:${mariadDbDriverVersion}") {
174174
exclude group: 'org.slf4j', module: 'slf4j-api'
175175
}
176+
// The Java connector library used to establish simply a secure connection to AlloyDB on GCP
177+
implementation("com.google.cloud:alloydb-jdbc-connector:${alloyDbJdbcConnectorVersion}")
176178
implementation "org.apache.commons:commons-text:${commonsTextVersion}"
177179
testImplementation platform("org.junit:junit-bom:${junitVersion}")
178180
testImplementation 'org.junit.jupiter:junit-jupiter'

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,19 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly()
7777
}
7878
}
7979

80+
@Override
81+
@Disabled("Cassandra does not support altering column types")
82+
public void
83+
alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() {}
84+
85+
@Override
86+
@Disabled("Cassandra does not support altering column types")
87+
public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() {}
88+
89+
@Override
90+
@Disabled("Cassandra does not support altering column types")
91+
public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() {}
92+
8093
@Override
8194
@Disabled("Cassandra does not support renaming tables")
8295
public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,19 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly()
7676
}
7777
}
7878

79+
@Override
80+
@Disabled("Cassandra does not support altering column types")
81+
public void
82+
alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() {}
83+
84+
@Override
85+
@Disabled("Cassandra does not support altering column types")
86+
public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() {}
87+
88+
@Override
89+
@Disabled("Cassandra does not support altering column types")
90+
public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() {}
91+
7992
@Override
8093
@Disabled("Cassandra does not support renaming tables")
8194
public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {}

0 commit comments

Comments
 (0)