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 7b793fe8476 Update G4 file for Encrypt (#22644)
7b793fe8476 is described below
commit 7b793fe8476780bae0c837e7a38cf945d6f73769
Author: Zichao <[email protected]>
AuthorDate: Mon Dec 5 20:17:44 2022 +1300
Update G4 file for Encrypt (#22644)
---
.../src/main/antlr4/imports/encrypt/BaseRule.g4 | 14 ++--
.../src/main/antlr4/imports/encrypt/Literals.g4 | 26 +++----
.../main/antlr4/imports/encrypt/RDLStatement.g4 | 42 +++++------
.../main/antlr4/imports/encrypt/RQLStatement.g4 | 2 +-
.../src/main/antlr4/imports/encrypt/Symbol.g4 | 84 +++++++++++-----------
5 files changed, 84 insertions(+), 84 deletions(-)
diff --git
a/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/BaseRule.g4
b/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/BaseRule.g4
index 317debf617a..36f03f9f2cf 100644
---
a/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/BaseRule.g4
+++
b/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/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
- : buildinAlgorithmTypeName | STRING
+ : buildinAlgorithmTypeName | STRING_
;
buildinAlgorithmTypeName
@@ -41,17 +41,17 @@ 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
;
tableName
- : IDENTIFIER
+ : IDENTIFIER_
;
diff --git
a/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/Literals.g4
b/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/Literals.g4
index 99f85324c79..c6557635906 100644
---
a/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/Literals.g4
+++
b/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/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/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/RDLStatement.g4
b/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/RDLStatement.g4
index c40f0e970c9..33f729ba9e6 100644
---
a/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/RDLStatement.g4
+++
b/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/RDLStatement.g4
@@ -20,87 +20,87 @@ grammar RDLStatement;
import BaseRule;
createEncryptRule
- : CREATE ENCRYPT RULE encryptRuleDefinition (COMMA encryptRuleDefinition)*
+ : CREATE ENCRYPT RULE encryptRuleDefinition (COMMA_ encryptRuleDefinition)*
;
alterEncryptRule
- : ALTER ENCRYPT RULE encryptRuleDefinition (COMMA encryptRuleDefinition)*
+ : ALTER ENCRYPT RULE encryptRuleDefinition (COMMA_ encryptRuleDefinition)*
;
dropEncryptRule
- : DROP ENCRYPT RULE ifExists? tableName (COMMA tableName)*
+ : DROP ENCRYPT RULE ifExists? tableName (COMMA_ tableName)*
;
encryptRuleDefinition
- : tableName LP (resourceDefinition COMMA)? COLUMNS LP
encryptColumnDefinition (COMMA encryptColumnDefinition)* RP (COMMA
QUERY_WITH_CIPHER_COLUMN EQ queryWithCipherColumn)? RP
+ : tableName LP_ (resourceDefinition COMMA_)? COLUMNS LP_
encryptColumnDefinition (COMMA_ encryptColumnDefinition)* RP_ (COMMA_
QUERY_WITH_CIPHER_COLUMN EQ_ queryWithCipherColumn)? RP_
;
resourceDefinition
- : RESOURCE EQ resourceName
+ : RESOURCE EQ_ resourceName
;
resourceName
- : IDENTIFIER
+ : IDENTIFIER_
;
encryptColumnDefinition
- : LP columnDefinition (COMMA plainColumnDefinition)? COMMA
cipherColumnDefinition (COMMA assistedQueryColumnDefinition)? (COMMA
likeQueryColumnDefinition)? COMMA encryptAlgorithm (COMMA
assistedQueryAlgorithm)? (COMMA likeQueryAlgorithm)? RP
+ : LP_ columnDefinition (COMMA_ plainColumnDefinition)? COMMA_
cipherColumnDefinition (COMMA_ assistedQueryColumnDefinition)? (COMMA_
likeQueryColumnDefinition)? COMMA_ encryptAlgorithm (COMMA_
assistedQueryAlgorithm)? (COMMA_ likeQueryAlgorithm)? RP_
;
columnDefinition
- : NAME EQ columnName (COMMA DATA_TYPE EQ dataType)?
+ : NAME EQ_ columnName (COMMA_ DATA_TYPE EQ_ dataType)?
;
columnName
- : IDENTIFIER
+ : IDENTIFIER_
;
dataType
- : STRING
+ : STRING_
;
plainColumnDefinition
- : PLAIN EQ plainColumnName (COMMA PLAIN_DATA_TYPE EQ dataType)?
+ : PLAIN EQ_ plainColumnName (COMMA_ PLAIN_DATA_TYPE EQ_ dataType)?
;
plainColumnName
- : IDENTIFIER
+ : IDENTIFIER_
;
cipherColumnDefinition
- : CIPHER EQ cipherColumnName (COMMA CIPHER_DATA_TYPE EQ dataType)?
+ : CIPHER EQ_ cipherColumnName (COMMA_ CIPHER_DATA_TYPE EQ_ dataType)?
;
cipherColumnName
- : IDENTIFIER
+ : IDENTIFIER_
;
assistedQueryColumnDefinition
- : ASSISTED_QUERY_COLUMN EQ assistedQueryColumnName (COMMA
ASSISTED_QUERY_DATA_TYPE EQ dataType)?
+ : ASSISTED_QUERY_COLUMN EQ_ assistedQueryColumnName (COMMA_
ASSISTED_QUERY_DATA_TYPE EQ_ dataType)?
;
assistedQueryColumnName
- : IDENTIFIER
+ : IDENTIFIER_
;
likeQueryColumnDefinition
- : LIKE_QUERY_COLUMN EQ likeQueryColumnName (COMMA LIKE_QUERY_DATA_TYPE EQ
dataType)?
+ : LIKE_QUERY_COLUMN EQ_ likeQueryColumnName (COMMA_ LIKE_QUERY_DATA_TYPE
EQ_ dataType)?
;
likeQueryColumnName
- : IDENTIFIER
+ : IDENTIFIER_
;
encryptAlgorithm
- : ENCRYPT_ALGORITHM LP algorithmDefinition RP
+ : ENCRYPT_ALGORITHM LP_ algorithmDefinition RP_
;
assistedQueryAlgorithm
- : ASSISTED_QUERY_ALGORITHM LP algorithmDefinition RP
+ : ASSISTED_QUERY_ALGORITHM LP_ algorithmDefinition RP_
;
likeQueryAlgorithm
- : LIKE_QUERY_ALGORITHM LP algorithmDefinition RP
+ : LIKE_QUERY_ALGORITHM LP_ algorithmDefinition RP_
;
queryWithCipherColumn
diff --git
a/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/RQLStatement.g4
b/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/RQLStatement.g4
index 0429a619741..45687c5665c 100644
---
a/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/RQLStatement.g4
+++
b/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/RQLStatement.g4
@@ -32,5 +32,5 @@ countEncryptRule
;
databaseName
- : IDENTIFIER
+ : IDENTIFIER_
;
diff --git
a/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/Symbol.g4
b/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/Symbol.g4
index a332bdd1df7..90dba68ccfc 100644
--- a/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/Symbol.g4
+++ b/features/encrypt/distsql/parser/src/main/antlr4/imports/encrypt/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_: '_';
