Skip to content

Commit 2d9bdfa

Browse files
Torch3333Torch3333
committed
Merge remote-tracking branch 'origin' into oracle_blob_change
# Conflicts: # core/src/main/java/com/scalar/db/common/CoreError.java
2 parents 96c2073 + 03a1c76 commit 2d9bdfa

File tree

75 files changed

+3793
-527
lines changed

Some content is hidden

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

75 files changed

+3793
-527
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
7777
- name: Upload Gradle test reports
7878
if: always()
79-
uses: actions/upload-artifact@v4
79+
uses: actions/upload-artifact@v5
8080
with:
8181
name: gradle_check_reports
8282
path: /tmp/gradle_test_reports
@@ -97,7 +97,7 @@ jobs:
9797
9898
- name: Upload Spotbugs reports
9999
if: always()
100-
uses: actions/upload-artifact@v4
100+
uses: actions/upload-artifact@v5
101101
with:
102102
name: gradle_spotbugs_reports
103103
path: /tmp/gradle_spotbugs_reports
@@ -184,7 +184,7 @@ jobs:
184184

185185
- name: Upload Gradle test reports
186186
if: always()
187-
uses: actions/upload-artifact@v4
187+
uses: actions/upload-artifact@v5
188188
with:
189189
name: cassandra_3.0_integration_test_reports_${{ matrix.mode.label }}
190190
path: core/build/reports/tests/integrationTestCassandra
@@ -249,7 +249,7 @@ jobs:
249249

250250
- name: Upload Gradle test reports
251251
if: always()
252-
uses: actions/upload-artifact@v4
252+
uses: actions/upload-artifact@v5
253253
with:
254254
name: cassandra_3.11_integration_test_reports_${{ matrix.mode.label }}
255255
path: core/build/reports/tests/integrationTestCassandra
@@ -348,7 +348,7 @@ jobs:
348348

349349
- name: Upload Gradle test reports
350350
if: always()
351-
uses: actions/upload-artifact@v4
351+
uses: actions/upload-artifact@v5
352352
with:
353353
name: cosmos_integration_test_reports_${{ matrix.mode.label }}
354354
path: core/build/reports/tests/integrationTestCosmos
@@ -410,7 +410,7 @@ jobs:
410410

411411
- name: Upload Gradle test reports
412412
if: always()
413-
uses: actions/upload-artifact@v4
413+
uses: actions/upload-artifact@v5
414414
with:
415415
name: dynamo_integration_test_reports_${{ matrix.mode.label }}
416416
path: core/build/reports/tests/integrationTestDynamo
@@ -470,7 +470,7 @@ jobs:
470470

471471
- name: Upload Gradle test reports
472472
if: always()
473-
uses: actions/upload-artifact@v4
473+
uses: actions/upload-artifact@v5
474474
with:
475475
name: mysql_5.7_integration_test_reports_${{ matrix.mode.label }}
476476
path: core/build/reports/tests/integrationTestJdbc
@@ -530,7 +530,7 @@ jobs:
530530

531531
- name: Upload Gradle test reports
532532
if: always()
533-
uses: actions/upload-artifact@v4
533+
uses: actions/upload-artifact@v5
534534
with:
535535
name: mysql_8.0_integration_test_reports_${{ matrix.mode.label }}
536536
path: core/build/reports/tests/integrationTestJdbc
@@ -590,7 +590,7 @@ jobs:
590590

591591
- name: Upload Gradle test reports
592592
if: always()
593-
uses: actions/upload-artifact@v4
593+
uses: actions/upload-artifact@v5
594594
with:
595595
name: mysql_8.4_integration_test_reports_${{ matrix.mode.label }}
596596
path: core/build/reports/tests/integrationTestJdbc
@@ -655,7 +655,7 @@ jobs:
655655

656656
- name: Upload Gradle test reports
657657
if: always()
658-
uses: actions/upload-artifact@v4
658+
uses: actions/upload-artifact@v5
659659
with:
660660
name: postgresql_13_integration_test_reports_${{ matrix.mode.label }}
661661
path: core/build/reports/tests/integrationTestJdbc
@@ -720,7 +720,7 @@ jobs:
720720

721721
- name: Upload Gradle test reports
722722
if: always()
723-
uses: actions/upload-artifact@v4
723+
uses: actions/upload-artifact@v5
724724
with:
725725
name: postgresql_14_integration_test_reports_${{ matrix.mode.label }}
726726
path: core/build/reports/tests/integrationTestJdbc
@@ -785,7 +785,7 @@ jobs:
785785

786786
- name: Upload Gradle test reports
787787
if: always()
788-
uses: actions/upload-artifact@v4
788+
uses: actions/upload-artifact@v5
789789
with:
790790
name: postgresql_15_integration_test_reports_${{ matrix.mode.label }}
791791
path: core/build/reports/tests/integrationTestJdbc
@@ -850,7 +850,7 @@ jobs:
850850

