You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/12/04 07:59:05 UTC
[shardingsphere] branch master updated: Update G4 file for Sharding (#22639)
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 6bff18abb50 Update G4 file for Sharding (#22639)
6bff18abb50 is described below
commit 6bff18abb50bc174b7c068464365a661010ffccb
Author: Zichao <57...@users.noreply.github.com>
AuthorDate: Sun Dec 4 20:58:59 2022 +1300
Update G4 file for Sharding (#22639)
---
.../src/main/antlr4/imports/sharding/BaseRule.g4 | 22 +++---
.../src/main/antlr4/imports/sharding/Keyword.g4 | 4 ++
.../src/main/antlr4/imports/sharding/Literals.g4 | 12 ++--
.../main/antlr4/imports/sharding/RALStatement.g4 | 8 +--
.../main/antlr4/imports/sharding/RDLStatement.g4 | 70 +++++++++---------
.../main/antlr4/imports/sharding/RQLStatement.g4 | 2 +-
.../src/main/antlr4/imports/sharding/Symbol.g4 | 84 +++++++++++-----------
7 files changed, 103 insertions(+), 99 deletions(-)
diff --git a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/BaseRule.g4 b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/BaseRule.g4
index ecb82e66bac..302f01ec896 100644
--- a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/BaseRule.g4
+++ b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/BaseRule.g4
@@ -20,15 +20,15 @@ grammar BaseRule;
import Symbol, Keyword, Literals;
literal
- : STRING | (MINUS)? INT | TRUE | FALSE
+ : STRING_ | (MINUS_)? INT_ | TRUE | FALSE
;
algorithmDefinition
- : TYPE LP NAME EQ algorithmTypeName (COMMA propertiesDefinition)? RP
+ : TYPE LP_ NAME EQ_ algorithmTypeName (COMMA_ propertiesDefinition)? RP_
;
algorithmTypeName
- : STRING | buildInShardingAlgorithmType | buildInkeyGeneratorType | buildInAuditAlgorithmType
+ : STRING_ | buildInShardingAlgorithmType | buildInkeyGeneratorType | buildInAuditAlgorithmType
;
buildInShardingAlgorithmType
@@ -51,27 +51,27 @@ buildInAuditAlgorithmType
;
propertiesDefinition
- : PROPERTIES LP properties? RP
+ : PROPERTIES LP_ properties? RP_
;
properties
- : property (COMMA property)*
+ : property (COMMA_ property)*
;
property
- : key=STRING EQ value=literal
+ : key=STRING_ EQ_ value=literal
;
tableName
- : IDENTIFIER
+ : IDENTIFIER_
;
shardingAlgorithmName
- : IDENTIFIER
+ : IDENTIFIER_
;
keyGeneratorName
- : IDENTIFIER
+ : IDENTIFIER_
;
buildInkeyGeneratorType
@@ -83,9 +83,9 @@ buildInkeyGeneratorType
;
auditorName
- : IDENTIFIER
+ : IDENTIFIER_
;
ruleName
- : IDENTIFIER
+ : IDENTIFIER_
;
diff --git a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Keyword.g4 b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Keyword.g4
index f2205bc20f0..b836015c101 100644
--- a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Keyword.g4
+++ b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Keyword.g4
@@ -239,6 +239,10 @@ FALSE
: F A L S E
;
+MOD
+ : M O D
+ ;
+
COSID_MOD
: C O S I D UL_ M O D
;
diff --git a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Literals.g4 b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Literals.g4
index d8f6d07f77c..68f6a1b07ed 100644
--- a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Literals.g4
+++ b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Literals.g4
@@ -19,16 +19,16 @@ lexer grammar Literals;
import Alphabet, Symbol;
-IDENTIFIER
+IDENTIFIER_
: [A-Za-z_$0-9]*?[A-Za-z_$]+?[A-Za-z_$0-9]*
- | BQ ~'`'+ BQ
+ | BQ_ ~'`'+ BQ_
;
-STRING
- : (DQ ('\\'. | '""' | ~('"' | '\\'))* DQ)
- | (SQ ('\\'. | '\'\'' | ~('\'' | '\\'))* SQ)
+STRING_
+ : (DQ_ ('\\'. | '""' | ~('"' | '\\'))* DQ_)
+ | (SQ_ ('\\'. | '\'\'' | ~('\'' | '\\'))* SQ_)
;
-INT
+INT_
: [0-9]+
;
diff --git a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/RALStatement.g4 b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/RALStatement.g4
index ba086187c79..1e08eb3a46b 100644
--- a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/RALStatement.g4
+++ b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/RALStatement.g4
@@ -20,15 +20,15 @@ grammar RALStatement;
import BaseRule;
setShardingHintDatabaseValue
- : SET SHARDING HINT DATABASE_VALUE EQ shardingValue
+ : SET SHARDING HINT DATABASE_VALUE EQ_ shardingValue
;
addShardingHintDatabaseValue
- : ADD SHARDING HINT DATABASE_VALUE tableName EQ shardingValue
+ : ADD SHARDING HINT DATABASE_VALUE tableName EQ_ shardingValue
;
addShardingHintTableValue
- : ADD SHARDING HINT TABLE_VALUE tableName EQ shardingValue
+ : ADD SHARDING HINT TABLE_VALUE tableName EQ_ shardingValue
;
showShardingHintStatus
@@ -40,5 +40,5 @@ clearShardingHint
;
shardingValue
- : INT | STRING
+ : INT_ | STRING_
;
diff --git a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/RDLStatement.g4 b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/RDLStatement.g4
index 6b757f5b8e8..cb6c4bead3e 100644
--- a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/RDLStatement.g4
+++ b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/RDLStatement.g4
@@ -20,47 +20,47 @@ grammar RDLStatement;
import BaseRule;
createShardingTableRule
- : CREATE SHARDING TABLE RULE shardingTableRuleDefinition (COMMA shardingTableRuleDefinition)*
+ : CREATE SHARDING TABLE RULE shardingTableRuleDefinition (COMMA_ shardingTableRuleDefinition)*
;
alterShardingTableRule
- : ALTER SHARDING TABLE RULE shardingTableRuleDefinition (COMMA shardingTableRuleDefinition)*
+ : ALTER SHARDING TABLE RULE shardingTableRuleDefinition (COMMA_ shardingTableRuleDefinition)*
;
dropShardingTableRule
- : DROP SHARDING TABLE RULE ifExists? tableName (COMMA tableName)*
+ : DROP SHARDING TABLE RULE ifExists? tableName (COMMA_ tableName)*
;
createShardingTableReferenceRule
- : CREATE SHARDING TABLE REFERENCE RULE tableReferenceRuleDefinition (COMMA tableReferenceRuleDefinition)*
+ : CREATE SHARDING TABLE REFERENCE RULE tableReferenceRuleDefinition (COMMA_ tableReferenceRuleDefinition)*
;
alterShardingTableReferenceRule
- : ALTER SHARDING TABLE REFERENCE RULE tableReferenceRuleDefinition (COMMA tableReferenceRuleDefinition)*
+ : ALTER SHARDING TABLE REFERENCE RULE tableReferenceRuleDefinition (COMMA_ tableReferenceRuleDefinition)*
;
dropShardingTableReferenceRule
- : DROP SHARDING TABLE REFERENCE RULE ifExists? ruleName (COMMA ruleName)*
+ : DROP SHARDING TABLE REFERENCE RULE ifExists? ruleName (COMMA_ ruleName)*
;
createBroadcastTableRule
- : CREATE BROADCAST TABLE RULE tableName (COMMA tableName)*
+ : CREATE BROADCAST TABLE RULE tableName (COMMA_ tableName)*
;
dropBroadcastTableRule
- : DROP BROADCAST TABLE RULE ifExists? tableName (COMMA tableName)*
+ : DROP BROADCAST TABLE RULE ifExists? tableName (COMMA_ tableName)*
;
dropShardingAlgorithm
- : DROP SHARDING ALGORITHM ifExists? shardingAlgorithmName (COMMA shardingAlgorithmName)*
+ : DROP SHARDING ALGORITHM ifExists? shardingAlgorithmName (COMMA_ shardingAlgorithmName)*
;
createDefaultShardingStrategy
- : CREATE DEFAULT SHARDING type=(DATABASE | TABLE) STRATEGY LP shardingStrategy RP
+ : CREATE DEFAULT SHARDING type=(DATABASE | TABLE) STRATEGY LP_ shardingStrategy RP_
;
alterDefaultShardingStrategy
- : ALTER DEFAULT SHARDING type=(DATABASE | TABLE) STRATEGY LP shardingStrategy RP
+ : ALTER DEFAULT SHARDING type=(DATABASE | TABLE) STRATEGY LP_ shardingStrategy RP_
;
dropDefaultShardingStrategy
@@ -68,11 +68,11 @@ dropDefaultShardingStrategy
;
dropShardingKeyGenerator
- : DROP SHARDING KEY GENERATOR ifExists? keyGeneratorName (COMMA keyGeneratorName)*
+ : DROP SHARDING KEY GENERATOR ifExists? keyGeneratorName (COMMA_ keyGeneratorName)*
;
dropShardingAuditor
- : DROP SHARDING AUDITOR ifExists? auditorName (COMMA auditorName)*
+ : DROP SHARDING AUDITOR ifExists? auditorName (COMMA_ auditorName)*
;
shardingTableRuleDefinition
@@ -80,39 +80,39 @@ shardingTableRuleDefinition
;
shardingAutoTableRule
- : tableName LP storageUnits COMMA autoShardingColumnDefinition COMMA algorithmDefinition (COMMA keyGenerateDefinition)? (COMMA auditDefinition)? RP
+ : tableName LP_ storageUnits COMMA_ autoShardingColumnDefinition COMMA_ algorithmDefinition (COMMA_ keyGenerateDefinition)? (COMMA_ auditDefinition)? RP_
;
shardingTableRule
- : tableName LP dataNodes (COMMA databaseStrategy)? (COMMA tableStrategy)? (COMMA keyGenerateDefinition)? (COMMA auditDefinition)? RP
+ : tableName LP_ dataNodes (COMMA_ databaseStrategy)? (COMMA_ tableStrategy)? (COMMA_ keyGenerateDefinition)? (COMMA_ auditDefinition)? RP_
;
keyGeneratorName
- : IDENTIFIER
+ : IDENTIFIER_
;
auditorDefinition
- : auditorName LP algorithmDefinition RP
+ : auditorName LP_ algorithmDefinition RP_
;
auditorName
- : IDENTIFIER
+ : IDENTIFIER_
;
storageUnits
- : STORAGE_UNITS LP storageUnit (COMMA storageUnit)* RP
+ : STORAGE_UNITS LP_ storageUnit (COMMA_ storageUnit)* RP_
;
storageUnit
- : IDENTIFIER | STRING
+ : IDENTIFIER_ | STRING_
;
dataNodes
- : DATANODES LP dataNode (COMMA dataNode)* RP
+ : DATANODES LP_ dataNode (COMMA_ dataNode)* RP_
;
dataNode
- : STRING
+ : STRING_
;
autoShardingColumnDefinition
@@ -124,43 +124,43 @@ shardingColumnDefinition
;
shardingColumn
- : SHARDING_COLUMN EQ columnName
+ : SHARDING_COLUMN EQ_ columnName
;
shardingColumns
- : SHARDING_COLUMNS EQ columnName COMMA columnName (COMMA columnName)*
+ : SHARDING_COLUMNS EQ_ columnName COMMA_ columnName (COMMA_ columnName)*
;
shardingAlgorithm
- : SHARDING_ALGORITHM LP algorithmDefinition RP
+ : SHARDING_ALGORITHM LP_ algorithmDefinition RP_
;
shardingStrategy
- : TYPE EQ strategyType COMMA shardingColumnDefinition COMMA shardingAlgorithm
+ : TYPE EQ_ strategyType COMMA_ shardingColumnDefinition COMMA_ shardingAlgorithm
;
databaseStrategy
- : DATABASE_STRATEGY LP shardingStrategy RP
+ : DATABASE_STRATEGY LP_ shardingStrategy RP_
;
tableStrategy
- : TABLE_STRATEGY LP shardingStrategy RP
+ : TABLE_STRATEGY LP_ shardingStrategy RP_
;
keyGenerateDefinition
- : KEY_GENERATE_STRATEGY LP COLUMN EQ columnName COMMA algorithmDefinition RP
+ : KEY_GENERATE_STRATEGY LP_ COLUMN EQ_ columnName COMMA_ algorithmDefinition RP_
;
auditDefinition
- : AUDIT_STRATEGY LP multiAuditDefinition COMMA ALLOW_HINT_DISABLE EQ auditAllowHintDisable RP
+ : AUDIT_STRATEGY LP_ multiAuditDefinition COMMA_ ALLOW_HINT_DISABLE EQ_ auditAllowHintDisable RP_
;
multiAuditDefinition
- : singleAuditDefinition (COMMA singleAuditDefinition)*
+ : singleAuditDefinition (COMMA_ singleAuditDefinition)*
;
singleAuditDefinition
- : LP algorithmDefinition RP
+ : LP_ algorithmDefinition RP_
;
auditAllowHintDisable
@@ -168,15 +168,15 @@ auditAllowHintDisable
;
columnName
- : IDENTIFIER
+ : IDENTIFIER_
;
tableReferenceRuleDefinition
- : ruleName LP tableName (COMMA tableName)* RP
+ : ruleName LP_ tableName (COMMA_ tableName)* RP_
;
strategyType
- : STRING | buildInStrategyType
+ : STRING_ | buildInStrategyType
;
buildInStrategyType
diff --git a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/RQLStatement.g4 b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/RQLStatement.g4
index ac90589c73e..d2923c72775 100644
--- a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/RQLStatement.g4
+++ b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/RQLStatement.g4
@@ -84,5 +84,5 @@ tableRule
;
databaseName
- : IDENTIFIER
+ : IDENTIFIER_
;
diff --git a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Symbol.g4 b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Symbol.g4
index a332bdd1df7..90dba68ccfc 100644
--- a/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Symbol.g4
+++ b/features/sharding/distsql/parser/src/main/antlr4/imports/sharding/Symbol.g4
@@ -17,45 +17,45 @@
lexer grammar Symbol;
-AND: '&&';
-OR: '||';
-NOT: '!';
-TILDE: '~';
-VERTICALBAR: '|';
-AMPERSAND: '&';
-SIGNEDLEFTSHIFT: '<<';
-SIGNEDRIGHTSHIFT: '>>';
-CARET: '^';
-MOD: '%';
-COLON: ':';
-PLUS: '+';
-MINUS: '-';
-ASTERISK: '*';
-SLASH: '/';
-BACKSLASH: '\\';
-DOT: '.';
-DOTASTERISK: '.*';
-SAFEEQ: '<=>';
-DEQ: '==';
-EQ: '=';
-NEQ: '<>' | '!=';
-GT: '>';
-GTE: '>=';
-LT: '<';
-LTE: '<=';
-POUND: '#';
-LP: '(';
-RP: ')';
-LBE: '{';
-RBE: '}';
-LBT: '[';
-RBT: ']';
-COMMA: ',';
-DQ: '"';
-SQ : '\'';
-BQ: '`';
-QUESTION: '?';
-AT: '@';
-SEMI: ';';
-JSONSEPARATOR: '->>';
-UL: '_';
+AND_: '&&';
+OR_: '||';
+NOT_: '!';
+TILDE_: '~';
+VERTICALBAR_: '|';
+AMPERSAND_: '&';
+SIGNEDLEFTSHIFT_: '<<';
+SIGNEDRIGHTSHIFT_: '>>';
+CARET_: '^';
+MOD_: '%';
+COLON_: ':';
+PLUS_: '+';
+MINUS_: '-';
+ASTERISK_: '*';
+SLASH_: '/';
+BACKSLASH_: '\\';
+DOT_: '.';
+DOTASTERISK_: '.*';
+SAFEEQ_: '<=>';
+DEQ_: '==';
+EQ_: '=';
+NEQ_: '<>' | '!=';
+GT_: '>';
+GTE_: '>=';
+LT_: '<';
+LTE_: '<=';
+POUND_: '#';
+LP_: '(';
+RP_: ')';
+LBE_: '{';
+RBE_: '}';
+LBT_: '[';
+RBT_: ']';
+COMMA_: ',';
+DQ_: '"';
+SQ_: '\'';
+BQ_: '`';
+QUESTION_: '?';
+AT_: '@';
+SEMI_: ';';
+JSONSEPARATOR_: '->>';
+UL_: '_';