This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 9e6ad631837 Fixes broken links in Proxy Native documentation due to
redirects (#33345)
9e6ad631837 is described below
commit 9e6ad631837c040fdd3caedfe1c6aa53d8bcd678
Author: Ling Hengqian <linghengq...@outlook.com>
AuthorDate: Tue Oct 22 14:17:36 2024 +0800
Fixes broken links in Proxy Native documentation due to redirects (#33345)
---
.../startup/graalvm-native-image.cn.md | 2 +-
.../startup/graalvm-native-image.en.md | 2 +-
.../reflect-config.json | 7 ++++-
.../resource-config.json | 32 +++++++++++-----------
.../natived/jdbc/databases/ClickHouseTest.java | 2 +-
.../test/natived/jdbc/databases/HiveTest.java | 2 +-
.../test/natived/jdbc/databases/MySQLTest.java | 2 +-
.../test/natived/jdbc/databases/OpenGaussTest.java | 2 +-
.../test/natived/jdbc/databases/PostgresTest.java | 2 +-
.../test/natived/jdbc/databases/SQLServerTest.java | 2 +-
.../test/natived/jdbc/features/EncryptTest.java | 2 +-
.../test/natived/jdbc/features/MaskTest.java | 2 +-
.../jdbc/features/ReadWriteSplittingTest.java | 2 +-
.../test/natived/jdbc/features/ShadowTest.java | 2 +-
.../test/natived/jdbc/features/ShardingTest.java | 2 +-
.../test/natived/jdbc/modes/cluster/EtcdTest.java | 2 +-
.../natived/jdbc/modes/cluster/ZookeeperTest.java | 2 +-
.../natived/jdbc/transactions/base/SeataTest.java | 2 +-
.../natived/jdbc/transactions/xa/AtomikosTest.java | 2 +-
.../natived/jdbc/transactions/xa/NarayanaTest.java | 2 +-
.../yaml/{ => jdbc}/databases/clickhouse.yaml | 0
.../yaml/{ => jdbc}/databases/hive.yaml | 0
.../yaml/{ => jdbc}/databases/mysql.yaml | 0
.../yaml/{ => jdbc}/databases/opengauss.yaml | 0
.../yaml/{ => jdbc}/databases/postgresql.yaml | 0
.../yaml/{ => jdbc}/databases/sqlserver.yaml | 0
.../yaml/{ => jdbc}/features/encrypt.yaml | 0
.../test-native/yaml/{ => jdbc}/features/mask.yaml | 0
.../{ => jdbc}/features/readwrite-splitting.yaml | 0
.../yaml/{ => jdbc}/features/shadow.yaml | 0
.../yaml/{ => jdbc}/features/sharding.yaml | 0
.../yaml/{ => jdbc}/modes/cluster/etcd.yaml | 0
.../yaml/{ => jdbc}/modes/cluster/zookeeper.yaml | 0
.../yaml/{ => jdbc}/transactions/base/seata.yaml | 0
.../yaml/{ => jdbc}/transactions/xa/atomikos.yaml | 0
.../yaml/{ => jdbc}/transactions/xa/narayana.yaml | 0
36 files changed, 40 insertions(+), 35 deletions(-)
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md
index 9b38f9dd117..3b1a0f5267e 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md
@@ -150,7 +150,7 @@ services:
```
如果用户不对 Git Source 做任何更改，
-上文提及的命令将使用 https://container-registry.oracle.com/ords/ocr/ba/os/oraclelinux 中的
`container-registry.oracle.com/os/oraclelinux:9-slim` 作为 Base Docker Image。
+上文提及的命令将使用 https://yum.oracle.com/oracle-linux-downloads.html 中的
`container-registry.oracle.com/os/oraclelinux:9-slim` 作为 Base Docker Image。
但如果用户希望使用 `scratch`，`alpine:3`，`gcr.io/distroless/base-debian12`，
`gcr.io/distroless/java-base-debian12` 或 `gcr.io/distroless/static-debian12`
等更小体积的 Docker Image 作为 Base Docker Image，
用户可能需要根据
https://www.graalvm.org/jdk23/reference-manual/native-image/guides/build-static-executables/
的要求，
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md
index b32c948df8a..7c235f41a55 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md
@@ -154,7 +154,7 @@ services:
```
If the user does not make any changes to the Git Source,
-the above mentioned command will use
`container-registry.oracle.com/os/oraclelinux:9-slim` in
https://container-registry.oracle.com/ords/ocr/ba/os/oraclelinux as the Base
Docker Image.
+the above mentioned command will use
`container-registry.oracle.com/os/oraclelinux:9-slim` in
https://yum.oracle.com/oracle-linux-downloads.html as the Base Docker Image.
But if the user wants to use a smaller Docker Image such as `scratch`,
`alpine:3`, `gcr.io/distroless/base-debian12`,
`gcr.io/distroless/java-base-debian12` or `gcr.io/distroless/static-debian12`
as the Base Docker Image,
the user may need to add `--static`,
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 405b84f3f5c..c6a3f76f748 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
@@ -142,6 +142,11 @@
"name":"java.io.Flushable",
"queryAllDeclaredMethods":true
},
+{
+
"condition":{"typeReachable":"org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource"},
+ "name":"java.io.IOException",
+ "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
{
"condition":{"typeReachable":"org.apache.shardingsphere.proxy.frontend.ShardingSphereProxy"},
"name":"java.io.IOException"
@@ -2085,7 +2090,7 @@
"queryAllDeclaredMethods":true
},
{
-
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.listener.DatabaseMetaDataChangedListener$$Lambda/0x00007fb983b253a8"},
+
"condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.listener.DatabaseMetaDataChangedListener$$Lambda/0x00007fc2abb1e798"},
"name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.MetaDataChangedSubscriber"
},
{
diff --git
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/resource-config.json
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/resource-config.json
index f8c9f865e31..55d8e1b98ac 100644
---
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/resource-config.json
+++
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/resource-config.json
@@ -1979,52 +1979,52 @@
"pattern":"\\Qtest-native/sql/test-native-databases-clickhouse.sql\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/databases/clickhouse.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/databases/clickhouse.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/databases/hive.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/databases/hive.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/databases/mysql.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/databases/mysql.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/databases/opengauss.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/databases/opengauss.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/databases/postgresql.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/databases/postgresql.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/databases/sqlserver.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/databases/sqlserver.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/features/encrypt.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/features/encrypt.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/features/mask.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/features/mask.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/features/readwrite-splitting.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/features/readwrite-splitting.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/features/shadow.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/features/shadow.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/features/sharding.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/features/sharding.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/modes/cluster/etcd.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/modes/cluster/etcd.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/modes/cluster/zookeeper.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/modes/cluster/zookeeper.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/transactions/base/seata.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/transactions/base/seata.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/transactions/xa/atomikos.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/transactions/xa/atomikos.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.infra.url.classpath.ClassPathURLLoader"},
- "pattern":"\\Qtest-native/yaml/transactions/xa/narayana.yaml\\E"
+ "pattern":"\\Qtest-native/yaml/jdbc/transactions/xa/narayana.yaml\\E"
}, {
"condition":{"typeReachable":"org.apache.shardingsphere.transaction.xa.atomikos.manager.AtomikosTransactionManagerProvider"},
"pattern":"\\Qtransactions-defaults.properties\\E"
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/ClickHouseTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/ClickHouseTest.java
index 2a7a7a0cf5f..70100f992b1 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/ClickHouseTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/ClickHouseTest.java
@@ -42,7 +42,7 @@ class ClickHouseTest {
void assertShardingInLocalTransactions() {
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/databases/clickhouse.yaml");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/databases/clickhouse.yaml");
DataSource dataSource = new HikariDataSource(config);
testShardingService = new TestShardingService(dataSource);
assertDoesNotThrow(() ->
testShardingService.processSuccessInClickHouse());
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/HiveTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/HiveTest.java
index 44d50722036..3ba80abe935 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/HiveTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/HiveTest.java
@@ -125,7 +125,7 @@ class HiveTest {
}
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/databases/hive.yaml?placeholder-type=system_props");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/databases/hive.yaml?placeholder-type=system_props");
System.setProperty(SYSTEM_PROP_KEY_PREFIX + "ds0.jdbc-url",
jdbcUrlPrefix + "demo_ds_0" + ";initFile=" + ABSOLUTE_PATH);
System.setProperty(SYSTEM_PROP_KEY_PREFIX + "ds1.jdbc-url",
jdbcUrlPrefix + "demo_ds_1" + ";initFile=" + ABSOLUTE_PATH);
System.setProperty(SYSTEM_PROP_KEY_PREFIX + "ds2.jdbc-url",
jdbcUrlPrefix + "demo_ds_2" + ";initFile=" + ABSOLUTE_PATH);
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/MySQLTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/MySQLTest.java
index 1f9f0ef9bca..c645301f6be 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/MySQLTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/MySQLTest.java
@@ -125,7 +125,7 @@ class MySQLTest {
}
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/databases/mysql.yaml?placeholder-type=system_props");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/databases/mysql.yaml?placeholder-type=system_props");
System.setProperty(SYSTEM_PROP_KEY_PREFIX + "ds0.jdbc-url",
jdbcUrlPrefix + "demo_ds_0");
System.setProperty(SYSTEM_PROP_KEY_PREFIX + "ds1.jdbc-url",
jdbcUrlPrefix + "demo_ds_1");
System.setProperty(SYSTEM_PROP_KEY_PREFIX + "ds2.jdbc-url",
jdbcUrlPrefix + "demo_ds_2");
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 ea30c5bc6d5..96a7dba4326 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
@@ -119,7 +119,7 @@ class OpenGaussTest {
}
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/databases/opengauss.yaml?placeholder-type=system_props");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/databases/opengauss.yaml?placeholder-type=system_props");
System.setProperty(SYSTEM_PROP_KEY_PREFIX + "ds0.jdbc-url",
jdbcUrlPrefix + "demo_ds_0");
System.setProperty(SYSTEM_PROP_KEY_PREFIX + "ds1.jdbc-url",
jdbcUrlPrefix + "demo_ds_1");
System.setProperty(SYSTEM_PROP_KEY_PREFIX + "ds2.jdbc-url",
jdbcUrlPrefix + "demo_ds_2");
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/PostgresTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/PostgresTest.java
index 50bb91aaeaf..95a3d2e1dc7 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/PostgresTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/PostgresTest.java
@@ -35,7 +35,7 @@ class PostgresTest {
void assertShardingInLocalTransactions() throws SQLException {
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/databases/postgresql.yaml");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/databases/postgresql.yaml");
DataSource dataSource = new HikariDataSource(config);
testShardingService = new TestShardingService(dataSource);
initEnvironment();
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/SQLServerTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/SQLServerTest.java
index c0b3cfa1aaa..1fafe7cee87 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/SQLServerTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/SQLServerTest.java
@@ -35,7 +35,7 @@ class SQLServerTest {
void assertShardingInLocalTransactions() throws SQLException {
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/databases/sqlserver.yaml");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/databases/sqlserver.yaml");
DataSource dataSource = new HikariDataSource(config);
testShardingService = new TestShardingService(dataSource);
initEnvironment();
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/EncryptTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/EncryptTest.java
index 0918756e9b5..24e7b9aa402 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/EncryptTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/EncryptTest.java
@@ -50,7 +50,7 @@ class EncryptTest {
void assertEncryptInLocalTransactions() throws SQLException {
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/features/encrypt.yaml");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/features/encrypt.yaml");
DataSource dataSource = new HikariDataSource(config);
orderRepository = new OrderRepository(dataSource);
orderItemRepository = new OrderItemRepository(dataSource);
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/MaskTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/MaskTest.java
index ee1d5eab7e4..02b31f1e1f8 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/MaskTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/MaskTest.java
@@ -51,7 +51,7 @@ class MaskTest {
void assertMaskInLocalTransactions() throws SQLException {
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/features/mask.yaml");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/features/mask.yaml");
DataSource dataSource = new HikariDataSource(config);
orderRepository = new OrderRepository(dataSource);
orderItemRepository = new OrderItemRepository(dataSource);
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ReadWriteSplittingTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ReadWriteSplittingTest.java
index a6cb2758933..1eeef99debe 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ReadWriteSplittingTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ReadWriteSplittingTest.java
@@ -47,7 +47,7 @@ class ReadWriteSplittingTest {
void assertReadWriteSplittingInLocalTransactions() throws SQLException {
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/features/readwrite-splitting.yaml");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/features/readwrite-splitting.yaml");
DataSource dataSource = new HikariDataSource(config);
orderRepository = new OrderRepository(dataSource);
orderItemRepository = new OrderItemRepository(dataSource);
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ShadowTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ShadowTest.java
index 143a55341da..6f2fe443950 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ShadowTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ShadowTest.java
@@ -51,7 +51,7 @@ class ShadowTest {
void assertShadowInLocalTransactions() throws SQLException {
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/features/shadow.yaml");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/features/shadow.yaml");
DataSource dataSource = new HikariDataSource(config);
orderRepository = new OrderRepository(dataSource);
orderItemRepository = new OrderItemRepository(dataSource);
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ShardingTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ShardingTest.java
index dd3aa046f0a..1219280cc4e 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ShardingTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ShardingTest.java
@@ -33,7 +33,7 @@ class ShardingTest {
void assertShardingInLocalTransactions() throws SQLException {
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/features/sharding.yaml");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/features/sharding.yaml");
DataSource dataSource = new HikariDataSource(config);
testShardingService = new TestShardingService(dataSource);
initEnvironment();
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/EtcdTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/EtcdTest.java
index 69a3e5340fa..6687031c286 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/EtcdTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/EtcdTest.java
@@ -91,7 +91,7 @@ class EtcdTest {
URI clientEndpoint = clientEndpoints.get(0);
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/modes/cluster/etcd.yaml?placeholder-type=system_props");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/modes/cluster/etcd.yaml?placeholder-type=system_props");
System.setProperty(SYSTEM_PROP_KEY_PREFIX + "server-lists",
clientEndpoint.toString());
return new HikariDataSource(config);
}
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/ZookeeperTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/ZookeeperTest.java
index abd73e2d5f5..71565fa71ea 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/ZookeeperTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/ZookeeperTest.java
@@ -94,7 +94,7 @@ class ZookeeperTest {
});
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/modes/cluster/zookeeper.yaml?placeholder-type=system_props");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/modes/cluster/zookeeper.yaml?placeholder-type=system_props");
System.setProperty(SYSTEM_PROP_KEY_PREFIX + "server-lists",
connectString);
return new HikariDataSource(config);
}
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/transactions/base/SeataTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/transactions/base/SeataTest.java
index f52f45c4773..125d7a29939 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/transactions/base/SeataTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/transactions/base/SeataTest.java
@@ -82,7 +82,7 @@ class SeataTest {
System.setProperty(SERVICE_DEFAULT_GROUP_LIST_KEY, "127.0.0.1:" +
hostPort);
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/transactions/base/seata.yaml");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/transactions/base/seata.yaml");
return new HikariDataSource(config);
}
}
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/transactions/xa/AtomikosTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/transactions/xa/AtomikosTest.java
index d8ba18733f4..1cd74aca7d6 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/transactions/xa/AtomikosTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/transactions/xa/AtomikosTest.java
@@ -33,7 +33,7 @@ class AtomikosTest {
void assertShardingInAtomikosTransactions() throws SQLException {
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/transactions/xa/atomikos.yaml");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/transactions/xa/atomikos.yaml");
DataSource dataSource = new HikariDataSource(config);
testShardingService = new TestShardingService(dataSource);
initEnvironment();
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/transactions/xa/NarayanaTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/transactions/xa/NarayanaTest.java
index 5093e431637..4c4df2a177b 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/transactions/xa/NarayanaTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/transactions/xa/NarayanaTest.java
@@ -36,7 +36,7 @@ class NarayanaTest {
arjPropertyManager.getCoreEnvironmentBean().setNodeIdentifier("1");
HikariConfig config = new HikariConfig();
config.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/transactions/xa/narayana.yaml");
+
config.setJdbcUrl("jdbc:shardingsphere:classpath:test-native/yaml/jdbc/transactions/xa/narayana.yaml");
DataSource dataSource = new HikariDataSource(config);
testShardingService = new TestShardingService(dataSource);
initEnvironment();
diff --git
a/test/native/src/test/resources/test-native/yaml/databases/clickhouse.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/databases/clickhouse.yaml
similarity index 100%
rename from
test/native/src/test/resources/test-native/yaml/databases/clickhouse.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/databases/clickhouse.yaml
diff --git
a/test/native/src/test/resources/test-native/yaml/databases/hive.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/databases/hive.yaml
similarity index 100%
rename from test/native/src/test/resources/test-native/yaml/databases/hive.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/databases/hive.yaml
diff --git
a/test/native/src/test/resources/test-native/yaml/databases/mysql.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/databases/mysql.yaml
similarity index 100%
rename from test/native/src/test/resources/test-native/yaml/databases/mysql.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/databases/mysql.yaml
diff --git
a/test/native/src/test/resources/test-native/yaml/databases/opengauss.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/databases/opengauss.yaml
similarity index 100%
rename from
test/native/src/test/resources/test-native/yaml/databases/opengauss.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/databases/opengauss.yaml
diff --git
a/test/native/src/test/resources/test-native/yaml/databases/postgresql.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/databases/postgresql.yaml
similarity index 100%
rename from
test/native/src/test/resources/test-native/yaml/databases/postgresql.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/databases/postgresql.yaml
diff --git
a/test/native/src/test/resources/test-native/yaml/databases/sqlserver.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/databases/sqlserver.yaml
similarity index 100%
rename from
test/native/src/test/resources/test-native/yaml/databases/sqlserver.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/databases/sqlserver.yaml
diff --git
a/test/native/src/test/resources/test-native/yaml/features/encrypt.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/features/encrypt.yaml
similarity index 100%
rename from
test/native/src/test/resources/test-native/yaml/features/encrypt.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/features/encrypt.yaml
diff --git a/test/native/src/test/resources/test-native/yaml/features/mask.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/features/mask.yaml
similarity index 100%
rename from test/native/src/test/resources/test-native/yaml/features/mask.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/features/mask.yaml
diff --git
a/test/native/src/test/resources/test-native/yaml/features/readwrite-splitting.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/features/readwrite-splitting.yaml
similarity index 100%
rename from
test/native/src/test/resources/test-native/yaml/features/readwrite-splitting.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/features/readwrite-splitting.yaml
diff --git
a/test/native/src/test/resources/test-native/yaml/features/shadow.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/features/shadow.yaml
similarity index 100%
rename from test/native/src/test/resources/test-native/yaml/features/shadow.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/features/shadow.yaml
diff --git
a/test/native/src/test/resources/test-native/yaml/features/sharding.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/features/sharding.yaml
similarity index 100%
rename from
test/native/src/test/resources/test-native/yaml/features/sharding.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/features/sharding.yaml
diff --git
a/test/native/src/test/resources/test-native/yaml/modes/cluster/etcd.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/modes/cluster/etcd.yaml
similarity index 100%
rename from
test/native/src/test/resources/test-native/yaml/modes/cluster/etcd.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/modes/cluster/etcd.yaml
diff --git
a/test/native/src/test/resources/test-native/yaml/modes/cluster/zookeeper.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/modes/cluster/zookeeper.yaml
similarity index 100%
rename from
test/native/src/test/resources/test-native/yaml/modes/cluster/zookeeper.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/modes/cluster/zookeeper.yaml
diff --git
a/test/native/src/test/resources/test-native/yaml/transactions/base/seata.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/transactions/base/seata.yaml
similarity index 100%
rename from
test/native/src/test/resources/test-native/yaml/transactions/base/seata.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/transactions/base/seata.yaml
diff --git
a/test/native/src/test/resources/test-native/yaml/transactions/xa/atomikos.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/transactions/xa/atomikos.yaml
similarity index 100%
rename from
test/native/src/test/resources/test-native/yaml/transactions/xa/atomikos.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/transactions/xa/atomikos.yaml
diff --git
a/test/native/src/test/resources/test-native/yaml/transactions/xa/narayana.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/transactions/xa/narayana.yaml
similarity index 100%
rename from
test/native/src/test/resources/test-native/yaml/transactions/xa/narayana.yaml
rename to
test/native/src/test/resources/test-native/yaml/jdbc/transactions/xa/narayana.yaml
