Skip to content

Commit 3852a5f

Browse files
inv-jishnuinv-jishnu
committed
Resolved conflicts and merged latest changes from master
2 parents 4d016aa + 7a43860 commit 3852a5f

File tree

157 files changed

+7843
-2868
lines changed

Some content is hidden

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

157 files changed

+7843
-2868
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 409 additions & 27 deletions
Large diffs are not rendered by default.

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
- name: Upload Gradle test reports
4747
if: always()
48-
uses: actions/upload-artifact@v4
48+
uses: actions/upload-artifact@v5
4949
with:
5050
name: cassandra_3.0_permission_integration_test_reports
5151
path: core/build/reports/tests/integrationTestCassandraPermission
@@ -84,7 +84,7 @@ jobs:
8484

8585
- name: Upload Gradle test reports
8686
if: always()
87-
uses: actions/upload-artifact@v4
87+
uses: actions/upload-artifact@v5
8888
with:
8989
name: cassandra_3.11_permission_integration_test_reports
9090
path: core/build/reports/tests/integrationTestCassandraPermission
@@ -110,7 +110,7 @@ jobs:
110110

111111
- name: Upload Gradle test reports
112112
if: always()
113-
uses: actions/upload-artifact@v4
113+
uses: actions/upload-artifact@v5
114114
with:
115115
name: dynamo_permission_integration_test_reports
116116
path: core/build/reports/tests/integrationTestDynamoPermission
@@ -139,7 +139,7 @@ jobs:
139139

140140
- name: Upload Gradle test reports
141141
if: always()
142-
uses: actions/upload-artifact@v4
142+
uses: actions/upload-artifact@v5
143143
with:
144144
name: mysql_5.7_permission_integration_test_reports
145145
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -168,7 +168,7 @@ jobs:
168168

169169
- name: Upload Gradle test reports
170170
if: always()
171-
uses: actions/upload-artifact@v4
171+
uses: actions/upload-artifact@v5
172172
with:
173173
name: mysql_8.0_permission_integration_test_reports
174174
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -197,7 +197,7 @@ jobs:
197197

198198
- name: Upload Gradle test reports
199199
if: always()
200-
uses: actions/upload-artifact@v4
200+
uses: actions/upload-artifact@v5
201201
with:
202202
name: mysql_8.4_permission_integration_test_reports
203203
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -232,7 +232,7 @@ jobs:
232232

233233
- name: Upload Gradle test reports
234234
if: always()
235-
uses: actions/upload-artifact@v4
235+
uses: actions/upload-artifact@v5
236236
with:
237237
name: postgresql_13_permission_integration_test_reports
238238
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -267,7 +267,7 @@ jobs:
267267

268268
- name: Upload Gradle test reports
269269
if: always()
270-
uses: actions/upload-artifact@v4
270+
uses: actions/upload-artifact@v5
271271
with:
272272
name: postgresql_14_permission_integration_test_reports
273273
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -302,7 +302,7 @@ jobs:
302302

303303
- name: Upload Gradle test reports
304304
if: always()
305-
uses: actions/upload-artifact@v4
305+
uses: actions/upload-artifact@v5
306306
with:
307307
name: postgresql_15_permission_integration_test_reports
308308
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -337,7 +337,7 @@ jobs:
337337

338338
- name: Upload Gradle test reports
339339
if: always()
340-
uses: actions/upload-artifact@v4
340+
uses: actions/upload-artifact@v5
341341
with:
342342
name: postgresql_16_permission_integration_test_reports
343343
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -372,7 +372,7 @@ jobs:
372372

373373
- name: Upload Gradle test reports
374374
if: always()
375-
uses: actions/upload-artifact@v4
375+
uses: actions/upload-artifact@v5
376376
with:
377377
name: postgresql_17_permission_integration_test_reports
378378
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -407,7 +407,7 @@ jobs:
407407

408408
- name: Upload Gradle test reports
409409
if: always()
410-
uses: actions/upload-artifact@v4
410+
uses: actions/upload-artifact@v5
411411
with:
412412
name: oracle_19_permission_integration_test_reports
413413
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -449,7 +449,7 @@ jobs:
449449

450450
- name: Upload Gradle test reports
451451
if: always()
452-
uses: actions/upload-artifact@v4
452+
uses: actions/upload-artifact@v5
453453
with:
454454
name: oracle_21_permission_integration_test_reports
455455
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -508,7 +508,7 @@ jobs:
508508

509509
- name: Upload Gradle test reports
510510
if: always()
511-
uses: actions/upload-artifact@v4
511+
uses: actions/upload-artifact@v5
512512
with:
513513
name: oracle_23_permission_integration_test_reports
514514
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -541,7 +541,7 @@ jobs:
541541

542542
- name: Upload Gradle test reports
543543
if: always()
544-
uses: actions/upload-artifact@v4
544+
uses: actions/upload-artifact@v5
545545
with:
546546
name: sqlserver_2017_permission_integration_test_reports
547547
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -578,7 +578,7 @@ jobs:
578578

579579
- name: Upload Gradle test reports
580580
if: always()
581-
uses: actions/upload-artifact@v4
581+
uses: actions/upload-artifact@v5
582582
with:
583583
name: sqlserver_2019_permission_integration_test_reports
584584
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -615,7 +615,7 @@ jobs:
615615

616616
- name: Upload Gradle test reports
617617
if: always()
618-
uses: actions/upload-artifact@v4
618+
uses: actions/upload-artifact@v5
619619
with:
620620
name: sqlserver_2022_permission_integration_test_reports
621621
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -645,7 +645,7 @@ jobs:
645645

