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 570e4934910 Rename rdl_empty_rules to dist_rdl scenario (#32186)
570e4934910 is described below
commit 570e4934910955a2dba0a8ee416b6b05e790a830
Author: zhaojinchao <[email protected]>
AuthorDate: Fri Jul 19 16:31:05 2024 +0800
Rename rdl_empty_rules to dist_rdl scenario (#32186)
* Rename rdl_empty_rules to dist_rdl scenario
* Update workflow
* Rename
---
.github/workflows/e2e-sql.yml | 4 +--
.github/workflows/nightly-e2e-sql.yml | 4 +--
.../param/array/E2ETestParameterGenerator.java | 4 +--
.../test/resources/cases/dql/e2e-dql-select.xml | 4 +--
.../alter_binding_rules.xml | 0
.../alter_encrypt_rule.xml | 0
.../alter_mask_rule.xml | 0
.../alter_readwrite_splitting_rules.xml | 0
.../alter_sharding_rules.xml | 0
.../alter_sharding_rules_show_tables.xml | 2 +-
.../alter_single_table_rules.xml | 0
.../create_binding_rules.xml | 0
.../create_broadcast_rules.xml | 0
.../create_encrypt_rule.xml | 0
.../create_mask_rule.xml | 0
.../create_readwrite_splitting_rules.xml | 0
.../create_sharding_rules.xml | 0
.../create_sharding_rules_show_tables.xml | 2 +-
.../create_single_table_rules.xml | 0
.../drop_binding_rules.xml | 0
.../drop_broadcast_rules.xml | 0
.../drop_encrypt_rule.xml | 0
.../drop_mask_rule.xml | 0
.../drop_readwrite_splitting_rules.xml | 0
.../drop_sharding_rules.xml | 0
.../drop_sharding_rules_show_tables.xml | 2 +-
.../drop_single_table_rules.xml | 0
.../distsql_rdl/mysql/alter_storage_unit.xml | 36 ++++++++++++++++++++++
.../distsql_rdl/mysql/register_storage_unit.xml | 36 ++++++++++++++++++++++
.../mysql}/unregister_storage_unit.xml | 4 +--
.../distsql_rdl/postgresql/alter_storage_unit.xml | 36 ++++++++++++++++++++++
.../postgresql/register_storage_unit.xml | 36 ++++++++++++++++++++++
.../postgresql}/unregister_storage_unit.xml | 4 +--
.../rdl_empty_rules/mysql/alter_storage_unit.xml | 36 ----------------------
.../mysql/register_storage_unit.xml | 36 ----------------------
.../postgresql/alter_storage_unit.xml | 36 ----------------------
.../postgresql/register_storage_unit.xml | 36 ----------------------
.../sql/src/test/resources/env/it-env.properties | 4 +--
.../{rdl_empty_rules => distsql_rdl}/authority.xml | 0
.../data/actual/databases.xml | 0
.../data/actual/init-sql/mysql/01-actual-init.sql | 0
.../actual/init-sql/opengauss/01-actual-init.sql | 0
.../actual/init-sql/postgresql/01-actual-init.sql | 0
.../data/expected/databases.xml | 0
.../expected/init-sql/mysql/01-expected-init.sql | 0
.../init-sql/opengauss/01-expected-init.sql | 0
.../init-sql/postgresql/01-expected-init.sql | 0
.../proxy/conf/mysql/database-distsql-rdl.yaml} | 8 ++---
.../conf/opengauss/database-distsql-rdl.yaml} | 8 ++---
.../conf/postgresql/database-distsql-rdl.yaml} | 8 ++---
.../{rdl_empty_rules => distsql_rdl}/rules.yaml | 0
51 files changed, 173 insertions(+), 173 deletions(-)
diff --git a/.github/workflows/e2e-sql.yml b/.github/workflows/e2e-sql.yml
index b32aed8a179..b17730c1441 100644
--- a/.github/workflows/e2e-sql.yml
+++ b/.github/workflows/e2e-sql.yml
@@ -110,7 +110,7 @@ jobs:
database: [ MySQL, PostgreSQL ]
# Fix me #25051
#scenario: [ dbtbl_with_readwrite_splitting,
dbtbl_with_readwrite_splitting_and_encrypt, sharding_and_encrypt,
encrypt_and_readwrite_splitting, encrypt_shadow,
readwrite_splitting_and_shadow, sharding_and_shadow, sharding_encrypt_shadow,
mask_encrypt, mask_sharding, mask_encrypt_sharding ]
- scenario: [ empty_rules, rdl_empty_rules, passthrough, db, tbl,
encrypt, readwrite_splitting, shadow, mask,
dbtbl_with_readwrite_splitting_and_encrypt, sharding_and_encrypt,
encrypt_and_readwrite_splitting, encrypt_shadow,
readwrite_splitting_and_shadow, sharding_and_shadow, sharding_encrypt_shadow,
mask_encrypt, mask_sharding, mask_encrypt_sharding, db_tbl_sql_federation,
empty_storage_units ]
+ scenario: [ empty_rules, distsql_rdl, passthrough, db, tbl, encrypt,
readwrite_splitting, shadow, mask, dbtbl_with_readwrite_splitting_and_encrypt,
sharding_and_encrypt, encrypt_and_readwrite_splitting, encrypt_shadow,
readwrite_splitting_and_shadow, sharding_and_shadow, sharding_encrypt_shadow,
mask_encrypt, mask_sharding, mask_encrypt_sharding, db_tbl_sql_federation,
empty_storage_units ]
additional-options: [ '' ]
include:
- adapter: proxy
@@ -127,7 +127,7 @@ jobs:
scenario: empty_rules
- adapter: proxy
mode: Standalone
- scenario: rdl_empty_rules
+ scenario: distsql_rdl
- adapter: proxy
mode: Standalone
scenario: passthrough
diff --git a/.github/workflows/nightly-e2e-sql.yml
b/.github/workflows/nightly-e2e-sql.yml
index d0369a69c59..f04341727d8 100644
--- a/.github/workflows/nightly-e2e-sql.yml
+++ b/.github/workflows/nightly-e2e-sql.yml
@@ -78,7 +78,7 @@ jobs:
database: [ MySQL, PostgreSQL, openGauss ]
# Fix me #25051
#scenario: [ dbtbl_with_readwrite_splitting,
dbtbl_with_readwrite_splitting_and_encrypt, sharding_and_encrypt,
encrypt_and_readwrite_splitting, encrypt_shadow,
readwrite_splitting_and_shadow, sharding_and_shadow, sharding_encrypt_shadow,
mask_encrypt, mask_sharding, mask_encrypt_sharding ]
- scenario: [ empty_rules, rdl_empty_rules, passthrough, db, tbl,
encrypt, readwrite_splitting, shadow, mask,
dbtbl_with_readwrite_splitting_and_encrypt, sharding_and_encrypt,
encrypt_and_readwrite_splitting, encrypt_shadow,
readwrite_splitting_and_shadow, sharding_and_shadow, sharding_encrypt_shadow,
mask_encrypt, mask_sharding, mask_encrypt_sharding, db_tbl_sql_federation,
empty_storage_units ]
+ scenario: [ empty_rules, distsql_rdl, passthrough, db, tbl, encrypt,
readwrite_splitting, shadow, mask, dbtbl_with_readwrite_splitting_and_encrypt,
sharding_and_encrypt, encrypt_and_readwrite_splitting, encrypt_shadow,
readwrite_splitting_and_shadow, sharding_and_shadow, sharding_encrypt_shadow,
mask_encrypt, mask_sharding, mask_encrypt_sharding, db_tbl_sql_federation,
empty_storage_units ]
additional-options: [ '' ]
include:
- adapter: proxy
@@ -95,7 +95,7 @@ jobs:
scenario: empty_rules
- adapter: proxy
mode: Standalone
- scenario: rdl_empty_rules
+ scenario: distsql_rdl
- adapter: proxy
mode: Standalone
scenario: passthrough
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
index dd12548630b..0b4b91115c2 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
@@ -142,8 +142,8 @@ public final class E2ETestParameterGenerator {
if (sqlStatementClass == RALStatement.class) {
return "empty_rules".equals(scenario);
}
- if (sqlStatementClass == RDLStatement.class ||
"rdl_empty_rules".equals(scenario)) {
- return sqlStatementClass == RDLStatement.class &&
"rdl_empty_rules".equals(scenario);
+ if (sqlStatementClass == RDLStatement.class ||
"distsql_rdl".equals(scenario)) {
+ return sqlStatementClass == RDLStatement.class &&
"distsql_rdl".equals(scenario);
}
if ("empty_rules".equals(scenario)) {
return false;
diff --git a/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select.xml
b/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select.xml
index ae9c74a6cc8..1d2c7bfac7a 100644
--- a/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select.xml
+++ b/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select.xml
@@ -17,11 +17,11 @@
-->
<e2e-test-cases>
- <test-case sql="SELECT 1 FROM dual" db-types="MySQL,SQLServer,Oracle,H2"
smoke="true"
scenario-types="db,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,empty_rules,encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,mask,mask_encrypt,mask_encrypt_sharding,mask_sharding,passthrough,rdl_empty_rules,readwrite_splitting,readwrite_splitting_and_shadow,shadow,sharding_and_encrypt,sharding_and_shadow,sharding_encrypt_shadow,tbl"
>
+ <test-case sql="SELECT 1 FROM dual" db-types="MySQL,SQLServer,Oracle,H2"
smoke="true"
scenario-types="db,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,empty_rules,encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,mask,mask_encrypt,mask_encrypt_sharding,mask_sharding,passthrough,distsql_rdl,readwrite_splitting,readwrite_splitting_and_shadow,shadow,sharding_and_encrypt,sharding_and_shadow,sharding_encrypt_shadow,tbl"
>
<assertion />
</test-case>
- <test-case sql="SELECT 1 as a" db-types="PostgreSQL,openGauss"
smoke="true"
scenario-types="db,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,empty_rules,encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,mask,mask_encrypt,mask_encrypt_sharding,mask_sharding,passthrough,rdl_empty_rules,readwrite_splitting,readwrite_splitting_and_shadow,shadow,sharding_and_encrypt,sharding_and_shadow,sharding_encrypt_shadow,tbl"
>
+ <test-case sql="SELECT 1 as a" db-types="PostgreSQL,openGauss"
smoke="true"
scenario-types="db,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,empty_rules,encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,mask,mask_encrypt,mask_encrypt_sharding,mask_sharding,passthrough,distsql_rdl,readwrite_splitting,readwrite_splitting_and_shadow,shadow,sharding_and_encrypt,sharding_and_shadow,sharding_encrypt_shadow,tbl"
>
<assertion />
</test-case>
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_binding_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/alter_binding_rules.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_binding_rules.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/alter_binding_rules.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_encrypt_rule.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/alter_encrypt_rule.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_encrypt_rule.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/alter_encrypt_rule.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_mask_rule.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/alter_mask_rule.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_mask_rule.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/alter_mask_rule.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_readwrite_splitting_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/alter_readwrite_splitting_rules.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_readwrite_splitting_rules.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/alter_readwrite_splitting_rules.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_sharding_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/alter_sharding_rules.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_sharding_rules.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/alter_sharding_rules.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_sharding_rules_show_tables.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/alter_sharding_rules_show_tables.xml
similarity index 95%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_sharding_rules_show_tables.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/alter_sharding_rules_show_tables.xml
index cfbae89156d..7c4d904defa 100644
---
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_sharding_rules_show_tables.xml
+++
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/alter_sharding_rules_show_tables.xml
@@ -17,7 +17,7 @@
<dataset>
<metadata>
- <column name="Tables_in_rdl_empty_rules" />
+ <column name="Tables_in_distsql_rdl" />
</metadata>
<row values="t_order_item_2" />
<row values="t_order_item_3" />
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_single_table_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/alter_single_table_rules.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_single_table_rules.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/alter_single_table_rules.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_binding_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_binding_rules.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_binding_rules.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_binding_rules.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_broadcast_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_broadcast_rules.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_broadcast_rules.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_broadcast_rules.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_encrypt_rule.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_encrypt_rule.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_encrypt_rule.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_encrypt_rule.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_mask_rule.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_mask_rule.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_mask_rule.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_mask_rule.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_readwrite_splitting_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_readwrite_splitting_rules.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_readwrite_splitting_rules.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_readwrite_splitting_rules.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_sharding_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_sharding_rules.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_sharding_rules.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_sharding_rules.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_sharding_rules_show_tables.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_sharding_rules_show_tables.xml
similarity index 95%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_sharding_rules_show_tables.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_sharding_rules_show_tables.xml
index 2c168141497..dbf3f5fb56a 100644
---
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_sharding_rules_show_tables.xml
+++
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_sharding_rules_show_tables.xml
@@ -17,7 +17,7 @@
<dataset>
<metadata>
- <column name="Tables_in_rdl_empty_rules" />
+ <column name="Tables_in_distsql_rdl" />
</metadata>
<row values="t_order_item_2" />
<row values="t_order_item_3" />
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_single_table_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_single_table_rules.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_single_table_rules.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/create_single_table_rules.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_binding_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_binding_rules.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_binding_rules.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_binding_rules.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_broadcast_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_broadcast_rules.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_broadcast_rules.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_broadcast_rules.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_encrypt_rule.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_encrypt_rule.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_encrypt_rule.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_encrypt_rule.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_mask_rule.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_mask_rule.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_mask_rule.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_mask_rule.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_readwrite_splitting_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_readwrite_splitting_rules.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_readwrite_splitting_rules.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_readwrite_splitting_rules.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_sharding_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_sharding_rules.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_sharding_rules.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_sharding_rules.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_sharding_rules_show_tables.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_sharding_rules_show_tables.xml
similarity index 95%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_sharding_rules_show_tables.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_sharding_rules_show_tables.xml
index 497cb88e47a..0f4d44cd29f 100644
---
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_sharding_rules_show_tables.xml
+++
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_sharding_rules_show_tables.xml
@@ -17,7 +17,7 @@
<dataset>
<metadata>
- <column name="Tables_in_rdl_empty_rules" />
+ <column name="Tables_in_distsql_rdl" />
</metadata>
<row values="t_order_item_2" />
<row values="t_order_item_3" />
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_single_table_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_single_table_rules.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_single_table_rules.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/drop_single_table_rules.xml
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/mysql/alter_storage_unit.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/mysql/alter_storage_unit.xml
new file mode 100644
index 00000000000..2450fb10bbb
--- /dev/null
+++
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/mysql/alter_storage_unit.xml
@@ -0,0 +1,36 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="name" />
+ <column name="type" />
+ <column name="host" />
+ <column name="port" />
+ <column name="db" />
+ <column name="connection_timeout_milliseconds" />
+ <column name="idle_timeout_milliseconds" />
+ <column name="max_lifetime_milliseconds" />
+ <column name="max_pool_size" />
+ <column name="min_pool_size" />
+ <column name="read_only" />
+ <column name="other_attributes" />
+ </metadata>
+ <row values="ds_0| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_0| 30000|
60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
+ <row values="ds_1| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_1| 30000|
60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
+ <row values="ds_2| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_2| 30000|
30000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
+</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/mysql/register_storage_unit.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/mysql/register_storage_unit.xml
new file mode 100644
index 00000000000..1fb40f9f624
--- /dev/null
+++
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/mysql/register_storage_unit.xml
@@ -0,0 +1,36 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="name" />
+ <column name="type" />
+ <column name="host" />
+ <column name="port" />
+ <column name="db" />
+ <column name="connection_timeout_milliseconds" />
+ <column name="idle_timeout_milliseconds" />
+ <column name="max_lifetime_milliseconds" />
+ <column name="max_pool_size" />
+ <column name="min_pool_size" />
+ <column name="read_only" />
+ <column name="other_attributes" />
+ </metadata>
+ <row values="ds_0| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_0| 30000|
60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
+ <row values="ds_1| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_1| 30000|
60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
+ <row values="ds_2| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_2| 30000|
60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
+</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/unregister_storage_unit.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/mysql/unregister_storage_unit.xml
similarity index 56%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/unregister_storage_unit.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/mysql/unregister_storage_unit.xml
index aa02cf39693..70606ed504e 100644
---
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/unregister_storage_unit.xml
+++
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/mysql/unregister_storage_unit.xml
@@ -30,6 +30,6 @@
<column name="read_only" />
<column name="other_attributes" />
</metadata>
- <row values="ds_0| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_0|
30000| 60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
- <row values="ds_1| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_1|
30000| 60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
+ <row values="ds_1| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_1| 30000|
60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
+ <row values="ds_0| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_0| 30000|
60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/postgresql/alter_storage_unit.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/postgresql/alter_storage_unit.xml
new file mode 100644
index 00000000000..2450fb10bbb
--- /dev/null
+++
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/postgresql/alter_storage_unit.xml
@@ -0,0 +1,36 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="name" />
+ <column name="type" />
+ <column name="host" />
+ <column name="port" />
+ <column name="db" />
+ <column name="connection_timeout_milliseconds" />
+ <column name="idle_timeout_milliseconds" />
+ <column name="max_lifetime_milliseconds" />
+ <column name="max_pool_size" />
+ <column name="min_pool_size" />
+ <column name="read_only" />
+ <column name="other_attributes" />
+ </metadata>
+ <row values="ds_0| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_0| 30000|
60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
+ <row values="ds_1| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_1| 30000|
60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
+ <row values="ds_2| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_2| 30000|
30000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
+</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/postgresql/register_storage_unit.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/postgresql/register_storage_unit.xml
new file mode 100644
index 00000000000..1fb40f9f624
--- /dev/null
+++
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/postgresql/register_storage_unit.xml
@@ -0,0 +1,36 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="name" />
+ <column name="type" />
+ <column name="host" />
+ <column name="port" />
+ <column name="db" />
+ <column name="connection_timeout_milliseconds" />
+ <column name="idle_timeout_milliseconds" />
+ <column name="max_lifetime_milliseconds" />
+ <column name="max_pool_size" />
+ <column name="min_pool_size" />
+ <column name="read_only" />
+ <column name="other_attributes" />
+ </metadata>
+ <row values="ds_0| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_0| 30000|
60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
+ <row values="ds_1| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_1| 30000|
60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
+ <row values="ds_2| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_2| 30000|
60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
+</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/unregister_storage_unit.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/postgresql/unregister_storage_unit.xml
similarity index 56%
rename from
test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/unregister_storage_unit.xml
rename to
test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/postgresql/unregister_storage_unit.xml
index 60baf6b0c3c..692f80b33ef 100644
---
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/unregister_storage_unit.xml
+++
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/distsql_rdl/postgresql/unregister_storage_unit.xml
@@ -30,6 +30,6 @@
<column name="read_only" />
<column name="other_attributes" />
</metadata>
- <row values="ds_1| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_1|
30000| 60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
- <row values="ds_0| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_0|
30000| 60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
+ <row values="ds_0| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_0| 30000|
60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
+ <row values="ds_1| MySQL| mysql.distsql_rdl.host| 3306| rdl_ds_1| 30000|
60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueries&q
[...]
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/alter_storage_unit.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/alter_storage_unit.xml
deleted file mode 100644
index 0141442956e..00000000000
---
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/alter_storage_unit.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<dataset>
- <metadata>
- <column name="name" />
- <column name="type" />
- <column name="host" />
- <column name="port" />
- <column name="db" />
- <column name="connection_timeout_milliseconds" />
- <column name="idle_timeout_milliseconds" />
- <column name="max_lifetime_milliseconds" />
- <column name="max_pool_size" />
- <column name="min_pool_size" />
- <column name="read_only" />
- <column name="other_attributes" />
- </metadata>
- <row values="ds_0| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_0|
30000| 60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
- <row values="ds_1| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_1|
30000| 60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
- <row values="ds_2| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_2|
30000| 30000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
-</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/register_storage_unit.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/register_storage_unit.xml
deleted file mode 100644
index 6b73486272d..00000000000
---
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/mysql/register_storage_unit.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<dataset>
- <metadata>
- <column name="name" />
- <column name="type" />
- <column name="host" />
- <column name="port" />
- <column name="db" />
- <column name="connection_timeout_milliseconds" />
- <column name="idle_timeout_milliseconds" />
- <column name="max_lifetime_milliseconds" />
- <column name="max_pool_size" />
- <column name="min_pool_size" />
- <column name="read_only" />
- <column name="other_attributes" />
- </metadata>
- <row values="ds_0| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_0|
30000| 60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
- <row values="ds_1| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_1|
30000| 60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
- <row values="ds_2| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_2|
30000| 60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
-</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/alter_storage_unit.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/alter_storage_unit.xml
deleted file mode 100644
index 0141442956e..00000000000
---
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/alter_storage_unit.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<dataset>
- <metadata>
- <column name="name" />
- <column name="type" />
- <column name="host" />
- <column name="port" />
- <column name="db" />
- <column name="connection_timeout_milliseconds" />
- <column name="idle_timeout_milliseconds" />
- <column name="max_lifetime_milliseconds" />
- <column name="max_pool_size" />
- <column name="min_pool_size" />
- <column name="read_only" />
- <column name="other_attributes" />
- </metadata>
- <row values="ds_0| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_0|
30000| 60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
- <row values="ds_1| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_1|
30000| 60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
- <row values="ds_2| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_2|
30000| 30000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
-</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/register_storage_unit.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/register_storage_unit.xml
deleted file mode 100644
index 6b73486272d..00000000000
---
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/postgresql/register_storage_unit.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<dataset>
- <metadata>
- <column name="name" />
- <column name="type" />
- <column name="host" />
- <column name="port" />
- <column name="db" />
- <column name="connection_timeout_milliseconds" />
- <column name="idle_timeout_milliseconds" />
- <column name="max_lifetime_milliseconds" />
- <column name="max_pool_size" />
- <column name="min_pool_size" />
- <column name="read_only" />
- <column name="other_attributes" />
- </metadata>
- <row values="ds_0| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_0|
30000| 60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
- <row values="ds_1| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_1|
30000| 60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
- <row values="ds_2| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_2|
30000| 60000| 1800000| 2| 2| false|
{"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"keepaliveTime":0,"leakDetectionThreshold":0,"registerMbeans":false,"allowPoolSuspension":false,"autoCommit":true,"isolateInternalQueri
[...]
-</dataset>
diff --git a/test/e2e/sql/src/test/resources/env/it-env.properties
b/test/e2e/sql/src/test/resources/env/it-env.properties
index 5204d8ce89e..aa8f6118546 100644
--- a/test/e2e/sql/src/test/resources/env/it-env.properties
+++ b/test/e2e/sql/src/test/resources/env/it-env.properties
@@ -20,8 +20,8 @@ it.run.modes=
it.run.additional.cases=false
it.run.smoke=false
-#it.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,rdl_empty_rules,empty_rules,sharding_and_encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,readwrite_splitting_and_shadow,sharding_and_shadow,sharding_encrypt_shadow,mask,mask_encrypt,mask_sharding,mask_encrypt_sharding,db_tbl_sql_federation
-it.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,rdl_empty_rules,empty_rules,sharding_and_encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,readwrite_splitting_and_shadow,sharding_and_shadow,sharding_encrypt_shadow,mask,mask_encrypt,mask_sharding,mask_encrypt_sharding,db_tbl_sql_federation
+#it.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,distsql_rdl,empty_rules,sharding_and_encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,readwrite_splitting_and_shadow,sharding_and_shadow,sharding_encrypt_shadow,mask,mask_encrypt,mask_sharding,mask_encrypt_sharding,db_tbl_sql_federation
+it.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,distsql_rdl,empty_rules,sharding_and_encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,readwrite_splitting_and_shadow,sharding_and_shadow,sharding_encrypt_shadow,mask,mask_encrypt,mask_sharding,mask_encrypt_sharding,db_tbl_sql_federation
# it.cluster.env.type=DOCKER,NATIVE
it.cluster.env.type=DOCKER
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/authority.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/authority.xml
rename to test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/authority.xml
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/actual/databases.xml
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/actual/databases.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/actual/databases.xml
rename to
test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/actual/databases.xml
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/actual/init-sql/mysql/01-actual-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/actual/init-sql/mysql/01-actual-init.sql
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/actual/init-sql/mysql/01-actual-init.sql
rename to
test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/actual/init-sql/mysql/01-actual-init.sql
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/actual/init-sql/opengauss/01-actual-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/actual/init-sql/opengauss/01-actual-init.sql
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/actual/init-sql/opengauss/01-actual-init.sql
rename to
test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/actual/init-sql/opengauss/01-actual-init.sql
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/actual/init-sql/postgresql/01-actual-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/actual/init-sql/postgresql/01-actual-init.sql
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/actual/init-sql/postgresql/01-actual-init.sql
rename to
test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/actual/init-sql/postgresql/01-actual-init.sql
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/expected/databases.xml
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/expected/databases.xml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/expected/databases.xml
rename to
test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/expected/databases.xml
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/expected/init-sql/mysql/01-expected-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/expected/init-sql/mysql/01-expected-init.sql
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/expected/init-sql/mysql/01-expected-init.sql
rename to
test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/expected/init-sql/mysql/01-expected-init.sql
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/expected/init-sql/opengauss/01-expected-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/expected/init-sql/opengauss/01-expected-init.sql
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/expected/init-sql/opengauss/01-expected-init.sql
rename to
test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/expected/init-sql/opengauss/01-expected-init.sql
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/expected/init-sql/postgresql/01-expected-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/expected/init-sql/postgresql/01-expected-init.sql
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/data/expected/init-sql/postgresql/01-expected-init.sql
rename to
test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/data/expected/init-sql/postgresql/01-expected-init.sql
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/proxy/conf/mysql/database-rdl-empty-rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/conf/mysql/database-distsql-rdl.yaml
similarity index 81%
rename from
test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/proxy/conf/mysql/database-rdl-empty-rules.yaml
rename to
test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/conf/mysql/database-distsql-rdl.yaml
index c25fafd5ae9..4531984d45a 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/proxy/conf/mysql/database-rdl-empty-rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/conf/mysql/database-distsql-rdl.yaml
@@ -15,11 +15,11 @@
# limitations under the License.
#
-databaseName: rdl_empty_rules
+databaseName: distsql_rdl
dataSources:
ds_0:
- url:
jdbc:mysql://mysql.rdl_empty_rules.host:3306/rdl_ds_0?useSSL=false&characterEncoding=utf-8
+ url:
jdbc:mysql://mysql.distsql_rdl.host:3306/rdl_ds_0?useSSL=false&characterEncoding=utf-8
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
@@ -28,7 +28,7 @@ dataSources:
maxPoolSize: 2
minPoolSize: 2
ds_1:
- url:
jdbc:mysql://mysql.rdl_empty_rules.host:3306/rdl_ds_1?useSSL=false&characterEncoding=utf-8
+ url:
jdbc:mysql://mysql.distsql_rdl.host:3306/rdl_ds_1?useSSL=false&characterEncoding=utf-8
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
@@ -37,7 +37,7 @@ dataSources:
maxPoolSize: 2
minPoolSize: 2
ds_2:
- url:
jdbc:mysql://mysql.rdl_empty_rules.host:3306/rdl_ds_2?useSSL=false&characterEncoding=utf-8
+ url:
jdbc:mysql://mysql.distsql_rdl.host:3306/rdl_ds_2?useSSL=false&characterEncoding=utf-8
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/proxy/conf/opengauss/database-rdl-empty-rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/conf/opengauss/database-distsql-rdl.yaml
similarity index 85%
rename from
test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/proxy/conf/opengauss/database-rdl-empty-rules.yaml
rename to
test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/conf/opengauss/database-distsql-rdl.yaml
index 858687f3eda..5cde3a8d1d9 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/proxy/conf/opengauss/database-rdl-empty-rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/conf/opengauss/database-distsql-rdl.yaml
@@ -15,11 +15,11 @@
# limitations under the License.
#
-databaseName: rdl_empty_rules
+databaseName: distsql_rdl
dataSources:
ds_0:
- url: jdbc:opengauss://opengauss.rdl_empty_rules.host:5432/rdl_ds_0
+ url: jdbc:opengauss://opengauss.distsql_rdl.host:5432/rdl_ds_0
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
@@ -28,7 +28,7 @@ dataSources:
maxPoolSize: 2
minPoolSize: 2
ds_1:
- url: jdbc:opengauss://opengauss.rdl_empty_rules.host:5432/rdl_ds_1
+ url: jdbc:opengauss://opengauss.distsql_rdl.host:5432/rdl_ds_1
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
@@ -37,7 +37,7 @@ dataSources:
maxPoolSize: 2
minPoolSize: 2
ds_2:
- url: jdbc:opengauss://opengauss.rdl_empty_rules.host:5432/rdl_ds_2
+ url: jdbc:opengauss://opengauss.distsql_rdl.host:5432/rdl_ds_2
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/proxy/conf/postgresql/database-rdl-empty-rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/conf/postgresql/database-distsql-rdl.yaml
similarity index 85%
rename from
test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/proxy/conf/postgresql/database-rdl-empty-rules.yaml
rename to
test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/conf/postgresql/database-distsql-rdl.yaml
index 66ea48ff726..3b60b59434d 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/proxy/conf/postgresql/database-rdl-empty-rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/conf/postgresql/database-distsql-rdl.yaml
@@ -15,11 +15,11 @@
# limitations under the License.
#
-databaseName: rdl_empty_rules
+databaseName: distsql_rdl
dataSources:
ds_0:
- url: jdbc:postgresql://postgresql.rdl_empty_rules.host:5432/rdl_ds_0
+ url: jdbc:postgresql://postgresql.distsql_rdl.host:5432/rdl_ds_0
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
@@ -28,7 +28,7 @@ dataSources:
maxPoolSize: 2
minPoolSize: 2
ds_1:
- url: jdbc:postgresql://postgresql.rdl_empty_rules.host:5432/rdl_ds_1
+ url: jdbc:postgresql://postgresql.distsql_rdl.host:5432/rdl_ds_1
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
@@ -37,7 +37,7 @@ dataSources:
maxPoolSize: 2
minPoolSize: 2
ds_2:
- url: jdbc:postgresql://postgresql.rdl_empty_rules.host:5432/rdl_ds_2
+ url: jdbc:postgresql://postgresql.distsql_rdl.host:5432/rdl_ds_2
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/rules.yaml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/rules.yaml
rename to test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/rules.yaml
