Skip to content

Commit ec8f296

Browse files
authored
Merge branch 'master' into jdbc_transaction_manager_do_not_set_serializable_transaction_isolation_level
2 parents 626a05f + 97a8387 commit ec8f296

21 files changed

+533
-19
lines changed

.github/workflows/ci.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -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,7 +1819,7 @@ 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 || '' }}
@@ -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,7 +1885,7 @@ 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 || '' }}

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/ConsensusCommitAdminIntegrationTestWithCassandra.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/SingleCrudOperationTransactionAdminIntegrationTestWithCassandra.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,8 @@ public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentEx
9999
@Override
100100
@Disabled("Cassandra does not support renaming tables")
101101
public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {}
102+
103+
@Override
104+
@Disabled("Cassandra does not support renaming tables")
105+
public void renameTable_IfOnlyOneTableExists_ShouldRenameTableCorrectly() {}
102106
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,8 @@ public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentEx
9696
@Override
9797
@Disabled("Cosmos DB does not support renaming tables")
9898
public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {}
99+
100+
@Override
101+
@Disabled("Cosmos DB does not support renaming tables")
102+
public void renameTable_IfOnlyOneTableExists_ShouldRenameTableCorrectly() {}
99103
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,8 @@ public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentEx
9696
@Override
9797
@Disabled("Cosmos DB does not support renaming tables")
9898
public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {}
99+
100+
@Override
101+
@Disabled("Cosmos DB does not support renaming tables")
102+
public void renameTable_IfOnlyOneTableExists_ShouldRenameTableCorrectly() {}
99103
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,8 @@ public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentEx
9595
@Override
9696
@Disabled("Cosmos DB does not support renaming tables")
9797
public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {}
98+
99+
@Override
100+
@Disabled("Cosmos DB does not support renaming tables")
101+
public void renameTable_IfOnlyOneTableExists_ShouldRenameTableCorrectly() {}
98102
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,8 @@ public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentEx
9090
@Override
9191
@Disabled("Cosmos DB does not support renaming tables")
9292
public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {}
93+
94+
@Override
95+
@Disabled("Cosmos DB does not support renaming tables")
96+
public void renameTable_IfOnlyOneTableExists_ShouldRenameTableCorrectly() {}
9397
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,8 @@ public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentEx
101101
@Override
102102
@Disabled("DynamoDB does not support renaming tables")
103103
public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {}
104+
105+
@Override
106+
@Disabled("DynamoDB does not support renaming tables")
107+
public void renameTable_IfOnlyOneTableExists_ShouldRenameTableCorrectly() {}
104108
}

0 commit comments

Comments
 (0)