You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/04/23 14:42:19 UTC
[shardingsphere] branch master updated: Refactor CREATE SHARDING
BINDING TABLE RULES (#10161)
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 ba6341b Refactor CREATE SHARDING BINDING TABLE RULES (#10161)
ba6341b is described below
commit ba6341be2bed8de518bba132d866f3a031d33f07
Author: Haoran Meng <me...@gmail.com>
AuthorDate: Fri Apr 23 22:41:57 2021 +0800
Refactor CREATE SHARDING BINDING TABLE RULES (#10161)
---
.../src/main/antlr4/imports/RDLStatement.g4 | 2 +-
.../org/apache/shardingsphere/distsql/parser/core/DistSQLVisitor.java | 1 -
.../distsql/parser/api/DistSQLStatementParserEngineTest.java | 4 +---
.../distsql/parser/segment/rdl/ShardingBindingTableRuleSegment.java | 2 --
.../rdl/impl/CreateShardingBindingTableRulesBackendHandlerTest.java | 2 --
5 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/RDLStatement.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/RDLStatement.g4
index 820c1b3..944ce49 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/RDLStatement.g4
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/RDLStatement.g4
@@ -68,7 +68,7 @@ createShardingBindingTableRules
;
bindTableRulesDefinition
- : ruleName LP tableName (COMMA tableName)* RP
+ : LP tableName (COMMA tableName)* RP
;
createShardingBroadcastTableRules
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLVisitor.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLVisitor.java
index 81dfb1d..ac64ce1 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLVisitor.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLVisitor.java
@@ -125,7 +125,6 @@ public final class DistSQLVisitor extends DistSQLStatementBaseVisitor<ASTNode> {
CreateShardingBindingTableRulesStatement result = new CreateShardingBindingTableRulesStatement();
for (BindTableRulesDefinitionContext each : ctx.bindTableRulesDefinition()) {
ShardingBindingTableRuleSegment segment = new ShardingBindingTableRuleSegment();
- segment.setRuleName(each.ruleName().getText());
segment.setTables(Joiner.on(",")
.join(each.tableName().stream().map(t -> new IdentifierValue(t.getText()).getValue()).collect(Collectors.toList())));
result.getRules().add(segment);
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 a061498..e2f1389 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
@@ -54,7 +54,7 @@ public final class DistSQLStatementParserEngineTest {
+ "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 ("
- + "binding_rule_1(t_order,t_order_item)," + "binding_rule_2(t_1,t_2))";
+ + "(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)";
@@ -140,10 +140,8 @@ public final class DistSQLStatementParserEngineTest {
List<ShardingBindingTableRuleSegment> shardingBindingTableRuleSegments = new ArrayList<>(((CreateShardingBindingTableRulesStatement) sqlStatement).getRules());
assertThat(shardingBindingTableRuleSegments.size(), is(2));
ShardingBindingTableRuleSegment segment = shardingBindingTableRuleSegments.get(0);
- assertThat(segment.getRuleName(), is("binding_rule_1"));
assertThat(segment.getTables(), is("t_order,t_order_item"));
segment = shardingBindingTableRuleSegments.get(1);
- assertThat(segment.getRuleName(), is("binding_rule_2"));
assertThat(segment.getTables(), is("t_1,t_2"));
}
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/rdl/ShardingBindingTableRuleSegment.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/rdl/ShardingBindingTableRuleSegment.java
index bb5a970..d7cf83b 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/rdl/ShardingBindingTableRuleSegment.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/rdl/ShardingBindingTableRuleSegment.java
@@ -28,7 +28,5 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
@Setter
public final class ShardingBindingTableRuleSegment implements ASTNode {
- private String ruleName;
-
private String tables;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBindingTableRulesBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBindingTableRulesBackendHandlerTest.java
index 2a22a02..e132e98 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBindingTableRulesBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBindingTableRulesBackendHandlerTest.java
@@ -101,11 +101,9 @@ public final class CreateShardingBindingTableRulesBackendHandlerTest {
private CreateShardingBindingTableRulesStatement buildShardingTableRuleStatement() {
CreateShardingBindingTableRulesStatement result = new CreateShardingBindingTableRulesStatement();
ShardingBindingTableRuleSegment segment = new ShardingBindingTableRuleSegment();
- segment.setRuleName("binding_rule_1");
segment.setTables("t_order,t_order_item");
result.getRules().add(segment);
ShardingBindingTableRuleSegment segmentAnother = new ShardingBindingTableRuleSegment();
- segmentAnother.setRuleName("binding_rule_2");
segmentAnother.setTables("t_1,t_2");
result.getRules().add(segmentAnother);
return result;