Skip to content

Commit c2bc08f

Browse files
linghengqianlinghengqian
committed
Uses GraalVM CE For JDK 22.0.2 in CI to prevent OutOfMemoryError
1 parent 6ededf9 commit c2bc08f

File tree

14 files changed

+42
-68
lines changed

14 files changed

+42
-68
lines changed

‎.github/workflows/graalvm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
fail-fast: false
4646
matrix:
4747
os: [ 'ubuntu-latest' ]
48-
java-version: [ '22.0.1' ]
48+
java-version: [ '22.0.2' ]
4949
steps:
5050
- uses: actions/checkout@v4
5151
- uses: graalvm/setup-graalvm@v1

‎.github/workflows/nightly-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
ref: ${{ inputs.commit-id }}
121121
- uses: graalvm/setup-graalvm@v1
122122
with:
123-
java-version: '21.0.2'
123+
java-version: '22.0.2'
124124
distribution: 'graalvm-community'
125125
github-token: ${{ secrets.GITHUB_TOKEN }}
126126
- uses: actions/cache@v4

‎.github/workflows/nightly-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
- uses: actions/checkout@v4
116116
- uses: graalvm/setup-graalvm@v1
117117
with:
118-
java-version: '22.0.1'
118+
java-version: '22.0.2'
119119
distribution: 'graalvm-community'
120120
github-token: ${{ secrets.GITHUB_TOKEN }}
121121
- uses: actions/cache@v4

‎docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.cn.md

+2-5
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,9 @@ Image，你需要借助于 GraalVM Native Build Tools。GraalVM Native Build Too
1313
CE 的 `native-image` 命令行工具的长篇大论的 shell 命令。
1414

1515
ShardingSphere JDBC 要求在如下或更高版本的 `GraalVM CE` 完成构建 GraalVM Native Image。使用者可通过 SDKMAN! 快速切换 JDK。这同理
16-
适用于 `Oracle GraalVM`， `Liberica NIK` 和 `Mandrel` 等 `GraalVM CE` 的下游发行版。
16+
适用于 https://sdkman.io/jdks#graal ， https://sdkman.io/jdks#nik 和 https://sdkman.io/jdks#mandrel 等 `GraalVM CE` 的下游发行版。
1717

18-
- GraalVM CE For JDK 22.0.1，对应于 SDKMAN! 的 `22.0.1-graalce`
19-
- Oracle GraalVM For JDK 22.0.1，对应于 SDKMAN! 的 `22.0.1-graal`
20-
- Liberica NIK For JDK 22.0.1，对应于 SDKMAN! 的 `24.0.1.r22-nik`
21-
- Mandrel For JDK 22.0.1，对应于 SDKMAN! 的 `24.0.1.r22-mandrel`
18+
- GraalVM CE For JDK 22.0.2，对应于 SDKMAN! 的 `22.0.2-graalce`
2219

2320
用户依然可以使用 SDKMAN! 上的 `21.0.2-graalce` 等旧版本的 GraalVM CE 来构建 ShardingSphere 的 GraalVM Native Image 产物。
2421
但这将导致集成部分第三方依赖时，构建 GraalVM Native Image 失败。

‎docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.en.md

