diff --git a/distribution/proxy-native/pom.xml b/distribution/proxy-native/pom.xml index e04ec875aa448..012290db8052f 100644 --- a/distribution/proxy-native/pom.xml +++ b/distribution/proxy-native/pom.xml @@ -31,7 +31,7 @@ apache-shardingsphere-proxy-native apache/shardingsphere-proxy-native 3.1.0 - 0.9.16 + 0.9.17 @@ -98,6 +98,9 @@ native + + 5.0.1 + @@ -177,6 +180,10 @@ --build-arg APP_NAME=${native.image.name} . + -t + ${proxy.image.repository}:${proxy.image.tag} + -t + ${proxy.image.repository}:latest diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE b/distribution/proxy-native/src/main/release-docs/LICENSE index bf4d8a0f8cf78..1f01a1be21ab8 100644 --- a/distribution/proxy-native/src/main/release-docs/LICENSE +++ b/distribution/proxy-native/src/main/release-docs/LICENSE @@ -251,7 +251,7 @@ The text of each license is the standard Apache 2.0 license. grpc-stub 1.48.0: https://github.com/grpc/grpc-java, Apache 2.0 gson 2.9.1: https://github.com/google/gson, Apache 2.0 guava 30.0-jre: https://github.com/google/guava, Apache 2.0 - HikariCP 3.4.2: https://github.com/brettwooldridge/HikariCP, Apache 2.0 + HikariCP 5.0.1: https://github.com/brettwooldridge/HikariCP, Apache 2.0 httpclient5 5.1.3: https://hc.apache.org/httpcomponents-client-5.1.x, Apache 2.0 httpcore5-h2 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0 httpcore5 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0 @@ -268,22 +268,22 @@ The text of each license is the standard Apache 2.0 license. jsr305 3.0.2: http://findbugs.sourceforge.net/, Apache 2.0 log4j 1.2.17: http://logging.apache.org/log4j/1.2/, Apache 2.0 memory 0.9.0, Apache 2.0 - netty-buffer 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-codec 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-codec-dns 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-codec-http 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-codec-http2 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-codec-socks 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-common 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-handler 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-handler-proxy 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-resolver 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-resolver-dns 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-transport 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-transport-classes-epoll 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-transport-native-epoll 4.1.84.Final-linux-aarch_64: https://github.com/netty, Apache 2.0 - netty-transport-native-epoll 4.1.84.Final-linux-x86_64: https://github.com/netty, Apache 2.0 - netty-transport-native-unix-common 4.1.84.Final: https://github.com/netty, Apache 2.0 + netty-buffer 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-codec 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-codec-dns 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-codec-http 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-codec-http2 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-codec-socks 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-common 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-handler 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-handler-proxy 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-resolver 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-resolver-dns 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-transport 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-transport-classes-epoll 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-transport-native-epoll 4.1.85.Final-linux-aarch_64: https://github.com/netty, Apache 2.0 + netty-transport-native-epoll 4.1.85.Final-linux-x86_64: https://github.com/netty, Apache 2.0 + netty-transport-native-unix-common 4.1.85.Final: https://github.com/netty, Apache 2.0 perfmark-api 0.23.0: https://github.com/perfmark/perfmark, Apache 2.0 proto-google-common-protos 2.0.1: https://github.com/googleapis/common-protos-java, Apache 2.0 proj4j 1.1.5: https://github.com/locationtech/proj4j, Apache 2.0 diff --git a/distribution/proxy/src/main/release-docs/LICENSE b/distribution/proxy/src/main/release-docs/LICENSE index bf4d8a0f8cf78..2ae72c665fb33 100644 --- a/distribution/proxy/src/main/release-docs/LICENSE +++ b/distribution/proxy/src/main/release-docs/LICENSE @@ -251,7 +251,7 @@ The text of each license is the standard Apache 2.0 license. grpc-stub 1.48.0: https://github.com/grpc/grpc-java, Apache 2.0 gson 2.9.1: https://github.com/google/gson, Apache 2.0 guava 30.0-jre: https://github.com/google/guava, Apache 2.0 - HikariCP 3.4.2: https://github.com/brettwooldridge/HikariCP, Apache 2.0 + HikariCP 4.0.3: https://github.com/brettwooldridge/HikariCP, Apache 2.0 httpclient5 5.1.3: https://hc.apache.org/httpcomponents-client-5.1.x, Apache 2.0 httpcore5-h2 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0 httpcore5 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0 @@ -268,22 +268,22 @@ The text of each license is the standard Apache 2.0 license. jsr305 3.0.2: http://findbugs.sourceforge.net/, Apache 2.0 log4j 1.2.17: http://logging.apache.org/log4j/1.2/, Apache 2.0 memory 0.9.0, Apache 2.0 - netty-buffer 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-codec 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-codec-dns 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-codec-http 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-codec-http2 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-codec-socks 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-common 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-handler 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-handler-proxy 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-resolver 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-resolver-dns 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-transport 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-transport-classes-epoll 4.1.84.Final: https://github.com/netty, Apache 2.0 - netty-transport-native-epoll 4.1.84.Final-linux-aarch_64: https://github.com/netty, Apache 2.0 - netty-transport-native-epoll 4.1.84.Final-linux-x86_64: https://github.com/netty, Apache 2.0 - netty-transport-native-unix-common 4.1.84.Final: https://github.com/netty, Apache 2.0 + netty-buffer 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-codec 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-codec-dns 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-codec-http 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-codec-http2 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-codec-socks 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-common 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-handler 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-handler-proxy 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-resolver 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-resolver-dns 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-transport 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-transport-classes-epoll 4.1.85.Final: https://github.com/netty, Apache 2.0 + netty-transport-native-epoll 4.1.85.Final-linux-aarch_64: https://github.com/netty, Apache 2.0 + netty-transport-native-epoll 4.1.85.Final-linux-x86_64: https://github.com/netty, Apache 2.0 + netty-transport-native-unix-common 4.1.85.Final: https://github.com/netty, Apache 2.0 perfmark-api 0.23.0: https://github.com/perfmark/perfmark, Apache 2.0 proto-google-common-protos 2.0.1: https://github.com/googleapis/common-protos-java, Apache 2.0 proj4j 1.1.5: https://github.com/locationtech/proj4j, Apache 2.0 diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/type/hikari/HikariDataSourcePoolMetaData.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/type/hikari/HikariDataSourcePoolMetaData.java index 98fb1a6bbf3d6..f04a244a05968 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/type/hikari/HikariDataSourcePoolMetaData.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/type/hikari/HikariDataSourcePoolMetaData.java @@ -51,6 +51,7 @@ private static void buildDefaultProperties() { DEFAULT_PROPS.put("maximumPoolSize", 50); DEFAULT_PROPS.put("minimumIdle", 1); DEFAULT_PROPS.put("readOnly", false); + DEFAULT_PROPS.put("keepaliveTime", 0); } private static void buildInvalidProperties() { diff --git a/pom.xml b/pom.xml index 55fa2c0e2269d..55c47dd2537c9 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,8 @@ 2.9.1 2.13.4 4.0.6 + 2.3.31 + 2.9.3 2.3.0 1.3.2 @@ -76,7 +78,7 @@ 1.32.0 4.3.3 - 4.1.84.Final + 4.1.85.Final 1.1 @@ -111,7 +113,7 @@ 2.1.214 6.1.7.jre8-preview - 3.4.2 + 4.0.3 2.2.0 5.9.1 @@ -152,9 +154,7 @@ 1.10 1.0.0 4.9.10 - 2.3.31 2.22.1 - 2.9.3 diff --git a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/add_resource.xml b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/add_resource.xml index 049da2f39c477..bdf359b9f7d82 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/add_resource.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/add_resource.xml @@ -30,7 +30,7 @@ - - - + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/alter_resource.xml b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/alter_resource.xml index f50f779c4021e..26db622412c06 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/alter_resource.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/alter_resource.xml @@ -30,7 +30,7 @@ - - - + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/drop_resource.xml b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/drop_resource.xml index d717caa153cfb..c98f1d45d92f7 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/drop_resource.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/drop_resource.xml @@ -30,6 +30,6 @@ - - + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/add_resource.xml b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/add_resource.xml index 049da2f39c477..bdf359b9f7d82 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/add_resource.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/add_resource.xml @@ -30,7 +30,7 @@ - - - + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/alter_resource.xml b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/alter_resource.xml index f50f779c4021e..26db622412c06 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/alter_resource.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/alter_resource.xml @@ -30,7 +30,7 @@ - - - + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/drop_resource.xml b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/drop_resource.xml index 1da4799b54ead..5697ff6f89b0d 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/drop_resource.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/drop_resource.xml @@ -30,6 +30,6 @@ - - + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/mysql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/mysql/show_resources.xml index 5b09e7029839c..d671a1f2e511c 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/mysql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/mysql/show_resources.xml @@ -30,14 +30,14 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/opengauss/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/opengauss/show_resources.xml index edfa05dc8c3d6..53a30f8643860 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/opengauss/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/opengauss/show_resources.xml @@ -30,14 +30,14 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/postgresql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/postgresql/show_resources.xml index 4024fe38883d0..36e2e26bc1038 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/postgresql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/postgresql/show_resources.xml @@ -30,14 +30,14 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/mysql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/mysql/show_resources.xml index 8e91f5f9adc00..007441d6e7aee 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/mysql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/mysql/show_resources.xml @@ -30,24 +30,24 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/opengauss/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/opengauss/show_resources.xml index 1d8a12faa445b..c84430857d094 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/opengauss/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/opengauss/show_resources.xml @@ -30,24 +30,24 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/postgresql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/postgresql/show_resources.xml index bc53b8ac452b3..1c0c5ae28059d 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/postgresql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/postgresql/show_resources.xml @@ -30,24 +30,24 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_resources.xml index 84e9bb36a1e6c..373e72441343f 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_resources.xml @@ -30,24 +30,24 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/opengauss/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/opengauss/show_resources.xml index 737e4448247e3..6150315f41536 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/opengauss/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/opengauss/show_resources.xml @@ -30,24 +30,24 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/postgresql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/postgresql/show_resources.xml index ec5e2f9e84799..1c885c1b99d87 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/postgresql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/postgresql/show_resources.xml @@ -30,24 +30,24 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/mysql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/mysql/show_resources.xml index 99af187277ba9..5bd321913fe44 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/mysql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/mysql/show_resources.xml @@ -30,5 +30,5 @@ - + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/opengauss/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/opengauss/show_resources.xml index 64d39193f2a5e..454df53748ae7 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/opengauss/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/opengauss/show_resources.xml @@ -30,5 +30,5 @@ - + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/postgresql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/postgresql/show_resources.xml index 7e240e98c61c0..8481d7a4f04bb 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/postgresql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/postgresql/show_resources.xml @@ -30,5 +30,5 @@ - + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/mysql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/mysql/show_resources.xml index 37ae8d097f567..17a72dba45d6e 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/mysql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/mysql/show_resources.xml @@ -30,6 +30,6 @@ - - + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/opengauss/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/opengauss/show_resources.xml index def40d4bc3114..f2b651d4dd950 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/opengauss/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/opengauss/show_resources.xml @@ -30,6 +30,6 @@ - - + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/postgresql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/postgresql/show_resources.xml index 0916f0777f669..96992cc61f5ec 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/postgresql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/postgresql/show_resources.xml @@ -30,6 +30,6 @@ - - + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/mysql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/mysql/show_resources.xml index eb5df1efebb40..144bae9a3114e 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/mysql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/mysql/show_resources.xml @@ -30,7 +30,7 @@ - - - + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/opengauss/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/opengauss/show_resources.xml index 95b0a85102761..4ca3d9348f834 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/opengauss/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/opengauss/show_resources.xml @@ -30,7 +30,7 @@ - - - + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/postgresql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/postgresql/show_resources.xml index c5039ead3f4a6..de531fc4d2569 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/postgresql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/postgresql/show_resources.xml @@ -30,7 +30,7 @@ - - - + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/mysql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/mysql/show_resources.xml index 7af49996244e3..292da4b1886ef 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/mysql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/mysql/show_resources.xml @@ -30,14 +30,14 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/opengauss/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/opengauss/show_resources.xml index d4694c6597410..c286fbe5a8998 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/opengauss/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/opengauss/show_resources.xml @@ -30,14 +30,14 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/postgresql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/postgresql/show_resources.xml index 8511c0d53a410..d22be398c9761 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/postgresql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/postgresql/show_resources.xml @@ -30,14 +30,14 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_resources.xml index 713f2575608c4..08bb594f641b5 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_resources.xml @@ -30,5 +30,5 @@ - + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/mysql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/mysql/show_resources.xml index 4ed9ea4d63f6c..ae81c8e09368a 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/mysql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/mysql/show_resources.xml @@ -30,5 +30,5 @@ - + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/opengauss/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/opengauss/show_resources.xml index 7325af318666c..eed39f7a7b7aa 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/opengauss/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/opengauss/show_resources.xml @@ -30,5 +30,5 @@ - + diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/postgresql/show_resources.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/postgresql/show_resources.xml index 7c6266b6270b7..513ce1e64dbf2 100644 --- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/postgresql/show_resources.xml +++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/postgresql/show_resources.xml @@ -30,5 +30,5 @@ - +