You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by xi...@apache.org on 2020/08/19 10:53:32 UTC
[shardingsphere] branch master updated: Add create ShardingRule SQL
definition and Refactor create DataSource SQL definition
This is an automated email from the ASF dual-hosted git repository.
xiaoyu 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 c2f413f Add create ShardingRule SQL definition and Refactor create DataSource SQL definition
new bfb1486 Merge pull request #6940 from tristaZero/new1
c2f413f is described below
commit c2f413fb59e53cf8d13d2936a313bb1b373ddbf0
Author: tristaZero <ha...@163.com>
AuthorDate: Wed Aug 19 18:39:19 2020 +0800
Add create ShardingRule SQL definition and Refactor create DataSource SQL definition
---
.../src/main/antlr4/imports/Keyword.g4 | 8 ++++----
.../src/main/antlr4/imports/RDLStatement.g4 | 10 +++++-----
.../rdl/parser/autogen/ShardingSphereStatement.g4 | 4 ++--
.../rdl/parser/sql/visitor/ShardingSphereVisitor.java | 8 ++++----
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/Keyword.g4 b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/Keyword.g4
index 0aa7ccd..a97d90e 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/Keyword.g4
+++ b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/Keyword.g4
@@ -27,10 +27,10 @@ CREATE
: C R E A T E
;
-DATASOURCE
- : D A T A S O U R C E
+DATASOURCES
+ : D A T A S O U R C E S
;
-SHARDINGRULE
- : S H A R D I N G R U L E
+SHARDINGRULES
+ : S H A R D I N G R U L E S
;
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/RDLStatement.g4 b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/RDLStatement.g4
index 12c6f14..55b73d5 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/RDLStatement.g4
+++ b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/RDLStatement.g4
@@ -19,12 +19,12 @@ grammar RDLStatement;
import Keyword, Literals, Symbol;
-createDatasource
- : CREATE DATASOURCE dataSource (COMMA dataSource)*
+createDataSources
+ : CREATE DATASOURCES LP dataSource (COMMA dataSource)* RP
;
-createShardingRule
- : CREATE SHARDINGRULE tableRule (COMMA tableRule)*
+createShardingRules
+ : CREATE SHARDINGRULES LP tableRule (COMMA tableRule)* RP
;
tableRule
@@ -36,7 +36,7 @@ dataSource
;
dataSourceDefinition
- : hostName COLON port COLON dbName COLON user COLON password
+ : hostName COLON port COLON dbName (COLON user (COLON password)?)?
;
tableRuleDefinition
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/org/apache/shardingsphere/rdl/parser/autogen/ShardingSphereStatement.g4 b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/org/apache/shardingsphere/rdl/parser/autogen/ShardingSphereStatement.g4
index c5f2604..54e202b 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/org/apache/shardingsphere/rdl/parser/autogen/ShardingSphereStatement.g4
+++ b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/org/apache/shardingsphere/rdl/parser/autogen/ShardingSphereStatement.g4
@@ -20,7 +20,7 @@ grammar ShardingSphereStatement;
import Symbol, RDLStatement;
execute
- : (createDatasource
- | createShardingRule
+ : (createDataSources
+ | createShardingRules
) SEMI?
;
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/java/org/apache/shardingsphere/rdl/parser/sql/visitor/ShardingSphereVisitor.java b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/java/org/apache/shardingsphere/rdl/parser/sql/visitor/ShardingSphereVisitor.java
index dcf551e..0f632a9 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/java/org/apache/shardingsphere/rdl/parser/sql/visitor/ShardingSphereVisitor.java
+++ b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/java/org/apache/shardingsphere/rdl/parser/sql/visitor/ShardingSphereVisitor.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.rdl.parser.sql.visitor;
import lombok.AccessLevel;
import lombok.Getter;
import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementBaseVisitor;
-import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementParser.CreateDatasourceContext;
-import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementParser.CreateShardingRuleContext;
+import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementParser.CreateShardingRulesContext;
+import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementParser.CreateDataSourcesContext;
import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementParser.DataSourceContext;
import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementParser.DataSourceDefinitionContext;
import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementParser.StrategyPropContext;
@@ -44,7 +44,7 @@ import java.util.LinkedList;
public final class ShardingSphereVisitor extends ShardingSphereStatementBaseVisitor<ASTNode> {
@Override
- public ASTNode visitCreateDatasource(final CreateDatasourceContext ctx) {
+ public ASTNode visitCreateDataSources(final CreateDataSourcesContext ctx) {
Collection<DataSourceConnectionSegment> connectionInfos = new LinkedList<>();
for (DataSourceContext each : ctx.dataSource()) {
connectionInfos.add((DataSourceConnectionSegment) visit(each));
@@ -71,7 +71,7 @@ public final class ShardingSphereVisitor extends ShardingSphereStatementBaseVisi
}
@Override
- public ASTNode visitCreateShardingRule(final CreateShardingRuleContext ctx) {
+ public ASTNode visitCreateShardingRules(final CreateShardingRulesContext ctx) {
Collection<TableRuleSegment> tables = new LinkedList<>();
for (TableRuleContext each : ctx.tableRule()) {
tables.add((TableRuleSegment) visit(each));