851851
- name: Upload Gradle test reports
852852
if: always()
853-
uses: actions/upload-artifact@v4
853+
uses: actions/upload-artifact@v5
854854
with:
855855
name: postgresql_16_integration_test_reports_${{ matrix.mode.label }}
856856
path: core/build/reports/tests/integrationTestJdbc
@@ -915,7 +915,7 @@ jobs:
915915

916916
- name: Upload Gradle test reports
917917
if: always()
918-
uses: actions/upload-artifact@v4
918+
uses: actions/upload-artifact@v5
919919
with:
920920
name: postgresql_17_integration_test_reports_${{ matrix.mode.label }}
921921
path: core/build/reports/tests/integrationTestJdbc
@@ -980,7 +980,7 @@ jobs:
980980

981981
- name: Upload Gradle test reports
982982
if: always()
983-
uses: actions/upload-artifact@v4
983+
uses: actions/upload-artifact@v5
984984
with:
985985
name: oracle_19_integration_test_reports_${{ matrix.mode.label }}
986986
path: core/build/reports/tests/integrationTestJdbc
@@ -1052,7 +1052,7 @@ jobs:
10521052

10531053
- name: Upload Gradle test reports
10541054
if: always()
1055-
uses: actions/upload-artifact@v4
1055+
uses: actions/upload-artifact@v5
10561056
with:
10571057
name: oracle_21_integration_test_reports_${{ matrix.mode.label }}
10581058
path: core/build/reports/tests/integrationTestJdbc
@@ -1141,7 +1141,7 @@ jobs:
11411141

11421142
- name: Upload Gradle test reports
11431143
if: always()
1144-
uses: actions/upload-artifact@v4
1144+
uses: actions/upload-artifact@v5
11451145
with:
11461146
name: oracle_23_integration_test_reports_${{ matrix.mode.label }}
11471147
path: core/build/reports/tests/integrationTestJdbc
@@ -1223,7 +1223,7 @@ jobs:
12231223

12241224
- name: Upload Gradle test reports
12251225
if: always()
1226-
uses: actions/upload-artifact@v4
1226+
uses: actions/upload-artifact@v5
12271227
with:
12281228
name: sqlserver_2017_integration_test_reports_${{ matrix.mode.label }}
12291229
path: core/build/reports/tests/integrationTestJdbc
@@ -1294,7 +1294,7 @@ jobs:
12941294

12951295
- name: Upload Gradle test reports
12961296
if: always()
1297-
uses: actions/upload-artifact@v4
1297+
uses: actions/upload-artifact@v5
12981298
with:
12991299
name: sqlserver_2019_integration_test_reports_${{ matrix.mode.label }}
13001300
path: core/build/reports/tests/integrationTestJdbc
@@ -1365,7 +1365,7 @@ jobs:
13651365

13661366
- name: Upload Gradle test reports
13671367
if: always()
1368-
uses: actions/upload-artifact@v4
1368+
uses: actions/upload-artifact@v5
13691369
with:
13701370
name: sqlserver_2022_integration_test_reports_${{ matrix.mode.label }}
13711371
path: core/build/reports/tests/integrationTestJdbc
@@ -1424,7 +1424,7 @@ jobs:
14241424

14251425
- name: Upload Gradle test reports
14261426
if: always()
1427-
uses: actions/upload-artifact@v4
1427+
uses: actions/upload-artifact@v5
14281428
with:
14291429
name: sqlite_3_integration_test_reports_${{ matrix.mode.label }}
14301430
path: core/build/reports/tests/integrationTestJdbc
@@ -1484,7 +1484,7 @@ jobs:
14841484

14851485
- name: Upload Gradle test reports
14861486
if: always()
1487-
uses: actions/upload-artifact@v4
1487+
uses: actions/upload-artifact@v5
14881488
with:
14891489
name: mariadb_10_integration_test_reports_${{ matrix.mode.label }}
14901490
path: core/build/reports/tests/integrationTestJdbc
@@ -1544,7 +1544,7 @@ jobs:
15441544

15451545
- name: Upload Gradle test reports
15461546
if: always()
1547-
uses: actions/upload-artifact@v4
1547+
uses: actions/upload-artifact@v5
15481548
with:
15491549
name: mariadb_11.4_integration_test_reports_${{ matrix.mode.label }}
15501550
path: core/build/reports/tests/integrationTestJdbc
@@ -1604,7 +1604,7 @@ jobs:
16041604

16051605
- name: Upload Gradle test reports
16061606
if: always()
1607-
uses: actions/upload-artifact@v4
1607+
uses: actions/upload-artifact@v5
16081608
with:
16091609
name: yugabytedb_2_integration_test_reports_${{ matrix.mode.label }}
16101610
path: core/build/reports/tests/integrationTestJdbc
@@ -1682,7 +1682,7 @@ jobs:
16821682

16831683
- name: Upload Gradle test reports
16841684
if: always()
1685-
uses: actions/upload-artifact@v4
1685+
uses: actions/upload-artifact@v5
16861686
with:
16871687
name: db2_11.5_integration_test_reports_${{ matrix.mode.label }}
16881688
path: core/build/reports/tests/integrationTestJdbc
@@ -1760,7 +1760,7 @@ jobs:
17601760