646646
- name: Upload Gradle test reports
647647
if: always()
648-
uses: actions/upload-artifact@v4
648+
uses: actions/upload-artifact@v5
649649
with:
650650
name: mariadb_10.11_permission_integration_test_reports
651651
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -675,7 +675,7 @@ jobs:
675675

676676
- name: Upload Gradle test reports
677677
if: always()
678-
uses: actions/upload-artifact@v4
678+
uses: actions/upload-artifact@v5
679679
with:
680680
name: mariadb_11.4_permission_integration_test_reports
681681
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -705,7 +705,7 @@ jobs:
705705

706706
- name: Upload Gradle test reports
707707
if: always()
708-
uses: actions/upload-artifact@v4
708+
uses: actions/upload-artifact@v5
709709
with:
710710
name: yugabytedb_2_permission_integration_test_reports
711711
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -759,7 +759,7 @@ jobs:
759759

760760
- name: Upload Gradle test reports
761761
if: always()
762-
uses: actions/upload-artifact@v4
762+
uses: actions/upload-artifact@v5
763763
with:
764764
name: db2_11.5_permission_integration_test_reports
765765
path: core/build/reports/tests/integrationTestJdbcPermission
@@ -813,7 +813,7 @@ jobs:
813813

814814
- name: Upload Gradle test reports
815815
if: always()
816-
uses: actions/upload-artifact@v4
816+
uses: actions/upload-artifact@v5
817817
with:
818818
name: db2_12.1_permission_integration_test_reports
819819
path: core/build/reports/tests/integrationTestJdbcPermission

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

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

4747
- name: Upload JReleaser outputs
4848
if: always()
49-
uses: actions/upload-artifact@v4
49+
uses: actions/upload-artifact@v5
5050
with:
5151
name: jreleaser-release
5252
path: |

‎.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

5858
- name: Upload JReleaser outputs
5959
if: always()
60-
uses: actions/upload-artifact@v4
60+
uses: actions/upload-artifact@v5
6161
with:
6262
name: jreleaser-release
6363
path: |

‎build.gradle‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "com.diffplug.spotless" version "6.13.0"
3-
id "org.jreleaser" version "1.20.0"
3+
id "org.jreleaser" version "1.21.0"
44
}
55

66
ext {
@@ -27,21 +27,22 @@ subprojects {
2727
guavaVersion = '32.1.3-jre'
2828
slf4jVersion = '1.7.36'
2929
cassandraDriverVersion = '3.11.5'
30-
azureCosmosVersion = '4.74.0'
30+
azureCosmosVersion = '4.75.0'
3131
jooqVersion = '3.14.16'
32-
awssdkVersion = '2.35.0'
32+
awssdkVersion = '2.37.3'
3333
commonsDbcp2Version = '2.13.0'
3434
mysqlDriverVersion = '8.4.0'
3535
postgresqlDriverVersion = '42.7.8'
36-
oracleDriverVersion = '23.9.0.25.07'
37-
sqlserverDriverVersion = '12.8.1.jre8'
36+
oracleDriverVersion = '23.26.0.0.0'
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.7'
4243
picocliVersion = '4.7.7'
4344
commonsTextVersion = '1.14.0'
44-
junitVersion = '5.14.0'
45+
junitVersion = '5.14.1'
4546
commonsLangVersion = '3.19.0'
4647
assertjVersion = '3.27.6'
4748
mockitoVersion = '4.11.0'

‎core/build.gradle‎

Lines changed: 3 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'
@@ -249,6 +251,7 @@ task integrationTestJdbc(type: Test) {
249251
options {
250252
systemProperties(System.getProperties().findAll{it.key.toString().startsWith("scalardb")})
251253
}
254+
maxHeapSize = "4g"
252255
}
253256

254257
task integrationTestMultiStorage(type: Test) {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,8 @@ public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentEx
105105
@Override
106106
@Disabled("Cassandra does not support renaming tables")
107107
public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {}
108+
109+
@Override
110+
@Disabled("Cassandra does not support renaming tables")
111+
public void renameTable_IfOnlyOneTableExists_ShouldRenameTableCorrectly() {}
108112
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,8 @@ public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentEx
104104
@Override
105105
@Disabled("Cassandra does not support renaming tables")
106106
public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {}
107+
108+
@Override
109+
@Disabled("Cassandra does not support renaming tables")
110+
public void renameTable_IfOnlyOneTableExists_ShouldRenameTableCorrectly() {}
107111
}

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,6 @@ protected void waitForTableDeletion() {
126126
}
127127
}
128128

129-
@Test
130-
@Override
131-
@Disabled("Import-related functionality is not supported in Cassandra")
132-
public void getImportTableMetadata_WithSufficientPermission_ShouldSucceed() {}
133-
134-
@Test
135-
@Override
136-
@Disabled("Import-related functionality is not supported in Cassandra")
137-
public void addRawColumnToTable_WithSufficientPermission_ShouldSucceed() {}
138-
139129
@Test
140130
@Override
141131
@Disabled("Import-related functionality is not supported in Cassandra")

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ public void corruptMetadata(String namespace, String table) {
5757
// Do nothing
5858
}
5959

60+
@Override
61+
public void deleteMetadata(String namespace, String table) throws Exception {
62+
// Do nothing
63+
}
64+
6065
@Override
6166
public void dropNamespace(String namespace) {
6267
String dropKeyspaceQuery =

0 commit comments

Comments
 (0)