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 710d1419bc6 Revise SHARDING TABLE RULE test cases (#21857)
710d1419bc6 is described below
commit 710d1419bc679f4d76a63a7f0b8c58e9bd69f8f7
Author: ChenJiaHao <[email protected]>
AuthorDate: Mon Oct 31 13:03:13 2022 +0800
Revise SHARDING TABLE RULE test cases (#21857)
---
.../asserts/segment/distsql/TableRuleAssert.java | 2 +-
.../domain/segment/impl/distsql/ExpectedTableRule.java | 4 ++--
test/parser/src/main/resources/case/rdl/alter.xml | 4 ++--
test/parser/src/main/resources/case/rdl/create.xml | 14 +++++++-------
test/parser/src/main/resources/sql/supported/rdl/alter.xml | 8 ++++----
.../parser/src/main/resources/sql/supported/rdl/create.xml | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/TableRuleAssert.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/TableRuleAssert.java
index f31cc72d897..08299e395d9 100644
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/TableRuleAssert.java
+++
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/TableRuleAssert.java
@@ -49,7 +49,7 @@ public final class TableRuleAssert {
assertThat(assertContext.getText(String.format("`%s`'s table rule
segment assertion error: ", actual.getClass().getSimpleName())),
actual.getLogicTable(), is(expected.getName()));
assertThat(assertContext.getText(String.format("`%s`'s table rule
segment assertion error: ", actual.getClass().getSimpleName())),
- actual.getDataSourceNodes(),
is(expected.getDataSources()));
+ actual.getDataSourceNodes(), is(expected.getDataNodes()));
assertThat(assertContext.getText(String.format("`%s`'s table rule
segment assertion error: ", actual.getClass().getSimpleName())),
actual.getTableStrategySegment().getShardingColumn(),
is(expected.getTableStrategy().getShardingColumn()));
assertThat(assertContext.getText(String.format("`%s`'s table rule
segment assertion error: ", actual.getClass().getSimpleName())),
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/distsql/ExpectedTableRule.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/distsql/ExpectedTableRule.java
index aed4b271770..46112ff8cdb 100644
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/distsql/ExpectedTableRule.java
+++
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/distsql/ExpectedTableRule.java
@@ -33,8 +33,8 @@ import java.util.List;
@Setter
public final class ExpectedTableRule extends
AbstractExpectedIdentifierSQLSegment {
- @XmlElement(name = "data-source")
- private List<String> dataSources;
+ @XmlElement(name = "data-node")
+ private List<String> dataNodes;
@XmlElement(name = "table-strategy")
private ExpectedShardingStrategy tableStrategy;
diff --git a/test/parser/src/main/resources/case/rdl/alter.xml
b/test/parser/src/main/resources/case/rdl/alter.xml
index 3fc13fa9672..0d602a3bc86 100644
--- a/test/parser/src/main/resources/case/rdl/alter.xml
+++ b/test/parser/src/main/resources/case/rdl/alter.xml
@@ -90,7 +90,7 @@
<alter-sharding-table-rule sql-case-id="alter-sharding-table-rule">
<rule name="t_order" key-generate-strategy-column="another_id">
- <data-source>ms_group_${0..1}</data-source>
+ <data-node>ms_group_${0..1}.t_order_${0..1}</data-node>
<table-strategy type="standard" sharding-column="user_id">
<algorithm-segment algorithm-name="INLINE">
<properties>
@@ -111,7 +111,7 @@
<alter-sharding-table-rule sql-case-id="alter-sharding-table-rule-complex">
<rule name="t_order" key-generate-strategy-column="another_id">
- <data-source>ms_group_${0..1}_${0..1}.t_order_${0..1}</data-source>
+ <data-node>ms_group_${0..1}_${0..1}.t_order_${0..1}</data-node>
<table-strategy type="standard" sharding-column="user_id">
<algorithm-segment algorithm-name="INLINE">
<properties>
diff --git a/test/parser/src/main/resources/case/rdl/create.xml
b/test/parser/src/main/resources/case/rdl/create.xml
index 8d06fca9341..069937a6afb 100644
--- a/test/parser/src/main/resources/case/rdl/create.xml
+++ b/test/parser/src/main/resources/case/rdl/create.xml
@@ -112,7 +112,7 @@
<create-sharding-table-rule sql-case-id="create-sharding-table-rule">
<rule name="t_order" key-generate-strategy-column="another_id">
- <data-source>ms_group_${0..1}</data-source>
+ <data-node>ms_group_${0..1}.t_order_${0..1}</data-node>
<table-strategy type="standard" sharding-column="user_id">
<algorithm-segment algorithm-name="INLINE">
<properties>
@@ -130,7 +130,7 @@
<key-generate-strategy algorithm-name="snowflake" />
</rule>
<rule name="t_order_item" key-generate-strategy-column="another_id">
- <data-source>ms_group_${0..1}</data-source>
+ <data-node>ms_group_${0..1}.t_order_item_${0..1}</data-node>
<table-strategy type="standard" sharding-column="user_id">
<algorithm-segment algorithm-name="INLINE">
<properties>
@@ -150,7 +150,7 @@
<create-sharding-table-rule
sql-case-id="create-sharding-table-rule-with-enum-inline-expression">
<rule name="t_order" key-generate-strategy-column="another_id">
- <data-source>ms_group_${['abc','ac']}.t_order_${0..1}</data-source>
+ <data-node>ms_group_${['abc','ac']}.t_order_${0..1}</data-node>
<table-strategy type="standard" sharding-column="user_id">
<algorithm-segment algorithm-name="INLINE">
<properties>
@@ -168,7 +168,7 @@
<key-generate-strategy algorithm-name="snowflake" />
</rule>
<rule name="t_order_item" key-generate-strategy-column="another_id">
- <data-source>ms_group_${0..1}.t_order_item_${0..1}</data-source>
+ <data-node>ms_group_${0..1}.t_order_item_${0..1}</data-node>
<table-strategy type="standard" sharding-column="user_id">
<algorithm-segment algorithm-name="INLINE">
<properties>
@@ -188,7 +188,7 @@
<create-sharding-table-rule
sql-case-id="create-sharding-table-rule-complex">
<rule name="t_order" key-generate-strategy-column="another_id">
- <data-source>ms_group_${0..1}_${0..1}.t_order_${0..1}</data-source>
+ <data-node>ms_group_${0..1}_${0..1}.t_order_${0..1}</data-node>
<table-strategy type="standard" sharding-column="user_id">
<algorithm-segment algorithm-name="INLINE">
<properties>
@@ -206,7 +206,7 @@
<key-generate-strategy algorithm-name="snowflake" />
</rule>
<rule name="t_order_item" key-generate-strategy-column="another_id">
- <data-source>ms_group_${0..1}.t_order_item_${0..1}</data-source>
+ <data-node>ms_group_${0..1}.t_order_item_${0..1}</data-node>
<table-strategy type="standard" sharding-column="user_id">
<algorithm-segment algorithm-name="INLINE">
<properties>
@@ -226,7 +226,7 @@
<create-sharding-table-rule
sql-case-id="create-sharding-table-rule-with-auto-create-algorithm">
<rule name="t_order" key-generate-strategy-column="another_id">
- <data-source>ms_group_${0..1}.t_order_${0..1}</data-source>
+ <data-node>ms_group_${0..1}.t_order_${0..1}</data-node>
<table-strategy type="standard" sharding-column="user_id">
<algorithm-segment algorithm-name="INLINE">
<properties>
diff --git a/test/parser/src/main/resources/sql/supported/rdl/alter.xml
b/test/parser/src/main/resources/sql/supported/rdl/alter.xml
index a2ff8e69e21..34d7f433782 100644
--- a/test/parser/src/main/resources/sql/supported/rdl/alter.xml
+++ b/test/parser/src/main/resources/sql/supported/rdl/alter.xml
@@ -26,9 +26,6 @@
<distsql-case id="alter-resource-single-with-properties" value="ALTER
STORAGE UNIT
ds_0(HOST='127.0.0.1',PORT=3306,DB='test0',USER='ROOT',PASSWORD='123456',PROPERTIES('maxPoolSize'='30'));"
/>
<distsql-case id="alter-resource-url-single-with-empty-properties"
value="ALTER STORAGE UNIT
ds_0(URL='jdbc:mysql://127.0.0.1:3306/test0',USER='ROOT',PROPERTIES())" />
<distsql-case id="alter-resource-url-single-with-properties" value="ALTER
STORAGE UNIT
ds_0(URL='jdbc:mysql://127.0.0.1:3306/test0',USER='ROOT',PASSWORD='123456',PROPERTIES('maxPoolSize'='30'))"
/>
- <distsql-case id="alter-sharding-auto-table-rule" value="ALTER SHARDING
TABLE RULE t_order (STORAGE_UNITS(ms_group_0,ms_group_1),
SHARDING_COLUMN=order_id,
TYPE(NAME='hash_mod',PROPERTIES('sharding-count'='4')),KEY_GENERATE_STRATEGY(COLUMN=another_id,TYPE(NAME='snowflake')))"
/>
- <distsql-case id="alter-sharding-auto-table-rule-with-inline-expression"
value="ALTER SHARDING TABLE RULE t_order (STORAGE_UNITS('ms_group_${0..1}'),
SHARDING_COLUMN=order_id,
TYPE(NAME='hash_mod',PROPERTIES('sharding-count'='4')),KEY_GENERATE_STRATEGY(COLUMN=another_id,TYPE(NAME='snowflake')))"
/>
- <distsql-case id="alter-sharding-table-reference-rule" value="ALTER
SHARDING TABLE REFERENCE RULE (t_order,t_order_item), (t_1,t_2)" />
<distsql-case id="alter-readwrite-splitting-rule" value="ALTER
READWRITE_SPLITTING RULE ms_group_0 (AUTO_AWARE_RESOURCE=group_0,
TYPE(NAME='random',PROPERTIES('read_weight'='2:1'))), ms_group_1
(WRITE_STORAGE_UNIT=primary_ds,
READ_STORAGE_UNITS(replica_ds_0,replica_ds_1),TYPE(NAME='random'))" />
<distsql-case id="alter-database-discovery-definition-rule" value="ALTER
DB_DISCOVERY RULE ha_group_0 (STORAGE_UNITS(ds_0,ds_1),
TYPE(NAME='mgr',PROPERTIES('groupName'='92504d5b-6dec')),HEARTBEAT(PROPERTIES('keepAliveCron'='0/5
* * * * ?'))), ha_group_1 (STORAGE_UNITS(ds_2,ds_3),
TYPE(NAME='mgr2',PROPERTIES('groupName'='92504d5b-6dec-2')),HEARTBEAT(PROPERTIES('keepAliveCron'='0/6
* * * * ?')))" />
<distsql-case id="alter-encrypt-rule" value="ALTER ENCRYPT RULE t_encrypt
(RESOURCE=ds_1,
COLUMNS((NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc'))),
(NAME=order_id, CIPHER =order_cipher,TYPE(NAME='MD5'))))" />
@@ -36,7 +33,10 @@
<distsql-case id="alter-encrypt-rule-with-query-with-cipher-column"
value="ALTER ENCRYPT RULE t_encrypt (RESOURCE=ds_1,
COLUMNS((NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,
TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc'))), (NAME=order_id,
CIPHER =order_cipher,TYPE(NAME='MD5'))), QUERY_WITH_CIPHER_COLUMN=false)" />
<distsql-case id="alter-default-shadow-algorithm" value="ALTER DEFAULT
SHADOW ALGORITHM TYPE(NAME='SIMPLE_HINT', PROPERTIES('shadow'='true',
'foo'='bar'))" />
<distsql-case id="alter-shadow-rule" value="ALTER SHADOW RULE
shadow_rule(SOURCE=demo_ds,SHADOW=demo_ds_shadow,t_order(TYPE(NAME='REGEX_MATCH',PROPERTIES('operation'='insert','column'='user_id','regex'='[1]')),TYPE(NAME='SIMPLE_HINT',PROPERTIES('shadow'='true','foo'='bar'))))"
/>
- <distsql-case id="alter-sharding-table-rule" value="ALTER SHARDING TABLE
RULE t_order
(DATANODES('ms_group_${0..1}'),DATABASE_STRATEGY(TYPE='standard',sharding_column
=
order_id,sharding_algorithm(type(name='INLINE',PROPERTIES('algorithm-expression'='ms_group_${order_id
% 2}')))),TABLE_STRATEGY(TYPE='standard',sharding_column =
user_id,sharding_algorithm(type(name='INLINE',PROPERTIES('algorithm-expression'='t_order_${user_id
% 2}')))),KEY_GENERATE_STRATEGY(COLUMN=another_id,TYPE(NAME [...]
+ <distsql-case id="alter-sharding-auto-table-rule" value="ALTER SHARDING
TABLE RULE t_order (STORAGE_UNITS(ms_group_0,ms_group_1),
SHARDING_COLUMN=order_id,
TYPE(NAME='hash_mod',PROPERTIES('sharding-count'='4')),KEY_GENERATE_STRATEGY(COLUMN=another_id,TYPE(NAME='snowflake')))"
/>
+ <distsql-case id="alter-sharding-auto-table-rule-with-inline-expression"
value="ALTER SHARDING TABLE RULE t_order (STORAGE_UNITS('ms_group_${0..1}'),
SHARDING_COLUMN=order_id,
TYPE(NAME='hash_mod',PROPERTIES('sharding-count'='4')),KEY_GENERATE_STRATEGY(COLUMN=another_id,TYPE(NAME='snowflake')))"
/>
+ <distsql-case id="alter-sharding-table-reference-rule" value="ALTER
SHARDING TABLE REFERENCE RULE (t_order,t_order_item), (t_1,t_2)" />
+ <distsql-case id="alter-sharding-table-rule" value="ALTER SHARDING TABLE
RULE t_order
(DATANODES('ms_group_${0..1}.t_order_${0..1}'),DATABASE_STRATEGY(TYPE='standard',sharding_column
=
order_id,sharding_algorithm(type(name='INLINE',PROPERTIES('algorithm-expression'='ms_group_${order_id
% 2}')))),TABLE_STRATEGY(TYPE='standard',sharding_column =
user_id,sharding_algorithm(type(name='INLINE',PROPERTIES('algorithm-expression'='t_order_${user_id
% 2}')))),KEY_GENERATE_STRATEGY(COLUMN=anot [...]
<distsql-case id="alter-sharding-table-rule-complex" value="ALTER SHARDING
TABLE RULE t_order
(DATANODES('ms_group_${0..1}_${0..1}.t_order_${0..1}'),DATABASE_STRATEGY(TYPE='complex',sharding_columns
= order_id,user_id,
sharding_algorithm(type(name='INLINE',PROPERTIES('algorithm-expression'='ms_group_${order_id
% 2}_${user_id % 2}')))),TABLE_STRATEGY(TYPE='standard',sharding_column =
user_id,sharding_algorithm(type(name='INLINE',PROPERTIES('algorithm-expression'='t_order_${user_id
% 2 [...]
<distsql-case id="alter-default-single-table" value="SET DEFAULT SINGLE
TABLE STORAGE UNIT = ds_0" />
<distsql-case id="alter-sharding-auditor" value="ALTER SHARDING AUDITOR
sharding_key_required_auditor(TYPE(NAME='DML_SHARDING_CONDITIONS'))" />
diff --git a/test/parser/src/main/resources/sql/supported/rdl/create.xml
b/test/parser/src/main/resources/sql/supported/rdl/create.xml
index 7eeee949f97..401cad899b3 100644
--- a/test/parser/src/main/resources/sql/supported/rdl/create.xml
+++ b/test/parser/src/main/resources/sql/supported/rdl/create.xml
@@ -40,7 +40,7 @@
<distsql-case id="create-default-sharding-table-strategy-with-lower-case"
value="create default sharding table strategy(type='standard',
sharding_column=order_id,
SHARDING_ALGORITHM(TYPE(NAME='INLINE',PROPERTIES('algorithm-expression'='t_order_${order_id
% 2}'))))" />
<distsql-case id="create-default-sharding-database-strategy" value="CREATE
DEFAULT SHARDING DATABASE STRATEGY(TYPE='STANDARD', SHARDING_COLUMN=ORDER_ID,
SHARDING_ALGORITHM(TYPE(NAME='INLINE',PROPERTIES('algorithm-expression'='ms_group_${order_id
% 2}'))))" />
<distsql-case id="create-default-sharding-strategy-complex" value="CREATE
DEFAULT SHARDING TABLE STRATEGY(TYPE='complex',
SHARDING_COLUMNS=order_id,user_id,
SHARDING_ALGORITHM(TYPE(NAME='INLINE',PROPERTIES('algorithm-expression'='t_order_${user_id
% 2}_${order_id % 2}'))))" />
- <distsql-case id="create-sharding-table-rule" value="CREATE SHARDING TABLE
RULE t_order
(DATANODES('ms_group_${0..1}'),DATABASE_STRATEGY(TYPE='standard',sharding_column
=
order_id,sharding_algorithm(type(name='INLINE',PROPERTIES('algorithm-expression'='ms_group_${order_id
% 2}')))),TABLE_STRATEGY(TYPE='standard',sharding_column =
user_id,sharding_algorithm(type(name='INLINE',PROPERTIES('algorithm-expression'='t_order_${user_id
% 2}')))),KEY_GENERATE_STRATEGY(COLUMN=another_id,TYPE(NA [...]
+ <distsql-case id="create-sharding-table-rule" value="CREATE SHARDING TABLE
RULE t_order
(DATANODES('ms_group_${0..1}.t_order_${0..1}'),DATABASE_STRATEGY(TYPE='standard',sharding_column
=
order_id,sharding_algorithm(type(name='INLINE',PROPERTIES('algorithm-expression'='ms_group_${order_id
% 2}')))),TABLE_STRATEGY(TYPE='standard',sharding_column =
user_id,sharding_algorithm(type(name='INLINE',PROPERTIES('algorithm-expression'='t_order_${user_id
% 2}')))),KEY_GENERATE_STRATEGY(COLUMN=an [...]
<distsql-case id="create-sharding-table-rule-with-enum-inline-expression"
value="CREATE SHARDING TABLE RULE t_order
(DATANODES("ms_group_${['abc','ac']}.t_order_${0..1}"),DATABASE_STRATEGY(TYPE='standard',sharding_column
=
order_name,sharding_algorithm(type(name='INLINE',PROPERTIES('algorithm-expression'='ms_group_{order_name}')))),TABLE_STRATEGY(TYPE='standard',sharding_column
=
user_id,sharding_algorithm(type(name='INLINE',PROPERTIES('algorithm-expression'='t_order_${user
[...]
<distsql-case id="create-sharding-table-rule-complex" value="CREATE
SHARDING TABLE RULE t_order
(DATANODES('ms_group_${0..1}_${0..1}.t_order_${0..1}'),DATABASE_STRATEGY(TYPE='complex',sharding_columns
=
order_id,user_id,sharding_algorithm(type(name='INLINE',PROPERTIES('algorithm-expression'='ms_group_${order_id
% 2}_${user_id % 2}')))),TABLE_STRATEGY(TYPE='standard',sharding_column =
user_id,sharding_algorithm(type(name='INLINE',PROPERTIES('algorithm-expression'='t_order_${user_id
% [...]
<distsql-case id="create-sharding-table-rule-with-auto-create-algorithm"
value="CREATE SHARDING TABLE RULE t_order
(DATANODES('ms_group_${0..1}.t_order_${0..1}'),DATABASE_STRATEGY(TYPE='standard',sharding_column
=
order_id,sharding_algorithm(TYPE(NAME='INLINE',PROPERTIES('algorithm-expression'='ms_group_${order_id
% 2}')))),TABLE_STRATEGY(TYPE='standard',sharding_column =
user_id,sharding_algorithm(type(name='INLINE',PROPERTIES('algorithm-expression'='t_order_${user_id
% 2}')))),KEY_ [...]