+5-8
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,11 @@ Build GraalVM Native containing Maven dependencies of `org.apache.shardingsphere
1212
Image, you need to resort to GraalVM Native Build Tools. GraalVM Native Build Tools provides Maven Plugin and Gradle Plugin
1313
to simplify long list of shell commands for GraalVM CE's `native-image` command line tool.
1414

15-
ShardingSphere JDBC requires GraalVM Native Image to be built with GraalVM CE as follows or higher. Users can quickly switch
16-
JDK through `SDKMAN!`. Same reason applicable to downstream distributions of `GraalVM CE` such as `Oracle GraalVM`, `Liberica NIK`
17-
and `Mandrel`.
18-
19-
- GraalVM CE For JDK 22.0.1, corresponding to `21.0.2-graalce` of SDKMAN!
20-
- Oracle GraalVM For JDK 22.0.1, corresponding to `22.0.1-graal` of SDKMAN!
21-
- Liberica NIK For JDK 22.0.1, corresponding to `24.0.1.r22-nik` of SDKMAN!
22-
- Mandrel For JDK 22.0.1, corresponding to `24.0.1.r22-mandrel` of SDKMAN!
15+
ShardingSphere JDBC requires GraalVM Native Image to be built with GraalVM CE as follows or higher. Users can quickly switch
16+
JDK through `SDKMAN!`. Same reason applicable to downstream distributions of `GraalVM CE` such as https://sdkman.io/jdks#graal ,
17+
https://sdkman.io/jdks#nik and https://sdkman.io/jdks#mandrel .
18+
19+
- GraalVM CE For JDK 22.0.2, corresponding to `22.0.2-graalce` of SDKMAN!
2320

2421
Users can still use the old versions of GraalVM CE such as `21.0.2-graalce` on SDKMAN! to build the GraalVM Native Image product of ShardingSphere.
2522
However, this will cause the failure of building the GraalVM Native Image when integrating some third-party dependencies.

‎docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ services:
3535
或 `GraalVM Community Edition` 的下游发行版。若使用 `SDKMAN!`，
3636

3737
```shell
38-
sdk install java 22.0.1-graalce
38+
sdk install java 22.0.2-graalce
3939
```
4040

4141
2. 根据 https://www.graalvm.org/jdk22/reference-manual/native-image/#prerequisites 的要求安装本地工具链。

‎docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ services:
3737
JDK 22 according to https://www.graalvm.org/downloads/. If `SDKMAN!` is used,
3838

3939
```shell
40-
sdk install java 22.0.1-graalce
40+
sdk install java 22.0.2-graalce
4141
```
4242

4343
2. Install the local toolchain as required by https://www.graalvm.org/jdk22/reference-manual/native-image/#prerequisites.

‎infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reflect-config.json

+16-36
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,6 @@
205205
"name":"org.apache.shardingsphere.encrypt.algorithm.assisted.MD5AssistedEncryptAlgorithm",
206206
"methods":[{"name":"<init>","parameterTypes":[] }]
207207
},
208-
{
209-
"condition":{"typeReachable":"org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader"},
210-
"name":"org.apache.shardingsphere.encrypt.algorithm.assisted.MD5AssistedEncryptAlgorithm",
211-
"methods":[{"name":"<init>","parameterTypes":[] }]
212-
},
213208
{
214209
"condition":{"typeReachable":"org.apache.shardingsphere.encrypt.checker.EncryptRuleConfigurationChecker"},
215210
"name":"org.apache.shardingsphere.encrypt.algorithm.standard.AESEncryptAlgorithm",
@@ -220,11 +215,6 @@
220215
"name":"org.apache.shardingsphere.encrypt.algorithm.standard.AESEncryptAlgorithm",
221216
"methods":[{"name":"<init>","parameterTypes":[] }]
222217
},
223-
{
224-
"condition":{"typeReachable":"org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader"},
225-
"name":"org.apache.shardingsphere.encrypt.algorithm.standard.AESEncryptAlgorithm",
226-
"methods":[{"name":"<init>","parameterTypes":[] }]
227-
},
228218
{
229219
"condition":{"typeReachable":"org.apache.shardingsphere.infra.spi.type.ordered.OrderedSPILoader"},
230220
"name":"org.apache.shardingsphere.encrypt.checker.EncryptRuleConfigurationChecker"
@@ -587,12 +577,12 @@
587577
"name":"org.apache.shardingsphere.infra.util.eventbus.EventSubscriber"
588578
},
589579
{
590-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.event.subsciber.DeliverEventSubscriberRegistry$$Lambda/0x00007f81f7c5fdb8"},
580+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.event.subsciber.DeliverEventSubscriberRegistry$$Lambda/0x00007f769fc59460"},
591581
"name":"org.apache.shardingsphere.infra.util.eventbus.EventSubscriber",
592582
"queryAllDeclaredMethods":true
593583
},
594584
{
595-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f81f7c6d1e8"},
585+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f769fc6a2e8"},
596586
"name":"org.apache.shardingsphere.infra.util.eventbus.EventSubscriber",
597587
"queryAllDeclaredMethods":true
598588
},
@@ -906,7 +896,7 @@
906896
"name":"org.apache.shardingsphere.mask.yaml.config.rule.YamlMaskTableRuleConfigurationCustomizer"
907897
},
908898
{
909-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.event.subsciber.DeliverEventSubscriberRegistry$$Lambda/0x00007f81f7c5fdb8"},
899+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.event.subsciber.DeliverEventSubscriberRegistry$$Lambda/0x00007f769fc59460"},
910900
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.deliver.DeliverQualifiedDataSourceSubscriber",
911901
"queryAllDeclaredMethods":true
912902
},
@@ -916,42 +906,42 @@
916906
"methods":[{"name":"cleanCache","parameterTypes":["org.apache.shardingsphere.mode.event.dispatch.DispatchEvent"] }]
917907
},
918908
{
919-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f81f7c6d1e8"},
909+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f769fc6a2e8"},
920910
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.CacheEvictedSubscriber",
921911
"queryAllDeclaredMethods":true
922912
},
923913
{
924-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f81f7c6d1e8"},
914+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f769fc6a2e8"},
925915
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ComputeNodeOnlineSubscriber",
926916
"queryAllDeclaredMethods":true
927917
},
928918
{
929-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f81f7c6d1e8"},
919+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f769fc6a2e8"},
930920
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.DatabaseChangedSubscriber",
931921
"queryAllDeclaredMethods":true
932922
},
933923
{
934-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f81f7c6d1e8"},
924+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f769fc6a2e8"},
935925
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.GlobalRuleConfigurationEventSubscriber",
936926
"queryAllDeclaredMethods":true
937927
},
938928
{
939-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f81f7c6d1e8"},
929+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f769fc6a2e8"},
940930
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ListenerAssistedSubscriber",
941931
"queryAllDeclaredMethods":true
942932
},
943933
{
944-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f81f7c6d1e8"},
934+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f769fc6a2e8"},
945935
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ProcessListChangedSubscriber",
946936
"queryAllDeclaredMethods":true
947937
},
948938
{
949-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f81f7c6d1e8"},
939+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f769fc6a2e8"},
950940
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.PropertiesEventSubscriber",
951941
"queryAllDeclaredMethods":true
952942
},
953943
{
954-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f81f7c6d1e8"},
944+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f769fc6a2e8"},
955945
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.QualifiedDataSourceSubscriber",
956946
"queryAllDeclaredMethods":true
957947
},
@@ -960,26 +950,26 @@
960950
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ResourceMetaDataChangedSubscriber"
961951
},
962952
{
963-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f81f7c6d1e8"},
953+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f769fc6a2e8"},
964954
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ResourceMetaDataChangedSubscriber",
965955
"queryAllDeclaredMethods":true
966956
},
967957
{
968-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.listener.MetaDataChangedListener$$Lambda/0x00007f81f7c73270"},
958+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.listener.MetaDataChangedListener$$Lambda/0x00007f769fc70240"},
969959
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ResourceMetaDataChangedSubscriber"
970960
},
971961
{
972-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f81f7c6d1e8"},
962+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f769fc6a2e8"},
973963
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.RuleItemChangedSubscriber",
974964
"queryAllDeclaredMethods":true
975965
},
976966
{
977-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f81f7c6d1e8"},
967+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f769fc6a2e8"},
978968
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.StateChangedSubscriber",
979969
"queryAllDeclaredMethods":true
980970
},
981971
{
982-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f81f7c6d1e8"},
972+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry$$Lambda/0x00007f769fc6a2e8"},
983973
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.StorageUnitEventSubscriber",
984974
"queryAllDeclaredMethods":true
985975
},
@@ -1826,16 +1816,6 @@
18261816
"name":"org.apache.shardingsphere.transaction.xa.atomikos.manager.AtomikosTransactionManagerProvider",
18271817
"methods":[{"name":"<init>","parameterTypes":[] }]
18281818
},
1829-
{
1830-
"condition":{"typeReachable":"org.apache.shardingsphere.transaction.xa.XAShardingSphereTransactionManager"},
1831-
"name":"org.apache.shardingsphere.transaction.xa.jta.datasource.checker.dialect.H2XATransactionPrivilegeChecker",
1832-
"methods":[{"name":"<init>","parameterTypes":[] }]
1833-
},
1834-
{
1835-
"condition":{"typeReachable":"org.apache.shardingsphere.transaction.xa.XAShardingSphereTransactionManager"},
1836-
"name":"org.apache.shardingsphere.transaction.xa.jta.datasource.checker.dialect.MySQLXATransactionPrivilegeChecker",
1837-
"methods":[{"name":"<init>","parameterTypes":[] }]
1838-
},
18391819
{
18401820
"condition":{"typeReachable":"org.apache.shardingsphere.transaction.xa.XAShardingSphereTransactionManager"},
18411821
"name":"org.apache.shardingsphere.transaction.xa.narayana.manager.NarayanaXATransactionManagerProvider",

‎infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/resource-config.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,6 @@
126126
}, {
127127
"condition":{"typeReachable":"org.apache.shardingsphere.authority.rule.AuthorityRule"},
128128
"pattern":"\\QMETA-INF/services/org.apache.shardingsphere.authority.spi.PrivilegeProvider\\E"
129-
}, {
130-
"condition":{"typeReachable":"org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader"},
131-
"pattern":"\\QMETA-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm\\E"
132129
}, {
133130
"condition":{"typeReachable":"org.apache.shardingsphere.infra.spi.type.ordered.OrderedSPILoader"},
134131
"pattern":"\\QMETA-INF/services/org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker\\E"
@@ -216,6 +213,9 @@
216213
}, {
217214
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.standalone.StandaloneContextManagerBuilder"},
218215
"pattern":"\\QMETA-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy\\E"
216+
}, {
217+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.standalone.StandaloneContextManagerBuilder"},
218+
"pattern":"\\QMETA-INF/services/org.testcontainers.utility.ImageNameSubstitutor\\E"
219219
}, {
220220
"condition":{"typeReachable":"org.apache.shardingsphere.transaction.base.seata.at.SeataATShardingSphereTransactionManager"},
221221
"pattern":"\\Q\\E"

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@
139139
<hamcrest.version>2.2</hamcrest.version>
140140
<mockito.version>4.11.0</mockito.version>
141141
<awaitility.version>4.2.0</awaitility.version>
142-
<testcontainers.version>1.19.8</testcontainers.version>
142+
<testcontainers.version>1.20.0</testcontainers.version>
143143
<commons-csv.version>1.9.0</commons-csv.version>
144144

145-
<graal-sdk.version>24.0.1</graal-sdk.version>
145+
<graal-sdk.version>24.0.2</graal-sdk.version>
146146
<jedis.version>4.4.6</jedis.version>
147147

148148
<!-- 3rd party library plugin versions -->

‎test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/MySQLTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import static org.hamcrest.Matchers.nullValue;
4545

4646
/**
47-
* Unable to use `org.testcontainers:mysql:1.19.3` under GraalVM Native Image.
47+
* Unable to use `org.testcontainers:mysql:1.20.0` under GraalVM Native Image.
4848
* Background comes from <a href="https://github.com/testcontainers/testcontainers-java/issues/7954">testcontainers/testcontainers-java#7954</a>.
4949
*/
5050
@EnabledInNativeImage
@@ -61,7 +61,7 @@ class MySQLTest {
6161

6262
@SuppressWarnings("resource")
6363
@Container
64-
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("mysql:8.4.0-oracle"))
64+
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("mysql:9.0.1-oraclelinux9"))
6565
.withEnv("MYSQL_DATABASE", DATABASE)
6666
.withEnv("MYSQL_ROOT_PASSWORD", PASSWORD)
6767
.withExposedPorts(3306);

‎test/native/src/test/resources/container-license-acceptance.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
mcr.microsoft.com/mssql/server:2022-CU10-ubuntu-22.04
1+
mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04

‎test/native/src/test/resources/test-native/yaml/databases/clickhouse.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ dataSources:
2525
ds_0:
2626
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
2727
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
28-
jdbcUrl: jdbc:tc:shardingsphere0clickhouse:24.4.1.2088://test-native-databases-clickhouse/demo_ds_0?TC_INITSCRIPT=test-native/sql/test-native-databases-clickhouse.sql
28+
jdbcUrl: jdbc:tc:shardingsphere0clickhouse:24.6.2.17://test-native-databases-clickhouse/demo_ds_0?TC_INITSCRIPT=test-native/sql/test-native-databases-clickhouse.sql
2929
ds_1:
3030
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
3131
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
32-
jdbcUrl: jdbc:tc:shardingsphere0clickhouse:24.4.1.2088://test-native-databases-clickhouse/demo_ds_1?TC_INITSCRIPT=test-native/sql/test-native-databases-clickhouse.sql
32+
jdbcUrl: jdbc:tc:shardingsphere0clickhouse:24.6.2.17://test-native-databases-clickhouse/demo_ds_1?TC_INITSCRIPT=test-native/sql/test-native-databases-clickhouse.sql
3333
ds_2:
3434
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
3535
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
36-
jdbcUrl: jdbc:tc:shardingsphere0clickhouse:24.4.1.2088://test-native-databases-clickhouse/demo_ds_2?TC_INITSCRIPT=test-native/sql/test-native-databases-clickhouse.sql
36+
jdbcUrl: jdbc:tc:shardingsphere0clickhouse:24.6.2.17://test-native-databases-clickhouse/demo_ds_2?TC_INITSCRIPT=test-native/sql/test-native-databases-clickhouse.sql
3737

3838
rules:
3939
- !SHARDING

‎test/native/src/test/resources/test-native/yaml/databases/sqlserver.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ dataSources:
2424
ds_0:
2525
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
2626
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
27-
jdbcUrl: jdbc:tc:sqlserver:2022-CU10-ubuntu-22.04://test-native-databases-mssqlserver;databaseName=demo_ds_0;
27+
jdbcUrl: jdbc:tc:sqlserver:2022-CU14-ubuntu-22.04://test-native-databases-mssqlserver;databaseName=demo_ds_0;
2828
ds_1:
2929
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
3030
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
31-
jdbcUrl: jdbc:tc:sqlserver:2022-CU10-ubuntu-22.04://test-native-databases-mssqlserver;databaseName=demo_ds_1;
31+
jdbcUrl: jdbc:tc:sqlserver:2022-CU14-ubuntu-22.04://test-native-databases-mssqlserver;databaseName=demo_ds_1;
3232
ds_2:
3333
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
3434
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
35-
jdbcUrl: jdbc:tc:sqlserver:2022-CU10-ubuntu-22.04://test-native-databases-mssqlserver;databaseName=demo_ds_2;
35+
jdbcUrl: jdbc:tc:sqlserver:2022-CU14-ubuntu-22.04://test-native-databases-mssqlserver;databaseName=demo_ds_2;
3636

3737
rules:
3838
- !SHARDING

0 commit comments

Comments
 (0)