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 c356e16dc4b Update G4 file for Transaction and Traffic (#22651) c356e16dc4b is described below commit c356e16dc4b8ac3564abd439a5418e2d0f18900c Author: Zichao <57847965+qianyi951...@users.noreply.github.com> AuthorDate: Mon Dec 5 19:52:28 2022 +1300 Update G4 file for Transaction and Traffic (#22651) --- .../src/main/antlr4/imports/traffic/BaseRule.g4 | 6 +- .../src/main/antlr4/imports/traffic/Literals.g4 | 10 +-- .../main/antlr4/imports/traffic/RALStatement.g4 | 22 +++--- .../src/main/antlr4/imports/traffic/Symbol.g4 | 86 +++++++++++----------- .../main/antlr4/imports/transaction/Literals.g4 | 10 +-- .../antlr4/imports/transaction/RALStatement.g4 | 14 ++-- .../src/main/antlr4/imports/transaction/Symbol.g4 | 86 +++++++++++----------- 7 files changed, 117 insertions(+), 117 deletions(-) diff --git a/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/BaseRule.g4 b/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/BaseRule.g4 index 90547789404..784da21cccf 100644 --- a/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/BaseRule.g4 +++ b/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/BaseRule.g4 @@ -20,13 +20,13 @@ grammar BaseRule; import Symbol, Keyword, Literals; propertiesDefinition - : PROPERTIES LP properties? RP + : PROPERTIES LP_ properties? RP_ ; properties - : property (COMMA property)* + : property (COMMA_ property)* ; property - : key=STRING EQ value=STRING + : key=STRING_ EQ_ value=STRING_ ; diff --git a/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/Literals.g4 b/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/Literals.g4 index 586f6d635fa..04f0486240c 100644 --- a/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/Literals.g4 +++ b/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/Literals.g4 @@ -19,12 +19,12 @@ 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_) ; diff --git a/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/RALStatement.g4 b/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/RALStatement.g4 index 3ae3abafa33..14c406cac48 100644 --- a/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/RALStatement.g4 +++ b/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/RALStatement.g4 @@ -20,15 +20,15 @@ grammar RALStatement; import BaseRule; createTrafficRule - : CREATE TRAFFIC RULE trafficRuleDefinition (COMMA trafficRuleDefinition)* + : CREATE TRAFFIC RULE trafficRuleDefinition (COMMA_ trafficRuleDefinition)* ; alterTrafficRule - : ALTER TRAFFIC RULE trafficRuleDefinition (COMMA trafficRuleDefinition)* + : ALTER TRAFFIC RULE trafficRuleDefinition (COMMA_ trafficRuleDefinition)* ; dropTrafficRule - : DROP TRAFFIC RULE ifExists? ruleName (COMMA ruleName)* + : DROP TRAFFIC RULE ifExists? ruleName (COMMA_ ruleName)* ; showTrafficRules @@ -36,27 +36,27 @@ showTrafficRules ; trafficRuleDefinition - : ruleName LP (labelDefinition COMMA)? trafficAlgorithmDefinition (COMMA loadBalancerDefinition)? RP + : ruleName LP_ (labelDefinition COMMA_)? trafficAlgorithmDefinition (COMMA_ loadBalancerDefinition)? RP_ ; labelDefinition - : LABELS LP label (COMMA label)* RP + : LABELS LP_ label (COMMA_ label)* RP_ ; trafficAlgorithmDefinition - : TRAFFIC_ALGORITHM LP algorithmDefinition RP + : TRAFFIC_ALGORITHM LP_ algorithmDefinition RP_ ; algorithmDefinition - : TYPE LP NAME EQ algorithmTypeName (COMMA propertiesDefinition)? RP + : TYPE LP_ NAME EQ_ algorithmTypeName (COMMA_ propertiesDefinition)? RP_ ; loadBalancerDefinition - : LOAD_BALANCER LP algorithmDefinition RP + : LOAD_BALANCER LP_ algorithmDefinition RP_ ; algorithmTypeName - : buildInTrafficAlgorithmTypeName | buildInLoadBalancerTypeName | STRING + : buildInTrafficAlgorithmTypeName | buildInLoadBalancerTypeName | STRING_ ; buildInTrafficAlgorithmTypeName @@ -68,11 +68,11 @@ buildInLoadBalancerTypeName ; label - : IDENTIFIER + : IDENTIFIER_ ; ruleName - : IDENTIFIER + : IDENTIFIER_ ; ifExists diff --git a/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/Symbol.g4 b/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/Symbol.g4 index 3322b09bb3a..1da7901ec98 100644 --- a/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/Symbol.g4 +++ b/kernel/traffic/distsql/parser/src/main/antlr4/imports/traffic/Symbol.g4 @@ -17,46 +17,46 @@ 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: '_'; -DL: '$'; +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_: '_'; +DL_: '$'; diff --git a/kernel/transaction/distsql/parser/src/main/antlr4/imports/transaction/Literals.g4 b/kernel/transaction/distsql/parser/src/main/antlr4/imports/transaction/Literals.g4 index 586f6d635fa..04f0486240c 100644 --- a/kernel/transaction/distsql/parser/src/main/antlr4/imports/transaction/Literals.g4 +++ b/kernel/transaction/distsql/parser/src/main/antlr4/imports/transaction/Literals.g4 @@ -19,12 +19,12 @@ 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_) ; diff --git a/kernel/transaction/distsql/parser/src/main/antlr4/imports/transaction/RALStatement.g4 b/kernel/transaction/distsql/parser/src/main/antlr4/imports/transaction/RALStatement.g4 index c5b45f78dfe..bfc97b5a44a 100644 --- a/kernel/transaction/distsql/parser/src/main/antlr4/imports/transaction/RALStatement.g4 +++ b/kernel/transaction/distsql/parser/src/main/antlr4/imports/transaction/RALStatement.g4 @@ -28,15 +28,15 @@ alterTransactionRule ; transactionRuleDefinition - : LP DEFAULT EQ defaultType (COMMA providerDefinition)? + : LP_ DEFAULT EQ_ defaultType (COMMA_ providerDefinition)? ; providerDefinition - : TYPE LP NAME EQ providerName (COMMA propertiesDefinition)? RP + : TYPE LP_ NAME EQ_ providerName (COMMA_ propertiesDefinition)? RP_ ; defaultType - : STRING | buildInDefaultTransactionType + : STRING_ | buildInDefaultTransactionType ; buildInDefaultTransactionType @@ -44,7 +44,7 @@ buildInDefaultTransactionType ; providerName - : STRING | buildInProviderTypeName + : STRING_ | buildInProviderTypeName ; buildInProviderTypeName @@ -52,13 +52,13 @@ buildInProviderTypeName ; propertiesDefinition - : PROPERTIES LP properties? RP + : PROPERTIES LP_ properties? RP_ ; properties - : property (COMMA property)* + : property (COMMA_ property)* ; property - : key=STRING EQ value=STRING + : key=STRING_ EQ_ value=STRING_ ; diff --git a/kernel/transaction/distsql/parser/src/main/antlr4/imports/transaction/Symbol.g4 b/kernel/transaction/distsql/parser/src/main/antlr4/imports/transaction/Symbol.g4 index 3322b09bb3a..61031e590dd 100644 --- a/kernel/transaction/distsql/parser/src/main/antlr4/imports/transaction/Symbol.g4 +++ b/kernel/transaction/distsql/parser/src/main/antlr4/imports/transaction/Symbol.g4 @@ -17,46 +17,46 @@ 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: '_'; -DL: '$'; +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_: '_'; +DL_: '$';