This is an automated email from the ASF dual-hosted git repository.
panjuan 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 60bc62e Remove incorrect RDL test cases (#16004)
60bc62e is described below
commit 60bc62eba5960aec1cab6cab5e17a05071f85c2d
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Mar 11 21:22:15 2022 +0800
Remove incorrect RDL test cases (#16004)
---
.../cases/rdl/rdl-integration-test-cases.xml | 272 +++++++++++----------
1 file changed, 138 insertions(+), 134 deletions(-)
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rdl/rdl-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rdl/rdl-integration-test-cases.xml
index adbd71d..3d54491 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rdl/rdl-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rdl/rdl-integration-test-cases.xml
@@ -32,15 +32,19 @@
<!-- <destroy-sql sql="DROP RESOURCE rdl_test_0;"/>-->
<!-- </assertion>-->
<!-- </test-case>-->
-
- <test-case sql="SHOW SCHEMA RESOURCES" db-types="PostgreSQL">
- <assertion expected-data-file="drop_resource.xml">
- <initial-sql sql="DROP RESOURCE rdl_test_0;"/>
- <destroy-sql sql="ADD RESOURCE rdl_test_0
(URL="jdbc:postgresql://postgresql.empty_rules.host:5432/rdl_test_0",
USER=root, PASSWORD=root,
-
PROPERTIES("maxPoolSize"=2,"maxPoolSize"=2,"connectionTimeoutMilliseconds"=30000,"idleTimeoutMilliseconds"=60000,"maxLifetimeMilliseconds"=1800000));"
/>
- </assertion>
- </test-case>
-
+
+ <!-- TODO Need to be redesigned:
+ 1. The SQL of case should be RDL, not RQL;
+ 2. Should not change current rules, which are used to RAL and RQL, it is
better to CREATE/ALTER/DROP new rule for assertion.
+ -->
+<!-- <test-case sql="SHOW SCHEMA RESOURCES" db-types="PostgreSQL">-->
+<!-- <assertion expected-data-file="drop_resource.xml">-->
+<!-- <initial-sql sql="DROP RESOURCE rdl_test_0;"/>-->
+<!-- <destroy-sql sql="ADD RESOURCE rdl_test_0
(URL="jdbc:postgresql://postgresql.empty_rules.host:5432/rdl_test_0",
USER=root, PASSWORD=root,-->
+<!--
PROPERTIES("maxPoolSize"=2,"maxPoolSize"=2,"connectionTimeoutMilliseconds"=30000,"idleTimeoutMilliseconds"=60000,"maxLifetimeMilliseconds"=1800000));"
/>-->
+<!-- </assertion>-->
+<!-- </test-case>-->
+<!-- -->
<!-- <test-case sql="SHOW SCHEMA RESOURCES" db-types="PostgreSQL">-->
<!-- <assertion expected-data-file="alter_resource.xml">-->
<!-- <initial-sql sql="ALTER RESOURCE rdl_test_0
(URL="jdbc:postgresql://postgresql.empty_rules.host:5432/rdl_test_0",
USER=root, PASSWORD=root,-->
@@ -48,131 +52,131 @@
<!-- <destroy-sql sql="DROP RESOURCE rdl_test_0;"/>-->
<!-- </assertion>-->
<!-- </test-case>-->
-
- <test-case sql="SHOW SCHEMA RESOURCES" db-types="MySQL">
- <assertion expected-data-file="drop_resource.xml">
- <initial-sql sql="DROP RESOURCE rdl_test_0;"/>
- <destroy-sql sql="ADD RESOURCE rdl_test_0
(URL="jdbc:mysql://mysql.empty_rules.host:3306/rdl_test_0?serverTimezone=UTC&useSSL=false&characterEncoding=utf-8",
USER=root, PASSWORD=root,
-
PROPERTIES("maxPoolSize"=2,"maxPoolSize"=2,"connectionTimeoutMilliseconds"=30000,"idleTimeoutMilliseconds"=60000,"maxLifetimeMilliseconds"=1800000));"
/>
- </assertion>
- </test-case>
-
- <test-case sql="SHOW SHARDING TABLE RULE t_user">
- <assertion expected-data-file="create_sharding_rules.xml">
- <initial-sql sql="DROP SHARDING TABLE RULE t_user;CREATE SHARDING
TABLE RULE t_user (
- RESOURCES("encrypt_write_ds_${0..9}"),
- SHARDING_COLUMN=user_id, TYPE(NAME=MOD,
PROPERTIES("sharding-count"=40)))))"/>
- <destroy-sql sql="DROP SHARDING TABLE RULE t_user" />
- </assertion>
- </test-case>
-
- <test-case sql="SHOW SHARDING TABLE RULE t_user_item">
- <assertion expected-data-file="drop_sharding_rules.xml">
- <initial-sql sql="DROP SHARDING TABLE RULE t_user_item"/>
- <destroy-sql sql="CREATE SHARDING TABLE RULE t_user_item (
- RESOURCES("encrypt_write_ds_${0..9}"),
- SHARDING_COLUMN=user_id, TYPE(NAME=MOD,
PROPERTIES("sharding-count"=40)))))" />
- </assertion>
- </test-case>
-
- <test-case sql="SHOW SHARDING BINDING TABLE RULES">
- <assertion expected-data-file="create_binding_rules.xml">
- <initial-sql sql="CREATE SHARDING TABLE RULE t_user (
- RESOURCES("encrypt_write_ds_${0..9}"),
- SHARDING_COLUMN=user_id, TYPE(NAME=MOD,
PROPERTIES("sharding-count"=40)))));
- CREATE SHARDING BINDING TABLE RULES (t_user,t_user_item)"/>
- <destroy-sql sql="DROP SHARDING BINDING TABLE RULES;DROP SHARDING
TABLE RULE t_user" />
- </assertion>
- </test-case>
-
- <test-case sql="SHOW SHARDING BINDING TABLE RULES">
- <assertion expected-data-file="alter_binding_rules.xml">
- <initial-sql sql="CREATE SHARDING TABLE RULE t_user (
- RESOURCES("encrypt_write_ds_${0..9}"),
- SHARDING_COLUMN=user_id, TYPE(NAME=MOD,
PROPERTIES("sharding-count"=40)))));
- CREATE SHARDING SCALING RULE default_scaling;
- ALTER SHARDING BINDING TABLE RULES (t_user,t_user_item);"/>
- <destroy-sql sql="DROP SHARDING BINDING TABLE RULES;DROP SHARDING
TABLE RULE t_user;DROP SHARDING SCALING RULE default_scaling" />
- </assertion>
- </test-case>
-
- <test-case sql="SHOW SHARDING BINDING TABLE RULES">
- <assertion expected-data-file="drop_binding_rules.xml">
- <initial-sql sql="CREATE SHARDING TABLE RULE t_user (
- RESOURCES("encrypt_write_ds_${0..9}"),
- SHARDING_COLUMN=user_id, TYPE(NAME=MOD,
PROPERTIES("sharding-count"=40)))));
- CREATE SHARDING BINDING TABLE RULES (t_user,t_user_item);
- DROP SHARDING BINDING TABLE RULES;DROP SHARDING TABLE RULE
t_user"/>
- </assertion>
- </test-case>
-
- <test-case sql="SHOW SHARDING BROADCAST TABLE RULES">
- <assertion expected-data-file="create_broadcast_rules.xml">
- <initial-sql sql="CREATE SHARDING BROADCAST TABLE RULES
(t_broadcast_table)"/>
- <destroy-sql sql="DROP SHARDING BROADCAST TABLE RULES" />
- </assertion>
- </test-case>
-
- <test-case sql="SHOW SHARDING BROADCAST TABLE RULES">
- <assertion expected-data-file="drop_broadcast_rules.xml">
- <initial-sql sql="CREATE SHARDING BROADCAST TABLE RULES
(t_broadcast_table);
- DROP SHARDING BROADCAST TABLE RULES"/>
- </assertion>
- </test-case>
-
- <test-case sql="SHOW ENCRYPT TABLE RULE t_user">
- <assertion expected-data-file="create_encrypt_rule.xml">
- <initial-sql sql="CREATE ENCRYPT RULE t_user (COLUMNS ((
- NAME=pwd, PLAIN=pwd_plain, CIPHER=pwd_cipher, TYPE(NAME=AES,
- PROPERTIES("aes-key-value"='123456abc')))))"/>
- <destroy-sql sql="DROP ENCRYPT RULE t_user" />
- </assertion>
- </test-case>
-
- <test-case sql="SHOW ENCRYPT TABLE RULE t_user">
- <assertion expected-data-file="alter_encrypt_rule.xml">
- <initial-sql sql="CREATE ENCRYPT RULE t_user (COLUMNS ((
- NAME=pwd, PLAIN=pwd_plain, CIPHER=pwd_cipher, TYPE(NAME=AES,
PROPERTIES("aes-key-value"='123456abc')))));
- CREATE SHARDING SCALING RULE default_scaling;
- ALTER ENCRYPT RULE t_user (COLUMNS ((NAME=pwd,
PLAIN=pwd_plain, CIPHER=pwd_cipher, TYPE(NAME=AES,
- PROPERTIES("aes-key-value"='123abc')))))"/>
- <destroy-sql sql="DROP ENCRYPT RULE t_user;DROP SHARDING SCALING
RULE default_scaling" />
- </assertion>
- </test-case>
-
- <test-case sql="SHOW ENCRYPT RULES">
- <assertion expected-data-file="drop_encrypt_rule.xml">
- <initial-sql sql="CREATE ENCRYPT RULE t_user (COLUMNS ((
- NAME=pwd, PLAIN=pwd_plain, CIPHER=pwd_cipher, TYPE(NAME=AES,
- PROPERTIES("aes-key-value"='123456abc')))));
- DROP ENCRYPT RULE t_user"/>
- </assertion>
- </test-case>
-
- <test-case sql="SHOW READWRITE_SPLITTING RULES">
- <assertion expected-data-file="create_readwrite_splitting_rules.xml">
- <initial-sql sql="CREATE READWRITE_SPLITTING RULE readwrite_ds_1
(WRITE_RESOURCE=encrypt_write_ds_1,
- READ_RESOURCES(encrypt_read_ds_1), TYPE(NAME=ROUND_ROBIN))"/>
- <destroy-sql sql="DROP READWRITE_SPLITTING RULE readwrite_ds_1" />
- </assertion>
- </test-case>
-
- <test-case sql="SHOW READWRITE_SPLITTING RULES">
- <assertion expected-data-file="alter_readwrite_splitting_rules.xml">
- <initial-sql sql="CREATE READWRITE_SPLITTING RULE readwrite_ds_1
(WRITE_RESOURCE=encrypt_write_ds_1,
- READ_RESOURCES(encrypt_read_ds_1), TYPE(NAME=ROUND_ROBIN));
- CREATE SHARDING SCALING RULE default_scaling;
- ALTER READWRITE_SPLITTING RULE readwrite_ds_1
(WRITE_RESOURCE=encrypt_write_ds_1,
- READ_RESOURCES(encrypt_read_ds_1, encrypt_read_ds_2),
TYPE(NAME=RANDOM,PROPERTIES(read_weight='2:1')))"/>
- <destroy-sql sql="DROP READWRITE_SPLITTING RULE
readwrite_ds_1;DROP SHARDING SCALING RULE default_scaling" />
- </assertion>
- </test-case>
-
- <test-case sql="SHOW READWRITE_SPLITTING RULES">
- <assertion expected-data-file="drop_readwrite_splitting_rules.xml">
- <initial-sql sql="DROP READWRITE_SPLITTING RULE readwrite_ds_0"/>
- </assertion>
- </test-case>
+<!-- -->
+<!-- <test-case sql="SHOW SCHEMA RESOURCES" db-types="MySQL">-->
+<!-- <assertion expected-data-file="drop_resource.xml">-->
+<!-- <initial-sql sql="DROP RESOURCE rdl_test_0;"/>-->
+<!-- <destroy-sql sql="ADD RESOURCE rdl_test_0
(URL="jdbc:mysql://mysql.empty_rules.host:3306/rdl_test_0?serverTimezone=UTC&useSSL=false&characterEncoding=utf-8",
USER=root, PASSWORD=root,-->
+<!--
PROPERTIES("maxPoolSize"=2,"maxPoolSize"=2,"connectionTimeoutMilliseconds"=30000,"idleTimeoutMilliseconds"=60000,"maxLifetimeMilliseconds"=1800000));"
/>-->
+<!-- </assertion>-->
+<!-- </test-case>-->
+<!-- -->
+<!-- <test-case sql="SHOW SHARDING TABLE RULE t_user">-->
+<!-- <assertion expected-data-file="create_sharding_rules.xml">-->
+<!-- <initial-sql sql="DROP SHARDING TABLE RULE t_user;CREATE
SHARDING TABLE RULE t_user (-->
+<!-- RESOURCES("encrypt_write_ds_${0..9}"),-->
+<!-- SHARDING_COLUMN=user_id, TYPE(NAME=MOD,
PROPERTIES("sharding-count"=40)))))"/>-->
+<!-- <destroy-sql sql="DROP SHARDING TABLE RULE t_user" />-->
+<!-- </assertion>-->
+<!-- </test-case>-->
+<!-- -->
+<!-- <test-case sql="SHOW SHARDING TABLE RULE t_user_item">-->
+<!-- <assertion expected-data-file="drop_sharding_rules.xml">-->
+<!-- <initial-sql sql="DROP SHARDING TABLE RULE t_user_item"/>-->
+<!-- <destroy-sql sql="CREATE SHARDING TABLE RULE t_user_item (-->
+<!-- RESOURCES("encrypt_write_ds_${0..9}"),-->
+<!-- SHARDING_COLUMN=user_id, TYPE(NAME=MOD,
PROPERTIES("sharding-count"=40)))))" />-->
+<!-- </assertion>-->
+<!-- </test-case>-->
+<!-- -->
+<!-- <test-case sql="SHOW SHARDING BINDING TABLE RULES">-->
+<!-- <assertion expected-data-file="create_binding_rules.xml">-->
+<!-- <initial-sql sql="CREATE SHARDING TABLE RULE t_user (-->
+<!-- RESOURCES("encrypt_write_ds_${0..9}"),-->
+<!-- SHARDING_COLUMN=user_id, TYPE(NAME=MOD,
PROPERTIES("sharding-count"=40)))));-->
+<!-- CREATE SHARDING BINDING TABLE RULES
(t_user,t_user_item)"/>-->
+<!-- <destroy-sql sql="DROP SHARDING BINDING TABLE RULES;DROP
SHARDING TABLE RULE t_user" />-->
+<!-- </assertion>-->
+<!-- </test-case>-->
+<!-- -->
+<!-- <test-case sql="SHOW SHARDING BINDING TABLE RULES">-->
+<!-- <assertion expected-data-file="alter_binding_rules.xml">-->
+<!-- <initial-sql sql="CREATE SHARDING TABLE RULE t_user (-->
+<!-- RESOURCES("encrypt_write_ds_${0..9}"),-->
+<!-- SHARDING_COLUMN=user_id, TYPE(NAME=MOD,
PROPERTIES("sharding-count"=40)))));-->
+<!-- CREATE SHARDING SCALING RULE default_scaling;-->
+<!-- ALTER SHARDING BINDING TABLE RULES
(t_user,t_user_item);"/>-->
+<!-- <destroy-sql sql="DROP SHARDING BINDING TABLE RULES;DROP
SHARDING TABLE RULE t_user;DROP SHARDING SCALING RULE default_scaling" />-->
+<!-- </assertion>-->
+<!-- </test-case>-->
+<!-- -->
+<!-- <test-case sql="SHOW SHARDING BINDING TABLE RULES">-->
+<!-- <assertion expected-data-file="drop_binding_rules.xml">-->
+<!-- <initial-sql sql="CREATE SHARDING TABLE RULE t_user (-->
+<!-- RESOURCES("encrypt_write_ds_${0..9}"),-->
+<!-- SHARDING_COLUMN=user_id, TYPE(NAME=MOD,
PROPERTIES("sharding-count"=40)))));-->
+<!-- CREATE SHARDING BINDING TABLE RULES
(t_user,t_user_item);-->
+<!-- DROP SHARDING BINDING TABLE RULES;DROP SHARDING TABLE RULE
t_user"/>-->
+<!-- </assertion>-->
+<!-- </test-case>-->
+<!-- -->
+<!-- <test-case sql="SHOW SHARDING BROADCAST TABLE RULES">-->
+<!-- <assertion expected-data-file="create_broadcast_rules.xml">-->
+<!-- <initial-sql sql="CREATE SHARDING BROADCAST TABLE RULES
(t_broadcast_table)"/>-->
+<!-- <destroy-sql sql="DROP SHARDING BROADCAST TABLE RULES" />-->
+<!-- </assertion>-->
+<!-- </test-case>-->
+<!-- -->
+<!-- <test-case sql="SHOW SHARDING BROADCAST TABLE RULES">-->
+<!-- <assertion expected-data-file="drop_broadcast_rules.xml">-->
+<!-- <initial-sql sql="CREATE SHARDING BROADCAST TABLE RULES
(t_broadcast_table);-->
+<!-- DROP SHARDING BROADCAST TABLE RULES"/>-->
+<!-- </assertion>-->
+<!-- </test-case>-->
+<!-- -->
+<!-- <test-case sql="SHOW ENCRYPT TABLE RULE t_user">-->
+<!-- <assertion expected-data-file="create_encrypt_rule.xml">-->
+<!-- <initial-sql sql="CREATE ENCRYPT RULE t_user (COLUMNS ((-->
+<!-- NAME=pwd, PLAIN=pwd_plain, CIPHER=pwd_cipher,
TYPE(NAME=AES,-->
+<!-- PROPERTIES("aes-key-value"='123456abc')))))"/>-->
+<!-- <destroy-sql sql="DROP ENCRYPT RULE t_user" />-->
+<!-- </assertion>-->
+<!-- </test-case>-->
+<!-- -->
+<!-- <test-case sql="SHOW ENCRYPT TABLE RULE t_user">-->
+<!-- <assertion expected-data-file="alter_encrypt_rule.xml">-->
+<!-- <initial-sql sql="CREATE ENCRYPT RULE t_user (COLUMNS ((-->
+<!-- NAME=pwd, PLAIN=pwd_plain, CIPHER=pwd_cipher,
TYPE(NAME=AES, PROPERTIES("aes-key-value"='123456abc')))));-->
+<!-- CREATE SHARDING SCALING RULE default_scaling;-->
+<!-- ALTER ENCRYPT RULE t_user (COLUMNS ((NAME=pwd,
PLAIN=pwd_plain, CIPHER=pwd_cipher, TYPE(NAME=AES,-->
+<!-- PROPERTIES("aes-key-value"='123abc')))))"/>-->
+<!-- <destroy-sql sql="DROP ENCRYPT RULE t_user;DROP SHARDING
SCALING RULE default_scaling" />-->
+<!-- </assertion>-->
+<!-- </test-case>-->
+<!-- -->
+<!-- <test-case sql="SHOW ENCRYPT RULES">-->
+<!-- <assertion expected-data-file="drop_encrypt_rule.xml">-->
+<!-- <initial-sql sql="CREATE ENCRYPT RULE t_user (COLUMNS ((-->
+<!-- NAME=pwd, PLAIN=pwd_plain, CIPHER=pwd_cipher,
TYPE(NAME=AES,-->
+<!-- PROPERTIES("aes-key-value"='123456abc')))));-->
+<!-- DROP ENCRYPT RULE t_user"/>-->
+<!-- </assertion>-->
+<!-- </test-case>-->
+<!-- -->
+<!-- <test-case sql="SHOW READWRITE_SPLITTING RULES">-->
+<!-- <assertion
expected-data-file="create_readwrite_splitting_rules.xml">-->
+<!-- <initial-sql sql="CREATE READWRITE_SPLITTING RULE
readwrite_ds_1 (WRITE_RESOURCE=encrypt_write_ds_1,-->
+<!-- READ_RESOURCES(encrypt_read_ds_1),
TYPE(NAME=ROUND_ROBIN))"/>-->
+<!-- <destroy-sql sql="DROP READWRITE_SPLITTING RULE
readwrite_ds_1" />-->
+<!-- </assertion>-->
+<!-- </test-case>-->
+<!-- -->
+<!-- <test-case sql="SHOW READWRITE_SPLITTING RULES">-->
+<!-- <assertion
expected-data-file="alter_readwrite_splitting_rules.xml">-->
+<!-- <initial-sql sql="CREATE READWRITE_SPLITTING RULE
readwrite_ds_1 (WRITE_RESOURCE=encrypt_write_ds_1,-->
+<!-- READ_RESOURCES(encrypt_read_ds_1), TYPE(NAME=ROUND_ROBIN));-->
+<!-- CREATE SHARDING SCALING RULE default_scaling;-->
+<!-- ALTER READWRITE_SPLITTING RULE readwrite_ds_1
(WRITE_RESOURCE=encrypt_write_ds_1,-->
+<!-- READ_RESOURCES(encrypt_read_ds_1, encrypt_read_ds_2),
TYPE(NAME=RANDOM,PROPERTIES(read_weight='2:1')))"/>-->
+<!-- <destroy-sql sql="DROP READWRITE_SPLITTING RULE
readwrite_ds_1;DROP SHARDING SCALING RULE default_scaling" />-->
+<!-- </assertion>-->
+<!-- </test-case>-->
+<!-- -->
+<!-- <test-case sql="SHOW READWRITE_SPLITTING RULES">-->
+<!-- <assertion
expected-data-file="drop_readwrite_splitting_rules.xml">-->
+<!-- <initial-sql sql="DROP READWRITE_SPLITTING RULE
readwrite_ds_0"/>-->
+<!-- </assertion>-->
+<!-- </test-case>-->
<!--TODO add db discovery tests-->
</integration-test-cases>
