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/05 09:42:41 UTC
[shardingsphere] branch master updated: Update G4 file for Authority and Storage unit (#22657)
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 88765e297be Update G4 file for Authority and Storage unit (#22657)
88765e297be is described below
commit 88765e297be863a40ee711012ec150998684b7e8
Author: Zichao <57...@users.noreply.github.com>
AuthorDate: Mon Dec 5 22:42:35 2022 +1300
Update G4 file for Authority and Storage unit (#22657)
---
distsql/parser/src/main/antlr4/imports/BaseRule.g4 | 22 +++---
distsql/parser/src/main/antlr4/imports/Literals.g4 | 12 +--
.../parser/src/main/antlr4/imports/RALStatement.g4 | 42 +++++------
.../parser/src/main/antlr4/imports/RDLStatement.g4 | 26 +++----
.../parser/src/main/antlr4/imports/RQLStatement.g4 | 4 +-
distsql/parser/src/main/antlr4/imports/Symbol.g4 | 86 +++++++++++-----------
.../src/main/antlr4/imports/authority/Symbol.g4 | 86 +++++++++++-----------
7 files changed, 139 insertions(+), 139 deletions(-)
diff --git a/distsql/parser/src/main/antlr4/imports/BaseRule.g4 b/distsql/parser/src/main/antlr4/imports/BaseRule.g4
index 21c65abbf09..95f6357780b 100644
--- a/distsql/parser/src/main/antlr4/imports/BaseRule.g4
+++ b/distsql/parser/src/main/antlr4/imports/BaseRule.g4
@@ -20,45 +20,45 @@ 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
+ : STRING_
;
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_
;
schemaName
- : IDENTIFIER
+ : IDENTIFIER_
;
tableName
- : IDENTIFIER
+ : IDENTIFIER_
;
resourceName
- : IDENTIFIER
+ : IDENTIFIER_
;
storageUnitName
- : IDENTIFIER
+ : IDENTIFIER_
;
diff --git a/distsql/parser/src/main/antlr4/imports/Literals.g4 b/distsql/parser/src/main/antlr4/imports/Literals.g4
index d8f6d07f77c..68f6a1b07ed 100644
--- a/distsql/parser/src/main/antlr4/imports/Literals.g4
+++ b/distsql/parser/src/main/antlr4/imports/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/distsql/parser/src/main/antlr4/imports/RALStatement.g4 b/distsql/parser/src/main/antlr4/imports/RALStatement.g4
index 7356ca7c036..60ce52e0dd7 100644
--- a/distsql/parser/src/main/antlr4/imports/RALStatement.g4
+++ b/distsql/parser/src/main/antlr4/imports/RALStatement.g4
@@ -20,11 +20,11 @@ grammar RALStatement;
import BaseRule;
setDistVariable
- : SET DIST VARIABLE variableName EQ variableValue
+ : SET DIST VARIABLE variableName EQ_ variableValue
;
showDistVariable
- : SHOW DIST VARIABLE WHERE NAME EQ variableName
+ : SHOW DIST VARIABLE WHERE NAME EQ_ variableName
;
showDistVariables
@@ -32,7 +32,7 @@ showDistVariables
;
alterComputeNode
- : ALTER COMPUTE NODE instanceId SET variableName EQ variableValues
+ : ALTER COMPUTE NODE instanceId SET variableName EQ_ variableValues
;
enableComputeNode
@@ -60,7 +60,7 @@ refreshTableMetadata
;
showTableMetadata
- : SHOW TABLE METADATA tableName (COMMA tableName*)? (FROM databaseName)?
+ : SHOW TABLE METADATA tableName (COMMA_ tableName*)? (FROM databaseName)?
;
showComputeNodeInfo
@@ -72,11 +72,11 @@ showComputeNodeMode
;
labelComputeNode
- : (LABEL | RELABEL) COMPUTE NODE instanceId WITH label (COMMA label)*
+ : (LABEL | RELABEL) COMPUTE NODE instanceId WITH label (COMMA_ label)*
;
unlabelComputeNode
- : UNLABEL COMPUTE NODE instanceId (WITH label (COMMA label)*)?
+ : UNLABEL COMPUTE NODE instanceId (WITH label (COMMA_ label)*)?
;
exportDatabaseConfiguration
@@ -100,51 +100,51 @@ alterMigrationRule
;
inventoryIncrementalRule
- : LP readDefinition? (COMMA? writeDefinition)? (COMMA? streamChannel)? RP
+ : LP_ readDefinition? (COMMA_? writeDefinition)? (COMMA_? streamChannel)? RP_
;
readDefinition
- : READ LP workerThread? (COMMA? batchSize)? (COMMA? shardingSize)? (COMMA? rateLimiter)? RP
+ : READ LP_ workerThread? (COMMA_? batchSize)? (COMMA_? shardingSize)? (COMMA_? rateLimiter)? RP_
;
writeDefinition
- : WRITE LP workerThread? (COMMA? batchSize)? (COMMA? rateLimiter)? RP
+ : WRITE LP_ workerThread? (COMMA_? batchSize)? (COMMA_? rateLimiter)? RP_
;
workerThread
- : WORKER_THREAD EQ intValue
+ : WORKER_THREAD EQ_ intValue
;
batchSize
- : BATCH_SIZE EQ intValue
+ : BATCH_SIZE EQ_ intValue
;
shardingSize
- : SHARDING_SIZE EQ intValue
+ : SHARDING_SIZE EQ_ intValue
;
rateLimiter
- : RATE_LIMITER LP algorithmDefinition RP
+ : RATE_LIMITER LP_ algorithmDefinition RP_
;
streamChannel
- : STREAM_CHANNEL LP algorithmDefinition RP
+ : STREAM_CHANNEL LP_ algorithmDefinition RP_
;
confPath
- : STRING
+ : STRING_
;
filePath
- : STRING
+ : STRING_
;
variableName
- : IDENTIFIER
+ : IDENTIFIER_
;
variableValues
- : variableValue (COMMA variableValue)*
+ : variableValue (COMMA_ variableValue)*
;
variableValue
@@ -152,7 +152,7 @@ variableValue
;
instanceId
- : IDENTIFIER | STRING
+ : IDENTIFIER_ | STRING_
;
refreshScope
@@ -164,11 +164,11 @@ fromSegment
;
label
- : IDENTIFIER
+ : IDENTIFIER_
;
intValue
- : INT
+ : INT_
;
prepareDistSQL
diff --git a/distsql/parser/src/main/antlr4/imports/RDLStatement.g4 b/distsql/parser/src/main/antlr4/imports/RDLStatement.g4
index c36e74fc9e4..dc957eb5017 100644
--- a/distsql/parser/src/main/antlr4/imports/RDLStatement.g4
+++ b/distsql/parser/src/main/antlr4/imports/RDLStatement.g4
@@ -20,55 +20,55 @@ grammar RDLStatement;
import BaseRule;
registerStorageUnit
- : REGISTER STORAGE UNIT storageUnitDefinition (COMMA storageUnitDefinition)*
+ : REGISTER STORAGE UNIT storageUnitDefinition (COMMA_ storageUnitDefinition)*
;
alterStorageUnit
- : ALTER STORAGE UNIT storageUnitDefinition (COMMA storageUnitDefinition)*
+ : ALTER STORAGE UNIT storageUnitDefinition (COMMA_ storageUnitDefinition)*
;
unregisterStorageUnit
- : UNREGISTER STORAGE UNIT ifExists? storageUnitName (COMMA storageUnitName)* ignoreSingleTables?
+ : UNREGISTER STORAGE UNIT ifExists? storageUnitName (COMMA_ storageUnitName)* ignoreSingleTables?
;
setDefaultSingleTableStorageUnit
- : SET DEFAULT SINGLE TABLE STORAGE UNIT EQ (storageUnitName | RANDOM)
+ : SET DEFAULT SINGLE TABLE STORAGE UNIT EQ_ (storageUnitName | RANDOM)
;
storageUnitDefinition
- : storageUnitName LP (simpleSource | urlSource) COMMA USER EQ user (COMMA PASSWORD EQ password)? (COMMA propertiesDefinition)? RP
+ : storageUnitName LP_ (simpleSource | urlSource) COMMA_ USER EQ_ user (COMMA_ PASSWORD EQ_ password)? (COMMA_ propertiesDefinition)? RP_
;
simpleSource
- : HOST EQ hostname COMMA PORT EQ port COMMA DB EQ dbName
+ : HOST EQ_ hostname COMMA_ PORT EQ_ port COMMA_ DB EQ_ dbName
;
urlSource
- : URL EQ url
+ : URL EQ_ url
;
hostname
- : STRING
+ : STRING_
;
port
- : INT
+ : INT_
;
dbName
- : STRING
+ : STRING_
;
url
- : STRING
+ : STRING_
;
user
- : STRING
+ : STRING_
;
password
- : STRING
+ : STRING_
;
ignoreSingleTables
diff --git a/distsql/parser/src/main/antlr4/imports/RQLStatement.g4 b/distsql/parser/src/main/antlr4/imports/RQLStatement.g4
index efc5c6cc5d8..1fbdec6280a 100644
--- a/distsql/parser/src/main/antlr4/imports/RQLStatement.g4
+++ b/distsql/parser/src/main/antlr4/imports/RQLStatement.g4
@@ -20,7 +20,7 @@ grammar RQLStatement;
import BaseRule;
showStorageUnits
- : SHOW STORAGE UNITS (FROM databaseName)? (WHERE USAGE_COUNT EQ usageCount)?
+ : SHOW STORAGE UNITS (FROM databaseName)? (WHERE USAGE_COUNT EQ_ usageCount)?
;
showDefaultSingleTableStorageUnit
@@ -40,5 +40,5 @@ countSingleTableRule
;
usageCount
- : INT
+ : INT_
;
diff --git a/distsql/parser/src/main/antlr4/imports/Symbol.g4 b/distsql/parser/src/main/antlr4/imports/Symbol.g4
index 3322b09bb3a..1da7901ec98 100644
--- a/distsql/parser/src/main/antlr4/imports/Symbol.g4
+++ b/distsql/parser/src/main/antlr4/imports/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/authority/distsql/parser/src/main/antlr4/imports/authority/Symbol.g4 b/kernel/authority/distsql/parser/src/main/antlr4/imports/authority/Symbol.g4
index 3322b09bb3a..1da7901ec98 100644
--- a/kernel/authority/distsql/parser/src/main/antlr4/imports/authority/Symbol.g4
+++ b/kernel/authority/distsql/parser/src/main/antlr4/imports/authority/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_: '$';