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 ffd7f75  Simplify dist sql test cases (#10812)
ffd7f75 is described below

commit ffd7f75a28120be9e5d62581e988c4b3e1764eb1
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jun 15 15:00:40 2021 +0800

    Simplify dist sql test cases (#10812)
---
 .../api/DistSQLStatementParserEngineTest.java      | 52 ++++++++++----------
 ...riteSplittingRuleStatementParserEngineTest.java | 20 ++++----
 .../ShardingRuleStatementParserEngineTest.java     | 56 +++++++++++-----------
 3 files changed, 64 insertions(+), 64 deletions(-)

diff --git 
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/test/java/org/apache/shardingsphere/distsql/parser/api/DistSQLStatementParserEngineTest.java
 
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/test/java/org/apache/shardingsphere/distsql/parser/api/DistSQLStatementParserEngineTest.java
index 4f81a90..779a2fd 100644
--- 
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/test/java/org/apache/shardingsphere/distsql/parser/api/DistSQLStatementParserEngineTest.java
+++ 
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/test/java/org/apache/shardingsphere/distsql/parser/api/DistSQLStatementParserEngineTest.java
@@ -46,16 +46,16 @@ import static org.junit.Assert.assertTrue;
 // TODO use Parameterized + XML instead of static test
 public final class DistSQLStatementParserEngineTest {
     
-    private static final String RDL_ADD_RESOURCE_SINGLE_WITHOUT_PASSWORD = 
"ADD RESOURCE ds_0(HOST=127.0.0.1,PORT=3306,DB=test0,USER=ROOT);";
+    private static final String ADD_RESOURCE_SINGLE_WITHOUT_PASSWORD = "ADD 
RESOURCE ds_0(HOST=127.0.0.1,PORT=3306,DB=test0,USER=ROOT);";
     
-    private static final String RDL_ADD_RESOURCE_SINGLE_WITH_PASSWORD = "ADD 
RESOURCE ds_0(HOST=127.0.0.1,PORT=3306,DB=test0,USER=ROOT,PASSWORD=123456);";
+    private static final String ADD_RESOURCE_SINGLE_WITH_PASSWORD = "ADD 
RESOURCE ds_0(HOST=127.0.0.1,PORT=3306,DB=test0,USER=ROOT,PASSWORD=123456);";
     
-    private static final String RDL_ADD_RESOURCE_MULTIPLE = "ADD RESOURCE 
ds_0(HOST=127.0.0.1,PORT=3306,DB=test0,USER=ROOT,PASSWORD=123456),"
+    private static final String ADD_RESOURCE_MULTIPLE = "ADD RESOURCE 
ds_0(HOST=127.0.0.1,PORT=3306,DB=test0,USER=ROOT,PASSWORD=123456),"
             + 
"ds_1(HOST=127.0.0.1,PORT=3306,DB=test1,USER=ROOT,PASSWORD=123456);";
     
-    private static final String RDL_DROP_RESOURCE = "DROP RESOURCE ds_0,ds_1";
+    private static final String DROP_RESOURCE = "DROP RESOURCE ds_0,ds_1";
     
-    private static final String RDL_CREATE_DATABASE_DISCOVERY_RULE = "CREATE 
DB_DISCOVERY RULE ha_group_0 ("
+    private static final String CREATE_DATABASE_DISCOVERY_RULE = "CREATE 
DB_DISCOVERY RULE ha_group_0 ("
             + "RESOURCES(resource0,resource1),"
             + 
"TYPE(NAME=mgr,PROPERTIES(groupName='92504d5b-6dec',keepAliveCron=''))),"
             + "ha_group_1 ("
@@ -63,7 +63,7 @@ public final class DistSQLStatementParserEngineTest {
             + 
"TYPE(NAME=mgr2,PROPERTIES(groupName='92504d5b-6dec-2',keepAliveCron=''))"
             + ")";
     
-    private static final String RDL_ALTER_DATABASE_DISCOVERY_RULE = "ALTER 
DB_DISCOVERY RULE ha_group_0 ("
+    private static final String ALTER_DATABASE_DISCOVERY_RULE = "ALTER 
DB_DISCOVERY RULE ha_group_0 ("
             + "RESOURCES(resource0,resource1),"
             + 
"TYPE(NAME=mgr,PROPERTIES(groupName='92504d5b-6dec',keepAliveCron=''))),"
             + "ha_group_1 ("
@@ -71,33 +71,33 @@ public final class DistSQLStatementParserEngineTest {
             + 
"TYPE(NAME=mgr2,PROPERTIES(groupName='92504d5b-6dec-2',keepAliveCron=''))"
             + ")";
     
-    private static final String RDL_DROP_DATABASE_DISCOVERY_RULE = "DROP 
DB_DISCOVERY RULE ha_group_0,ha_group_1";
+    private static final String DROP_DATABASE_DISCOVERY_RULE = "DROP 
DB_DISCOVERY RULE ha_group_0,ha_group_1";
     
-    private static final String RDL_CREATE_ENCRYPT_RULE = "CREATE ENCRYPT RULE 
t_encrypt ("
+    private static final String CREATE_ENCRYPT_RULE = "CREATE ENCRYPT RULE 
t_encrypt ("
             + "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))"
             + "))";
     
-    private static final String RDL_ALTER_ENCRYPT_RULE = "ALTER ENCRYPT RULE 
t_encrypt ("
+    private static final String ALTER_ENCRYPT_RULE = "ALTER ENCRYPT RULE 
t_encrypt ("
             + "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))"
             + "))";
     
-    private static final String RDL_DROP_ENCRYPT_RULE = "DROP ENCRYPT RULE 
t_encrypt,t_encrypt_order";
+    private static final String DROP_ENCRYPT_RULE = "DROP ENCRYPT RULE 
t_encrypt,t_encrypt_order";
     
-    private static final String RQL_SHOW_DB_DISCOVERY_RULES = "SHOW 
DB_DISCOVERY RULES FROM db_discovery_db";
+    private static final String SHOW_DB_DISCOVERY_RULES = "SHOW DB_DISCOVERY 
RULES FROM db_discovery_db";
     
-    private static final String RQL_SHOW_ENCRYPT_RULES = "SHOW ENCRYPT RULES 
FROM encrypt_db";
+    private static final String SHOW_ENCRYPT_RULES = "SHOW ENCRYPT RULES FROM 
encrypt_db";
     
-    private static final String RQL_SHOW_ENCRYPT_TABLE_RULE = "SHOW ENCRYPT 
TABLE RULE t_encrypt FROM encrypt_db";
+    private static final String SHOW_ENCRYPT_TABLE_RULE = "SHOW ENCRYPT TABLE 
RULE t_encrypt FROM encrypt_db";
     
     private final DistSQLStatementParserEngine engine = new 
DistSQLStatementParserEngine();
     
     @Test
     public void assertParseAddSingleResourceWithoutPassword() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_ADD_RESOURCE_SINGLE_WITHOUT_PASSWORD);
+        SQLStatement sqlStatement = 
engine.parse(ADD_RESOURCE_SINGLE_WITHOUT_PASSWORD);
         assertTrue(sqlStatement instanceof AddResourceStatement);
         assertThat(((AddResourceStatement) 
sqlStatement).getDataSources().size(), is(1));
         DataSourceSegment dataSourceSegment = ((AddResourceStatement) 
sqlStatement).getDataSources().iterator().next();
@@ -110,7 +110,7 @@ public final class DistSQLStatementParserEngineTest {
     
     @Test
     public void assertParseAddSingleResourceWithPassword() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_ADD_RESOURCE_SINGLE_WITH_PASSWORD);
+        SQLStatement sqlStatement = 
engine.parse(ADD_RESOURCE_SINGLE_WITH_PASSWORD);
         assertTrue(sqlStatement instanceof AddResourceStatement);
         assertThat(((AddResourceStatement) 
sqlStatement).getDataSources().size(), is(1));
         DataSourceSegment dataSourceSegment = ((AddResourceStatement) 
sqlStatement).getDataSources().iterator().next();
@@ -124,7 +124,7 @@ public final class DistSQLStatementParserEngineTest {
     
     @Test
     public void assertParseAddMultipleResources() {
-        SQLStatement sqlStatement = engine.parse(RDL_ADD_RESOURCE_MULTIPLE);
+        SQLStatement sqlStatement = engine.parse(ADD_RESOURCE_MULTIPLE);
         assertTrue(sqlStatement instanceof AddResourceStatement);
         assertThat(((AddResourceStatement) 
sqlStatement).getDataSources().size(), is(2));
         List<DataSourceSegment> dataSourceSegments = new 
ArrayList<>(((AddResourceStatement) sqlStatement).getDataSources());
@@ -146,7 +146,7 @@ public final class DistSQLStatementParserEngineTest {
     
     @Test
     public void assertParseDropResource() {
-        SQLStatement sqlStatement = engine.parse(RDL_DROP_RESOURCE);
+        SQLStatement sqlStatement = engine.parse(DROP_RESOURCE);
         assertTrue(sqlStatement instanceof DropResourceStatement);
         assertThat(((DropResourceStatement) sqlStatement).getNames().size(), 
is(2));
         assertTrue(((DropResourceStatement) 
sqlStatement).getNames().containsAll(Arrays.asList("ds_0", "ds_1")));
@@ -154,7 +154,7 @@ public final class DistSQLStatementParserEngineTest {
     
     @Test
     public void assertParseCreateDatabaseDiscoveryRule() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_CREATE_DATABASE_DISCOVERY_RULE);
+        SQLStatement sqlStatement = 
engine.parse(CREATE_DATABASE_DISCOVERY_RULE);
         assertTrue(sqlStatement instanceof 
CreateDatabaseDiscoveryRuleStatement);
         CreateDatabaseDiscoveryRuleStatement statement = 
(CreateDatabaseDiscoveryRuleStatement) sqlStatement;
         assertThat(statement.getRules().size(), is(2));
@@ -172,7 +172,7 @@ public final class DistSQLStatementParserEngineTest {
     
     @Test
     public void assertParseAlterDatabaseDiscoveryRule() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_ALTER_DATABASE_DISCOVERY_RULE);
+        SQLStatement sqlStatement = 
engine.parse(ALTER_DATABASE_DISCOVERY_RULE);
         assertTrue(sqlStatement instanceof 
AlterDatabaseDiscoveryRuleStatement);
         AlterDatabaseDiscoveryRuleStatement statement = 
(AlterDatabaseDiscoveryRuleStatement) sqlStatement;
         assertThat(statement.getRules().size(), is(2));
@@ -189,14 +189,14 @@ public final class DistSQLStatementParserEngineTest {
     
     @Test
     public void assertParseDropDatabaseDiscoveryRule() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_DROP_DATABASE_DISCOVERY_RULE);
+        SQLStatement sqlStatement = engine.parse(DROP_DATABASE_DISCOVERY_RULE);
         assertTrue(sqlStatement instanceof DropDatabaseDiscoveryRuleStatement);
         assertThat(((DropDatabaseDiscoveryRuleStatement) 
sqlStatement).getRuleNames(), is(Arrays.asList("ha_group_0", "ha_group_1")));
     }
     
     @Test
     public void assertParseCreateEncryptRule() {
-        SQLStatement sqlStatement = engine.parse(RDL_CREATE_ENCRYPT_RULE);
+        SQLStatement sqlStatement = engine.parse(CREATE_ENCRYPT_RULE);
         assertTrue(sqlStatement instanceof CreateEncryptRuleStatement);
         CreateEncryptRuleStatement createEncryptRuleStatement = 
(CreateEncryptRuleStatement) sqlStatement;
         assertThat(createEncryptRuleStatement.getRules().size(), is(1));
@@ -216,7 +216,7 @@ public final class DistSQLStatementParserEngineTest {
     
     @Test
     public void assertParseAlterEncryptRule() {
-        SQLStatement sqlStatement = engine.parse(RDL_ALTER_ENCRYPT_RULE);
+        SQLStatement sqlStatement = engine.parse(ALTER_ENCRYPT_RULE);
         assertTrue(sqlStatement instanceof AlterEncryptRuleStatement);
         AlterEncryptRuleStatement alterEncryptRuleStatement = 
(AlterEncryptRuleStatement) sqlStatement;
         assertThat(alterEncryptRuleStatement.getRules().size(), is(1));
@@ -236,21 +236,21 @@ public final class DistSQLStatementParserEngineTest {
     
     @Test
     public void assertParseDropEncryptRule() {
-        SQLStatement sqlStatement = engine.parse(RDL_DROP_ENCRYPT_RULE);
+        SQLStatement sqlStatement = engine.parse(DROP_ENCRYPT_RULE);
         assertTrue(sqlStatement instanceof DropEncryptRuleStatement);
         assertThat(((DropEncryptRuleStatement) sqlStatement).getTables(), 
is(Arrays.asList("t_encrypt", "t_encrypt_order")));
     }
     
     @Test
     public void assertParseShowDatabaseDiscoveryRules() {
-        SQLStatement sqlStatement = engine.parse(RQL_SHOW_DB_DISCOVERY_RULES);
+        SQLStatement sqlStatement = engine.parse(SHOW_DB_DISCOVERY_RULES);
         assertTrue(sqlStatement instanceof 
ShowDatabaseDiscoveryRulesStatement);
         assertThat(((ShowDatabaseDiscoveryRulesStatement) 
sqlStatement).getSchema().get().getIdentifier().getValue(), 
is("db_discovery_db"));
     }
     
     @Test
     public void assertParseShowEncryptRules() {
-        SQLStatement sqlStatement = engine.parse(RQL_SHOW_ENCRYPT_RULES);
+        SQLStatement sqlStatement = engine.parse(SHOW_ENCRYPT_RULES);
         assertTrue(sqlStatement instanceof ShowEncryptRulesStatement);
         assertNull(((ShowEncryptRulesStatement) sqlStatement).getTableName());
         assertThat(((ShowEncryptRulesStatement) 
sqlStatement).getSchema().get().getIdentifier().getValue(), is("encrypt_db"));
@@ -258,7 +258,7 @@ public final class DistSQLStatementParserEngineTest {
     
     @Test
     public void assertParseShowEncryptTableRule() {
-        SQLStatement sqlStatement = engine.parse(RQL_SHOW_ENCRYPT_TABLE_RULE);
+        SQLStatement sqlStatement = engine.parse(SHOW_ENCRYPT_TABLE_RULE);
         assertTrue(sqlStatement instanceof ShowEncryptRulesStatement);
         assertThat(((ShowEncryptRulesStatement) 
sqlStatement).getSchema().get().getIdentifier().getValue(), is("encrypt_db"));
         assertThat(((ShowEncryptRulesStatement) sqlStatement).getTableName(), 
is("t_encrypt"));
diff --git 
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingRuleStatementParserEngineTest.java
 
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingRuleStatementParserEngineTest.java
index 11372e7..e674be3 100644
--- 
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingRuleStatementParserEngineTest.java
+++ 
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingRuleStatementParserEngineTest.java
@@ -38,18 +38,18 @@ import static org.junit.Assert.assertTrue;
 // TODO use Parameterized + XML instead of static test
 public final class ReadwriteSplittingRuleStatementParserEngineTest {
     
-    private static final String RDL_CREATE_STATIC_READWRITE_SPLITTING_RULE = 
"CREATE READWRITE_SPLITTING RULE ms_group_0 ("
+    private static final String CREATE_STATIC_READWRITE_SPLITTING_RULE = 
"CREATE READWRITE_SPLITTING RULE ms_group_0 ("
             + "WRITE_RESOURCE=primary_ds,"
             + "READ_RESOURCES(replica_ds_0,replica_ds_1),"
             + "TYPE(NAME=random)"
             + ")";
     
-    private static final String RDL_CREATE_DYNAMIC_READWRITE_SPLITTING_RULE = 
"CREATE READWRITE_SPLITTING RULE ms_group_1 ("
+    private static final String CREATE_DYNAMIC_READWRITE_SPLITTING_RULE = 
"CREATE READWRITE_SPLITTING RULE ms_group_1 ("
             + "AUTO_AWARE_RESOURCE=group_0,"
             + "TYPE(NAME=random,PROPERTIES(read_weight='2:1'))"
             + ")";
     
-    private static final String RDL_ALTER_READWRITE_SPLITTING_RULE = "ALTER 
READWRITE_SPLITTING RULE ms_group_0 ("
+    private static final String ALTER_READWRITE_SPLITTING_RULE = "ALTER 
READWRITE_SPLITTING RULE ms_group_0 ("
             + "AUTO_AWARE_RESOURCE=group_0,"
             + "TYPE(NAME=random,PROPERTIES(read_weight='2:1'))),"
             + "ms_group_1 ("
@@ -58,15 +58,15 @@ public final class 
ReadwriteSplittingRuleStatementParserEngineTest {
             + "TYPE(NAME=random)"
             + ")";
     
-    private static final String RDL_DROP_READWRITE_SPLITTING_RULE = "DROP 
READWRITE_SPLITTING RULE ms_group_0,ms_group_1";
+    private static final String DROP_READWRITE_SPLITTING_RULE = "DROP 
READWRITE_SPLITTING RULE ms_group_0,ms_group_1";
     
-    private static final String RQL_SHOW_READWRITE_SPLITTING_RULES = "SHOW 
READWRITE_SPLITTING RULES FROM readwrite_splitting_db";
+    private static final String SHOW_READWRITE_SPLITTING_RULES = "SHOW 
READWRITE_SPLITTING RULES FROM readwrite_splitting_db";
     
     private final DistSQLStatementParserEngine engine = new 
DistSQLStatementParserEngine();
     
     @Test
     public void assertParseStaticReadwriteSplittingRule() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_CREATE_STATIC_READWRITE_SPLITTING_RULE);
+        SQLStatement sqlStatement = 
engine.parse(CREATE_STATIC_READWRITE_SPLITTING_RULE);
         assertTrue(sqlStatement instanceof 
CreateReadwriteSplittingRuleStatement);
         CreateReadwriteSplittingRuleStatement statement = 
(CreateReadwriteSplittingRuleStatement) sqlStatement;
         assertThat(statement.getRules().size(), is(1));
@@ -81,7 +81,7 @@ public final class 
ReadwriteSplittingRuleStatementParserEngineTest {
     
     @Test
     public void assertParseDynamicReadwriteSplittingRule() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_CREATE_DYNAMIC_READWRITE_SPLITTING_RULE);
+        SQLStatement sqlStatement = 
engine.parse(CREATE_DYNAMIC_READWRITE_SPLITTING_RULE);
         assertTrue(sqlStatement instanceof 
CreateReadwriteSplittingRuleStatement);
         CreateReadwriteSplittingRuleStatement statement = 
(CreateReadwriteSplittingRuleStatement) sqlStatement;
         assertThat(statement.getRules().size(), is(1));
@@ -98,7 +98,7 @@ public final class 
ReadwriteSplittingRuleStatementParserEngineTest {
     
     @Test
     public void assertParseAlterReadwriteSplittingRule() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_ALTER_READWRITE_SPLITTING_RULE);
+        SQLStatement sqlStatement = 
engine.parse(ALTER_READWRITE_SPLITTING_RULE);
         assertTrue(sqlStatement instanceof 
AlterReadwriteSplittingRuleStatement);
         AlterReadwriteSplittingRuleStatement statement = 
(AlterReadwriteSplittingRuleStatement) sqlStatement;
         assertThat(statement.getRules().size(), is(2));
@@ -119,14 +119,14 @@ public final class 
ReadwriteSplittingRuleStatementParserEngineTest {
     
     @Test
     public void assertParseDropReadwriteSplittingRule() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_DROP_READWRITE_SPLITTING_RULE);
+        SQLStatement sqlStatement = 
engine.parse(DROP_READWRITE_SPLITTING_RULE);
         assertTrue(sqlStatement instanceof 
DropReadwriteSplittingRuleStatement);
         assertThat(((DropReadwriteSplittingRuleStatement) 
sqlStatement).getRuleNames(), is(Arrays.asList("ms_group_0", "ms_group_1")));
     }
     
     @Test
     public void assertParseShowReadwriteSplittingRules() {
-        SQLStatement sqlStatement = 
engine.parse(RQL_SHOW_READWRITE_SPLITTING_RULES);
+        SQLStatement sqlStatement = 
engine.parse(SHOW_READWRITE_SPLITTING_RULES);
         assertTrue(sqlStatement instanceof 
ShowReadwriteSplittingRulesStatement);
         assertThat(((ShowReadwriteSplittingRulesStatement) 
sqlStatement).getSchema().get().getIdentifier().getValue(), 
is("readwrite_splitting_db"));
     }
diff --git 
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/src/test/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingRuleStatementParserEngineTest.java
 
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/src/test/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingRuleStatementParserEngineTest.java
index 15e671d..39ff24f 100644
--- 
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/src/test/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingRuleStatementParserEngineTest.java
+++ 
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/src/test/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingRuleStatementParserEngineTest.java
@@ -47,49 +47,49 @@ import static org.junit.Assert.assertTrue;
 // TODO use Parameterized + XML instead of static test
 public final class ShardingRuleStatementParserEngineTest {
     
-    private static final String RDL_CREATE_SHARDING_TABLE_RULE = "CREATE 
SHARDING TABLE RULE t_order (" 
+    private static final String CREATE_SHARDING_TABLE_RULE = "CREATE SHARDING 
TABLE RULE t_order (" 
             + "RESOURCES(ms_group_0,ms_group_1)," 
             + "SHARDING_COLUMN=order_id," 
             + "TYPE(NAME=hash_mod,PROPERTIES('sharding-count'=4))," 
             + 
"GENERATED_KEY(COLUMN=another_id,TYPE(NAME=snowflake,PROPERTIES(\"worker-id\"=123))))";
     
-    private static final String RDL_CREATE_SHARDING_BINDING_TABLE_RULES = 
"CREATE SHARDING BINDING TABLE RULES (" 
+    private static final String CREATE_SHARDING_BINDING_TABLE_RULES = "CREATE 
SHARDING BINDING TABLE RULES (" 
             + "(t_order,t_order_item), (t_1,t_2))";
     
-    private static final String RDL_CREATE_SHARDING_BROADCAST_TABLE_RULES = 
"CREATE SHARDING BROADCAST TABLE RULES(t_1,t_2)";
+    private static final String CREATE_SHARDING_BROADCAST_TABLE_RULES = 
"CREATE SHARDING BROADCAST TABLE RULES(t_1,t_2)";
     
-    private static final String RDL_ALTER_SHARDING_TABLE_RULE = "ALTER 
SHARDING TABLE RULE t_order ("
+    private static final String ALTER_SHARDING_TABLE_RULE = "ALTER SHARDING 
TABLE RULE t_order ("
             + "RESOURCES(ms_group_0,ms_group_1),"
             + "SHARDING_COLUMN=order_id,"
             + "TYPE(NAME=hash_mod,PROPERTIES('sharding-count'=4)),"
             + 
"GENERATED_KEY(COLUMN=another_id,TYPE(NAME=snowflake,PROPERTIES(\"worker-id\"=123))))";
     
-    private static final String RDL_ALTER_SHARDING_BINDING_TABLE_RULES = 
"ALTER SHARDING BINDING TABLE RULES ("
+    private static final String ALTER_SHARDING_BINDING_TABLE_RULES = "ALTER 
SHARDING BINDING TABLE RULES ("
             + "(t_order,t_order_item), (t_1,t_2))";
     
-    private static final String RDL_ALTER_SHARDING_BROADCAST_TABLE_RULES = 
"ALTER SHARDING BROADCAST TABLE RULES(t_1,t_2)";
+    private static final String ALTER_SHARDING_BROADCAST_TABLE_RULES = "ALTER 
SHARDING BROADCAST TABLE RULES(t_1,t_2)";
     
-    private static final String RDL_DROP_SHARDING_TABLE_RULE = "DROP SHARDING 
TABLE RULE t_order,t_order_item";
+    private static final String DROP_SHARDING_TABLE_RULE = "DROP SHARDING 
TABLE RULE t_order,t_order_item";
     
-    private static final String RDL_DROP_SHARDING_BINDING_TABLE_RULES = "DROP 
SHARDING BINDING TABLE RULES";
+    private static final String DROP_SHARDING_BINDING_TABLE_RULES = "DROP 
SHARDING BINDING TABLE RULES";
     
-    private static final String RDL_DROP_SHARDING_BROADCAST_TABLE_RULES = 
"DROP SHARDING BROADCAST TABLE RULES";
+    private static final String DROP_SHARDING_BROADCAST_TABLE_RULES = "DROP 
SHARDING BROADCAST TABLE RULES";
     
-    private static final String RQL_SHOW_SHARDING_BINDING_TABLE_RULES = "SHOW 
SHARDING BINDING TABLE RULES FROM sharding_db";
+    private static final String SHOW_SHARDING_BINDING_TABLE_RULES = "SHOW 
SHARDING BINDING TABLE RULES FROM sharding_db";
     
-    private static final String RQL_SHOW_SHARDING_BROADCAST_TABLE_RULES = 
"SHOW SHARDING BROADCAST TABLE RULES FROM sharding_db";
+    private static final String SHOW_SHARDING_BROADCAST_TABLE_RULES = "SHOW 
SHARDING BROADCAST TABLE RULES FROM sharding_db";
     
-    private static final String RQL_SHOW_SHARDING_TABLE_RULES = "SHOW SHARDING 
TABLE RULES FROM schemaName";
+    private static final String SHOW_SHARDING_TABLE_RULES = "SHOW SHARDING 
TABLE RULES FROM schemaName";
     
-    private static final String RQL_SHOW_SHARDING_TABLE_RULE = "SHOW SHARDING 
TABLE RULE t_order";
+    private static final String SHOW_SHARDING_TABLE_RULE = "SHOW SHARDING 
TABLE RULE t_order";
     
-    private static final String RQL_SHOW_SHARDING_TABLE_RULE_FROM = "SHOW 
SHARDING TABLE RULE t_order FROM schemaName";
+    private static final String SHOW_SHARDING_TABLE_RULE_FROM = "SHOW SHARDING 
TABLE RULE t_order FROM schemaName";
     
     private final DistSQLStatementParserEngine engine = new 
DistSQLStatementParserEngine();
     
     @Test
     public void assertParseCreateShardingTableRule() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_CREATE_SHARDING_TABLE_RULE);
+        SQLStatement sqlStatement = engine.parse(CREATE_SHARDING_TABLE_RULE);
         assertTrue(sqlStatement instanceof CreateShardingTableRuleStatement);
         assertThat(((CreateShardingTableRuleStatement) 
sqlStatement).getRules().size(), is(1));
         TableRuleSegment tableRuleSegment = 
((CreateShardingTableRuleStatement) sqlStatement).getRules().iterator().next();
@@ -105,7 +105,7 @@ public final class ShardingRuleStatementParserEngineTest {
     
     @Test
     public void assertParseCreateShardingBindingTableRules() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_CREATE_SHARDING_BINDING_TABLE_RULES);
+        SQLStatement sqlStatement = 
engine.parse(CREATE_SHARDING_BINDING_TABLE_RULES);
         assertTrue(sqlStatement instanceof 
CreateShardingBindingTableRulesStatement);
         List<ShardingBindingTableRuleSegment> shardingBindingTableRuleSegments 
= new ArrayList<>(((CreateShardingBindingTableRulesStatement) 
sqlStatement).getRules());
         assertThat(shardingBindingTableRuleSegments.size(), is(2));
@@ -117,7 +117,7 @@ public final class ShardingRuleStatementParserEngineTest {
     
     @Test
     public void assertParseCreateShardingBroadcastTableRules() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_CREATE_SHARDING_BROADCAST_TABLE_RULES);
+        SQLStatement sqlStatement = 
engine.parse(CREATE_SHARDING_BROADCAST_TABLE_RULES);
         System.out.println(sqlStatement);
         assertTrue(sqlStatement instanceof 
CreateShardingBroadcastTableRulesStatement);
         assertThat(((CreateShardingBroadcastTableRulesStatement) 
sqlStatement).getTables(), is(Arrays.asList("t_1", "t_2")));
@@ -125,7 +125,7 @@ public final class ShardingRuleStatementParserEngineTest {
     
     @Test
     public void assertParseAlterShardingTableRule() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_ALTER_SHARDING_TABLE_RULE);
+        SQLStatement sqlStatement = engine.parse(ALTER_SHARDING_TABLE_RULE);
         assertTrue(sqlStatement instanceof AlterShardingTableRuleStatement);
         assertThat(((AlterShardingTableRuleStatement) 
sqlStatement).getRules().size(), is(1));
         TableRuleSegment tableRuleSegment = ((AlterShardingTableRuleStatement) 
sqlStatement).getRules().iterator().next();
@@ -141,7 +141,7 @@ public final class ShardingRuleStatementParserEngineTest {
     
     @Test
     public void assertParseAlterShardingBindingTableRules() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_ALTER_SHARDING_BINDING_TABLE_RULES);
+        SQLStatement sqlStatement = 
engine.parse(ALTER_SHARDING_BINDING_TABLE_RULES);
         assertTrue(sqlStatement instanceof 
AlterShardingBindingTableRulesStatement);
         List<ShardingBindingTableRuleSegment> shardingBindingTableRuleSegments 
= new ArrayList<>(((AlterShardingBindingTableRulesStatement) 
sqlStatement).getRules());
         assertThat(shardingBindingTableRuleSegments.size(), is(2));
@@ -153,14 +153,14 @@ public final class ShardingRuleStatementParserEngineTest {
 
     @Test
     public void assertParseAlterShardingBroadcastTableRules() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_ALTER_SHARDING_BROADCAST_TABLE_RULES);
+        SQLStatement sqlStatement = 
engine.parse(ALTER_SHARDING_BROADCAST_TABLE_RULES);
         assertTrue(sqlStatement instanceof 
AlterShardingBroadcastTableRulesStatement);
         assertThat(((AlterShardingBroadcastTableRulesStatement) 
sqlStatement).getTables(), is(Arrays.asList("t_1", "t_2")));
     }
     
     @Test
     public void assertParseDropShardingTableRule() {
-        SQLStatement sqlStatement = engine.parse(RDL_DROP_SHARDING_TABLE_RULE);
+        SQLStatement sqlStatement = engine.parse(DROP_SHARDING_TABLE_RULE);
         assertTrue(sqlStatement instanceof DropShardingTableRuleStatement);
         assertThat(((DropShardingTableRuleStatement) 
sqlStatement).getTableNames().stream().map(each -> 
each.getIdentifier().getValue()).collect(Collectors.toList()),
                 is(Arrays.asList("t_order", "t_order_item")));
@@ -168,33 +168,33 @@ public final class ShardingRuleStatementParserEngineTest {
     
     @Test
     public void assertParseDropShardingBindingTableRules() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_DROP_SHARDING_BINDING_TABLE_RULES);
+        SQLStatement sqlStatement = 
engine.parse(DROP_SHARDING_BINDING_TABLE_RULES);
         assertTrue(sqlStatement instanceof 
DropShardingBindingTableRulesStatement);
     }
     
     @Test
     public void assertParseDropShardingBroadcastTableRules() {
-        SQLStatement sqlStatement = 
engine.parse(RDL_DROP_SHARDING_BROADCAST_TABLE_RULES);
+        SQLStatement sqlStatement = 
engine.parse(DROP_SHARDING_BROADCAST_TABLE_RULES);
         assertTrue(sqlStatement instanceof 
DropShardingBroadcastTableRulesStatement);
     }
     
     @Test
     public void assertParseShowShardingTableRules() {
-        SQLStatement sqlStatement = 
engine.parse(RQL_SHOW_SHARDING_TABLE_RULES);
+        SQLStatement sqlStatement = engine.parse(SHOW_SHARDING_TABLE_RULES);
         assertTrue(sqlStatement instanceof ShowShardingTableRulesStatement);
         assertThat(((ShowShardingTableRulesStatement) 
sqlStatement).getSchema().get().getIdentifier().getValue(), is("schemaName"));
     }
     
     @Test
     public void assertParseShowShardingTableRule() {
-        SQLStatement sqlStatement = engine.parse(RQL_SHOW_SHARDING_TABLE_RULE);
+        SQLStatement sqlStatement = engine.parse(SHOW_SHARDING_TABLE_RULE);
         assertTrue(sqlStatement instanceof ShowShardingTableRulesStatement);
         assertThat(((ShowShardingTableRulesStatement) 
sqlStatement).getTableName(), is("t_order"));
     }
     
     @Test
     public void assertParseShowShardingTableRuleFrom() {
-        SQLStatement sqlStatement = 
engine.parse(RQL_SHOW_SHARDING_TABLE_RULE_FROM);
+        SQLStatement sqlStatement = 
engine.parse(SHOW_SHARDING_TABLE_RULE_FROM);
         assertTrue(sqlStatement instanceof ShowShardingTableRulesStatement);
         assertThat(((ShowShardingTableRulesStatement) 
sqlStatement).getTableName(), is("t_order"));
         assertThat(((ShowShardingTableRulesStatement) 
sqlStatement).getSchema().get().getIdentifier().getValue(), is("schemaName"));
@@ -202,14 +202,14 @@ public final class ShardingRuleStatementParserEngineTest {
     
     @Test
     public void assertParseShowShardingBindingTableRules() {
-        SQLStatement sqlStatement = 
engine.parse(RQL_SHOW_SHARDING_BINDING_TABLE_RULES);
+        SQLStatement sqlStatement = 
engine.parse(SHOW_SHARDING_BINDING_TABLE_RULES);
         assertTrue(sqlStatement instanceof 
ShowShardingBindingTableRulesStatement);
         assertThat(((ShowShardingBindingTableRulesStatement) 
sqlStatement).getSchema().get().getIdentifier().getValue(), is("sharding_db"));
     }
     
     @Test
     public void assertParseShowShardingBroadcastTableRules() {
-        SQLStatement sqlStatement = 
engine.parse(RQL_SHOW_SHARDING_BROADCAST_TABLE_RULES);
+        SQLStatement sqlStatement = 
engine.parse(SHOW_SHARDING_BROADCAST_TABLE_RULES);
         assertTrue(sqlStatement instanceof 
ShowShardingBroadcastTableRulesStatement);
         assertThat(((ShowShardingBroadcastTableRulesStatement) 
sqlStatement).getSchema().get().getIdentifier().getValue(), is("sharding_db"));
     }

Reply via email to