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 2caa0135a6b Update G4 file for Readwrite-splitting (#22643) 2caa0135a6b is described below commit 2caa0135a6b0434f7e69677912f9d4ba6d8f765b Author: Zichao <57847965+qianyi951...@users.noreply.github.com> AuthorDate: Mon Dec 5 19:42:25 2022 +1300 Update G4 file for Readwrite-splitting (#22643) --- .../antlr4/imports/readwrite-splitting/BaseRule.g4 | 20 +++--- .../antlr4/imports/readwrite-splitting/Literals.g4 | 26 +++---- .../imports/readwrite-splitting/RALStatement.g4 | 4 +- .../imports/readwrite-splitting/RDLStatement.g4 | 16 ++--- .../antlr4/imports/readwrite-splitting/Symbol.g4 | 84 +++++++++++----------- 5 files changed, 75 insertions(+), 75 deletions(-) diff --git a/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/BaseRule.g4 b/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/BaseRule.g4 index 7a20e7b95a8..f6463f333fd 100644 --- a/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/BaseRule.g4 +++ b/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/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 | buildInAlgorithmTypeName + : STRING_ | buildInAlgorithmTypeName ; buildInAlgorithmTypeName @@ -45,29 +45,29 @@ buildInAlgorithmTypeName ; 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 ; databaseName - : IDENTIFIER + : IDENTIFIER_ ; resourceName - : IDENTIFIER + : IDENTIFIER_ ; groupName - : IDENTIFIER + : IDENTIFIER_ ; storageUnitName - : IDENTIFIER + : IDENTIFIER_ ; diff --git a/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/Literals.g4 b/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/Literals.g4 index cb5dec4e1ce..1d13bcc2332 100644 --- a/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/Literals.g4 +++ b/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/Literals.g4 @@ -19,32 +19,32 @@ 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]+ ; -HEX +HEX_ : [0-9a-fA-F] ; -NUMBER - : INT? DOT? INT (E (PLUS | MINUS)? INT)? +NUMBER_ + : INT_? DOT_? INT_ (E (PLUS_ | MINUS_)? INT_)? ; -HEXDIGIT - : '0x' HEX+ | 'X' SQ HEX+ SQ +HEXDIGIT_ + : '0x' HEX_+ | 'X' SQ_ HEX_+ SQ_ ; -BITNUM - : '0b' ('0' | '1')+ | B SQ ('0' | '1')+ SQ +BITNUM_ + : '0b' ('0' | '1')+ | B SQ_ ('0' | '1')+ SQ_ ; diff --git a/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/RALStatement.g4 b/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/RALStatement.g4 index 2672c34c648..b284df09b66 100644 --- a/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/RALStatement.g4 +++ b/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/RALStatement.g4 @@ -20,7 +20,7 @@ grammar RALStatement; import BaseRule; setReadwriteSplittingHintSource - : SET READWRITE_SPLITTING HINT SOURCE EQ sourceValue + : SET READWRITE_SPLITTING HINT SOURCE EQ_ sourceValue ; showReadwriteSplittingHintStatus @@ -40,5 +40,5 @@ showStatusFromReadwriteSplittingRules ; sourceValue - : IDENTIFIER + : IDENTIFIER_ ; diff --git a/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/RDLStatement.g4 b/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/RDLStatement.g4 index 049838931ab..a3c2f4ad6bc 100644 --- a/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/RDLStatement.g4 +++ b/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/RDLStatement.g4 @@ -20,31 +20,31 @@ grammar RDLStatement; import BaseRule; createReadwriteSplittingRule - : CREATE READWRITE_SPLITTING RULE readwriteSplittingRuleDefinition (COMMA readwriteSplittingRuleDefinition)* + : CREATE READWRITE_SPLITTING RULE readwriteSplittingRuleDefinition (COMMA_ readwriteSplittingRuleDefinition)* ; alterReadwriteSplittingRule - : ALTER READWRITE_SPLITTING RULE readwriteSplittingRuleDefinition (COMMA readwriteSplittingRuleDefinition)* + : ALTER READWRITE_SPLITTING RULE readwriteSplittingRuleDefinition (COMMA_ readwriteSplittingRuleDefinition)* ; dropReadwriteSplittingRule - : DROP READWRITE_SPLITTING RULE ifExists? ruleName (COMMA ruleName)* + : DROP READWRITE_SPLITTING RULE ifExists? ruleName (COMMA_ ruleName)* ; readwriteSplittingRuleDefinition - : ruleName LP (staticReadwriteSplittingRuleDefinition | dynamicReadwriteSplittingRuleDefinition) (COMMA algorithmDefinition)? RP + : ruleName LP_ (staticReadwriteSplittingRuleDefinition | dynamicReadwriteSplittingRuleDefinition) (COMMA_ algorithmDefinition)? RP_ ; staticReadwriteSplittingRuleDefinition - : WRITE_STORAGE_UNIT EQ writeStorageUnitName COMMA READ_STORAGE_UNITS LP readStorageUnitsNames RP + : WRITE_STORAGE_UNIT EQ_ writeStorageUnitName COMMA_ READ_STORAGE_UNITS LP_ readStorageUnitsNames RP_ ; dynamicReadwriteSplittingRuleDefinition - : AUTO_AWARE_RESOURCE EQ resourceName (COMMA WRITE_DATA_SOURCE_QUERY_ENABLED EQ writeDataSourceQueryEnabled)? + : AUTO_AWARE_RESOURCE EQ_ resourceName (COMMA_ WRITE_DATA_SOURCE_QUERY_ENABLED EQ_ writeDataSourceQueryEnabled)? ; ruleName - : IDENTIFIER + : IDENTIFIER_ ; writeStorageUnitName @@ -52,7 +52,7 @@ writeStorageUnitName ; readStorageUnitsNames - : storageUnitName (COMMA storageUnitName)* + : storageUnitName (COMMA_ storageUnitName)* ; ifExists diff --git a/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/Symbol.g4 b/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/Symbol.g4 index a332bdd1df7..90dba68ccfc 100644 --- a/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/Symbol.g4 +++ b/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/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_: '_';