This is an automated email from the ASF dual-hosted git repository.
jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new a6d89c602a5 Bump the OpenGauss Docker Image used by nativeTest to
7.0.0-RC1 (#35139)
a6d89c602a5 is described below
commit a6d89c602a5b505b7e96deb49767dd5f90c3b5c7
Author: Ling Hengqian <linghengq...@outlook.com>
AuthorDate: Tue Apr 8 15:30:14 2025 +0800
Bump the OpenGauss Docker Image used by nativeTest to 7.0.0-RC1 (#35139)
---
.../optional-plugins/testcontainers/_index.cn.md | 9 +++++++++
.../optional-plugins/testcontainers/_index.en.md | 8 ++++++++
.../reflect-config.json | 20 +++-----------------
.../test/natived/jdbc/databases/OpenGaussTest.java | 6 +-----
.../test-native/yaml/jdbc/databases/postgresql.yaml | 6 +++---
.../test-native/yaml/jdbc/databases/sqlserver.yaml | 6 +++---
6 files changed, 27 insertions(+), 28 deletions(-)
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.cn.md
index 4de7d12b78a..e8de0378adc 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.cn.md
@@ -106,3 +106,12 @@ public class ExampleUtils {
`org.testcontainers.jdbc.ContainerDatabaseDriver#killContainers()`
将立刻销毁所有由 `org.testcontainers.jdbc.ContainerDatabaseDriver` 创建的 Docker
Container。
默认情况下，通过 Junit 5 创建的单元测试是串行执行的，因此这一般不会造成问题。
+
+
+### host-less URIs 限制
+
+对于大多数 testcontainers-java 模块，
+ShardingSphere 配置文件的 `jdbcUrl` 可以使用类似
`jdbc:tc:postgresql:17.2-bookworm:///databasename` 的 host-less URIs。
+
+但对于特定 Maven 模块 `org.testcontainers:mssqlserver`，无法使用类似
`jdbc:tc:sqlserver:2022-CU16-ubuntu-22.04:///databasename` 的 host-less URIs，
+仅可使用类似
`jdbc:tc:sqlserver:2022-CU16-ubuntu-22.04://test;databaseName=databasename` 的
JDBC Url。
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.en.md
index 60950508b23..960493ea269 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.en.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.en.md
@@ -105,3 +105,11 @@ public class ExampleUtils {
`org.testcontainers.jdbc.ContainerDatabaseDriver#killContainers()`
will immediately destroy all Docker Containers created by
`org.testcontainers.jdbc.ContainerDatabaseDriver`.
By default, unit tests created by JUnit 5 are executed serially, so this is
generally not a problem.
+
+### host-less URIs restrictions
+
+For most testcontainers-java modules,
+the `jdbcUrl` of ShardingSphere configuration file can use host-less URIs like
`jdbc:tc:postgresql:17.2-bookworm:///databasename`.
+
+But for the specific Maven module `org.testcontainers:mssqlserver`, host-less
URIs like `jdbc:tc:sqlserver:2022-CU16-ubuntu-22.04:///databasename` cannot be
used,
+only JDBC Url like
`jdbc:tc:sqlserver:2022-CU16-ubuntu-22.04://test;databaseName=databasename` can
be used.
diff --git
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reflect-config.json
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reflect-config.json
index 3ada7702e1c..d720675965f 100644
---
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reflect-config.json
+++
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reflect-config.json
@@ -3,10 +3,6 @@
"condition":{"typeReachable":"org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource"},
"name":"JdkLogger"
},
-{
-
"condition":{"typeReachable":"org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine"},
- "name":"JdkLogger"
-},
{
"condition":{"typeReachable":"org.apache.shardingsphere.mode.repository.standalone.jdbc.sql.JDBCRepositorySQLLoader"},
"name":"[Lcom.fasterxml.jackson.databind.deser.BeanDeserializerModifier;"
@@ -80,7 +76,7 @@
"name":"[Lcom.zaxxer.hikari.util.ConcurrentBag$IConcurrentBagEntry;"
},
{
-
"condition":{"typeReachable":"org.apache.shardingsphere.proxy.backend.connector.StandardDatabaseConnector"},
+
"condition":{"typeReachable":"org.apache.shardingsphere.proxy.backend.connector.jdbc.datasource.JDBCBackendDataSource"},
"name":"[Lcom.zaxxer.hikari.util.ConcurrentBag$IConcurrentBagEntry;"
},
{
@@ -120,7 +116,7 @@
"name":"[Ljava.sql.Statement;"
},
{
-
"condition":{"typeReachable":"org.apache.shardingsphere.proxy.frontend.postgresql.command.query.extended.Portal"},
+
"condition":{"typeReachable":"org.apache.shardingsphere.proxy.backend.connector.jdbc.datasource.JDBCBackendDataSource"},
"name":"[Ljava.sql.Statement;"
},
{
@@ -208,11 +204,6 @@
"queryAllDeclaredMethods":true,
"methods":[{"name":"close","parameterTypes":[] },
{"name":"read","parameterTypes":["java.nio.CharBuffer"] }]
},
-{
-
"condition":{"typeReachable":"org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource"},
- "name":"java.io.Serializable",
- "queryAllDeclaredMethods":true
-},
{
"condition":{"typeReachable":"org.apache.shardingsphere.infra.expr.groovy.GroovyInlineExpressionParser"},
"name":"java.io.Serializable",
@@ -1105,7 +1096,7 @@
"name":"org.apache.shardingsphere.driver.ShardingSphereDriver"
},
{
-
"condition":{"typeReachable":"org.apache.shardingsphere.proxy.frontend.postgresql.command.query.extended.Portal"},
+
"condition":{"typeReachable":"org.apache.shardingsphere.proxy.backend.connector.jdbc.datasource.JDBCBackendDataSource"},
"name":"org.apache.shardingsphere.driver.ShardingSphereDriver"
},
{
@@ -2482,11 +2473,6 @@
"name":"org.apache.shardingsphere.mode.node.path.type.global.state.DatabaseListenerCoordinatorNodePath",
"fields":[{"name":"databaseName"}]
},
-{
-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockDefinition"},
-
"name":"org.apache.shardingsphere.mode.node.path.type.lock.GlobalLockNodePath",
- "fields":[{"name":"name"}]
-},
{
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.ClusterContextManagerBuilder"},
"name":"org.apache.shardingsphere.mode.repository.cluster.etcd.EtcdRepository",
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/OpenGaussTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/OpenGaussTest.java
index b89d338938e..d0a5e5b6572 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/OpenGaussTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/OpenGaussTest.java
@@ -53,13 +53,9 @@ class OpenGaussTest {
private final String password = "Enmo@123";
- /**
- * Unable to use Docker Image `enmotech/opengauss` under WSL.
- * Background comes from <a
href="https://github.com/enmotech/enmotech-docker-opengauss/issues/52";>enmotech/enmotech-docker-opengauss#52</a>.
- */
@SuppressWarnings("resource")
@Container
- private final GenericContainer<?> container = new
GenericContainer<>("enmotech/opengauss-lite:5.1.0")
+ private final GenericContainer<?> container = new
GenericContainer<>("opengauss/opengauss-server:7.0.0-RC1")
.withEnv("GS_PASSWORD", password)
.withExposedPorts(5432);
diff --git
a/test/native/src/test/resources/test-native/yaml/jdbc/databases/postgresql.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/databases/postgresql.yaml
index 5f07dd12e62..5af78e5a447 100644
---
a/test/native/src/test/resources/test-native/yaml/jdbc/databases/postgresql.yaml
+++
b/test/native/src/test/resources/test-native/yaml/jdbc/databases/postgresql.yaml
@@ -19,15 +19,15 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
- jdbcUrl:
jdbc:tc:postgresql:17.2-bookworm://test-native-databases-postgres/demo_ds_0
+ jdbcUrl: jdbc:tc:postgresql:17.2-bookworm:///demo_ds_0
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
- jdbcUrl:
jdbc:tc:postgresql:17.2-bookworm://test-native-databases-postgres/demo_ds_1
+ jdbcUrl: jdbc:tc:postgresql:17.2-bookworm:///demo_ds_1
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
- jdbcUrl:
jdbc:tc:postgresql:17.2-bookworm://test-native-databases-postgres/demo_ds_2
+ jdbcUrl: jdbc:tc:postgresql:17.2-bookworm:///demo_ds_2
rules:
- !SHARDING
diff --git
a/test/native/src/test/resources/test-native/yaml/jdbc/databases/sqlserver.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/databases/sqlserver.yaml
index 3376792b287..bda776afbbd 100644
---
a/test/native/src/test/resources/test-native/yaml/jdbc/databases/sqlserver.yaml
+++
b/test/native/src/test/resources/test-native/yaml/jdbc/databases/sqlserver.yaml
@@ -19,15 +19,15 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
- jdbcUrl:
jdbc:tc:sqlserver:2022-CU16-ubuntu-22.04://test-native-databases-mssqlserver;databaseName=demo_ds_0;
+ jdbcUrl:
jdbc:tc:sqlserver:2022-CU16-ubuntu-22.04://test-native-databases-mssqlserver;databaseName=demo_ds_0
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
- jdbcUrl:
jdbc:tc:sqlserver:2022-CU16-ubuntu-22.04://test-native-databases-mssqlserver;databaseName=demo_ds_1;
+ jdbcUrl:
jdbc:tc:sqlserver:2022-CU16-ubuntu-22.04://test-native-databases-mssqlserver;databaseName=demo_ds_1
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
- jdbcUrl:
jdbc:tc:sqlserver:2022-CU16-ubuntu-22.04://test-native-databases-mssqlserver;databaseName=demo_ds_2;
+ jdbcUrl:
jdbc:tc:sqlserver:2022-CU16-ubuntu-22.04://test-native-databases-mssqlserver;databaseName=demo_ds_2
rules:
- !SHARDING
