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 030c8d83bb4 Update G4 file for DB_discovery (#22647)
030c8d83bb4 is described below
commit 030c8d83bb4883be2c1f832b165ba8425f490c7e
Author: Zichao <57847965+qianyi951...@users.noreply.github.com>
AuthorDate: Mon Dec 5 19:46:12 2022 +1300
Update G4 file for DB_discovery (#22647)
---
.../main/antlr4/imports/db-discovery/BaseRule.g4 | 12 ++--
.../main/antlr4/imports/db-discovery/Keyword.g4 | 2 +-
.../main/antlr4/imports/db-discovery/Literals.g4 | 26 +++----
.../antlr4/imports/db-discovery/RDLStatement.g4 | 24 +++----
.../antlr4/imports/db-discovery/RQLStatement.g4 | 2 +-
.../src/main/antlr4/imports/db-discovery/Symbol.g4 | 84 +++++++++++-----------
6 files changed, 75 insertions(+), 75 deletions(-)
diff --git
a/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/BaseRule.g4
b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/BaseRule.g4
index 20152ffc645..25c7c4948c7 100644
---
a/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/BaseRule.g4
+++
b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/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
@@ -36,13 +36,13 @@ 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
;
diff --git
a/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/Keyword.g4
b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/Keyword.g4
index 6f49cc66c74..b46ecb54fff 100644
---
a/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/Keyword.g4
+++
b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/Keyword.g4
@@ -104,5 +104,5 @@ COUNT
;
MYSQLMGR
- : M Y S Q L DOT M G R
+ : M Y S Q L DOT_ M G R
;
diff --git
a/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/Literals.g4
b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/Literals.g4
index cb5dec4e1ce..1d13bcc2332 100644
---
a/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/Literals.g4
+++
b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/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/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/RDLStatement.g4
b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/RDLStatement.g4
index 2df43a1eb04..ae099b14273 100644
---
a/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/RDLStatement.g4
+++
b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/RDLStatement.g4
@@ -20,51 +20,51 @@ grammar RDLStatement;
import BaseRule;
createDatabaseDiscoveryRule
- : CREATE DB_DISCOVERY RULE databaseDiscoveryRule (COMMA
databaseDiscoveryRule)*
+ : CREATE DB_DISCOVERY RULE databaseDiscoveryRule (COMMA_
databaseDiscoveryRule)*
;
alterDatabaseDiscoveryRule
- : ALTER DB_DISCOVERY RULE databaseDiscoveryRule (COMMA
databaseDiscoveryRule)*
+ : ALTER DB_DISCOVERY RULE databaseDiscoveryRule (COMMA_
databaseDiscoveryRule)*
;
dropDatabaseDiscoveryRule
- : DROP DB_DISCOVERY RULE ifExists? ruleName (COMMA ruleName)*
+ : DROP DB_DISCOVERY RULE ifExists? ruleName (COMMA_ ruleName)*
;
dropDatabaseDiscoveryType
- : DROP DB_DISCOVERY TYPE ifExists? discoveryTypeName (COMMA
discoveryTypeName)*
+ : DROP DB_DISCOVERY TYPE ifExists? discoveryTypeName (COMMA_
discoveryTypeName)*
;
dropDatabaseDiscoveryHeartbeat
- : DROP DB_DISCOVERY HEARTBEAT ifExists? discoveryHeartbeatName (COMMA
discoveryHeartbeatName)*
+ : DROP DB_DISCOVERY HEARTBEAT ifExists? discoveryHeartbeatName (COMMA_
discoveryHeartbeatName)*
;
databaseDiscoveryRule
- : ruleName LP storageUnits COMMA algorithmDefinition COMMA
discoveryHeartbeat RP
+ : ruleName LP_ storageUnits COMMA_ algorithmDefinition COMMA_
discoveryHeartbeat RP_
;
ruleName
- : IDENTIFIER
+ : IDENTIFIER_
;
storageUnits
- : STORAGE_UNITS LP storageUnitName (COMMA storageUnitName)* RP
+ : STORAGE_UNITS LP_ storageUnitName (COMMA_ storageUnitName)* RP_
;
storageUnitName
- : IDENTIFIER
+ : IDENTIFIER_
;
discoveryHeartbeat
- : HEARTBEAT LP propertiesDefinition RP
+ : HEARTBEAT LP_ propertiesDefinition RP_
;
discoveryTypeName
- : IDENTIFIER
+ : IDENTIFIER_
;
discoveryHeartbeatName
- : IDENTIFIER
+ : IDENTIFIER_
;
ifExists
diff --git
a/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/RQLStatement.g4
b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/RQLStatement.g4
index b23f71a73aa..7f8c7a814d3 100644
---
a/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/RQLStatement.g4
+++
b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/RQLStatement.g4
@@ -36,5 +36,5 @@ countDatabaseDiscoveryRule
;
databaseName
- : IDENTIFIER
+ : IDENTIFIER_
;
diff --git
a/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/Symbol.g4
b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/Symbol.g4
index a332bdd1df7..90dba68ccfc 100644
---
a/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/Symbol.g4
+++
b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/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_: '_';