17611761
- name: Upload Gradle test reports
17621762
if: always()
1763-
uses: actions/upload-artifact@v4
1763+
uses: actions/upload-artifact@v5
17641764
with:
17651765
name: db2_12.1_integration_test_reports_${{ matrix.mode.label }}
17661766
path: core/build/reports/tests/integrationTestJdbc
@@ -1789,16 +1789,16 @@ jobs:
17891789
group_commit_enabled: true
17901790

17911791
steps:
1792-
- uses: actions/checkout@v4
1792+
- uses: actions/checkout@v5
17931793

17941794
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
1795-
uses: actions/setup-java@v4
1795+
uses: actions/setup-java@v5
17961796
with:
17971797
java-version: ${{ env.JAVA_VERSION }}
17981798
distribution: ${{ env.JAVA_VENDOR }}
17991799

18001800
- name: Set up JDK ${{ env.INT_TEST_JAVA_RUNTIME_VERSION }} (${{ env.INT_TEST_JAVA_RUNTIME_VENDOR }}) to run integration test
1801-
uses: actions/setup-java@v4
1801+
uses: actions/setup-java@v5
18021802
if: ${{ env.SET_UP_INT_TEST_RUNTIME_NON_ORACLE_JDK == 'true'}}
18031803
with:
18041804
java-version: ${{ env.INT_TEST_JAVA_RUNTIME_VERSION }}
@@ -1819,14 +1819,14 @@ jobs:
18191819
docker cp -L "$container_id:/usr/java/default" /usr/lib/jvm/oracle-jdk && docker rm "$container_id"
18201820
18211821
- name: Setup Gradle
1822-
uses: gradle/actions/setup-gradle@v4
1822+
uses: gradle/actions/setup-gradle@v5
18231823

18241824
- name: Execute Gradle 'integrationTestJdbc' task
18251825
run: ./gradlew integrationTestJdbc -Dscalardb.jdbc.url=jdbc:postgresql://localhost:5432/ -Dscalardb.jdbc.username=postgres -Dscalardb.jdbc.password=postgres ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
18261826

18271827
- name: Upload Gradle test reports
18281828
if: always()
1829-
uses: actions/upload-artifact@v4
1829+
uses: actions/upload-artifact@v5
18301830
with:
18311831
name: alloydb_15_integration_test_reports_${{ matrix.mode.label }}
18321832
path: core/build/reports/tests/integrationTestJdbc
@@ -1855,16 +1855,16 @@ jobs:
18551855
group_commit_enabled: true
18561856

18571857
steps:
1858-
- uses: actions/checkout@v4
1858+
- uses: actions/checkout@v5
18591859

18601860
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
1861-
uses: actions/setup-java@v4
1861+
uses: actions/setup-java@v5
18621862
with:
18631863
java-version: ${{ env.JAVA_VERSION }}
18641864
distribution: ${{ env.JAVA_VENDOR }}
18651865

18661866
- name: Set up JDK ${{ env.INT_TEST_JAVA_RUNTIME_VERSION }} (${{ env.INT_TEST_JAVA_RUNTIME_VENDOR }}) to run integration test
1867-
uses: actions/setup-java@v4
1867+
uses: actions/setup-java@v5
18681868
if: ${{ env.SET_UP_INT_TEST_RUNTIME_NON_ORACLE_JDK == 'true'}}
18691869
with:
18701870
java-version: ${{ env.INT_TEST_JAVA_RUNTIME_VERSION }}
@@ -1885,14 +1885,14 @@ jobs:
18851885
docker cp -L "$container_id:/usr/java/default" /usr/lib/jvm/oracle-jdk && docker rm "$container_id"
18861886
18871887
- name: Setup Gradle
1888-
uses: gradle/actions/setup-gradle@v4
1888+
uses: gradle/actions/setup-gradle@v5
18891889

18901890
- name: Execute Gradle 'integrationTestJdbc' task
18911891
run: ./gradlew integrationTestJdbc -Dscalardb.jdbc.url=jdbc:postgresql://localhost:5432/ -Dscalardb.jdbc.username=postgres -Dscalardb.jdbc.password=postgres ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
18921892

18931893
- name: Upload Gradle test reports
18941894
if: always()
1895-
uses: actions/upload-artifact@v4
1895+
uses: actions/upload-artifact@v5
18961896
with:
18971897
name: alloydb_16_integration_test_reports_${{ matrix.mode.label }}
18981898
path: core/build/reports/tests/integrationTestJdbc
@@ -1964,7 +1964,7 @@ jobs:
19641964
run: ./gradlew integrationTestMultiStorage ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
19651965

19661966
- name: Upload Gradle test reports
1967-
uses: actions/upload-artifact@v4
1967+
uses: actions/upload-artifact@v5
19681968
if: always()
19691969
with:
19701970
name: multi_storage_integration_test_reports_${{ matrix.mode.label }}

0 commit comments

Comments
 (0)