This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new ca1fd460b9f [fix](keyword) let some keyword non-reserved (#34613)
(#34701)
ca1fd460b9f is described below
commit ca1fd460b9fca9f9dab2b076888544a831202bce
Author: morrySnow <101034200+morrys...@users.noreply.github.com>
AuthorDate: Sat May 11 15:01:19 2024 +0800
[fix](keyword) let some keyword non-reserved (#34613) (#34701)
pick from master #34613
commit id 8ba5748905fb90cce30176303705be29db08d3ea
let below keyword as non-reserved
- CONSTRAINTS
- IPV4
- IPV6
- KW_MATCH_ANY
- KW_MATCH_ALL
- KW_MATCH_PHRASE
- KW_MATCH_PHRASE_PREFIX
- KW_MATCH_REGEXP
- KW_MATCH_PHRASE_EDGE
- KW_MATCH_ELEMENT_EQ
- KW_MATCH_ELEMENT_LT
- KW_MATCH_ELEMENT_GT
- KW_MATCH_ELEMENT_LE
- KW_MATCH_ELEMENT_GE
- VARIANT
---
.../antlr4/org/apache/doris/nereids/DorisLexer.g4 | 2 +-
.../antlr4/org/apache/doris/nereids/DorisParser.g4 | 21 +++++++++++++---
fe/fe-core/src/main/cup/sql_parser.cup | 28 ++++++++++++++++++++++
3 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisLexer.g4
b/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisLexer.g4
index 67c91924582..911436822dc 100644
--- a/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisLexer.g4
+++ b/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisLexer.g4
@@ -357,9 +357,9 @@ MATCH_ELEMENT_GT: 'ELEMENT_GT';
MATCH_ELEMENT_LE: 'ELEMENT_LE';
MATCH_ELEMENT_LT: 'ELEMENT_LT';
MATCH_PHRASE: 'MATCH_PHRASE';
+MATCH_PHRASE_EDGE: 'MATCH_PHRASE_EDGE';
MATCH_PHRASE_PREFIX: 'MATCH_PHRASE_PREFIX';
MATCH_REGEXP: 'MATCH_REGEXP';
-MATCH_PHRASE_EDGE: 'MATCH_PHRASE_EDGE';
MATERIALIZED: 'MATERIALIZED';
MAX: 'MAX';
MAXVALUE: 'MAXVALUE';
diff --git a/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
b/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
index f3f712742ed..9562bed5f21 100644
--- a/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
+++ b/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
@@ -1055,6 +1055,7 @@ nonReserved
| CONNECTION
| CONNECTION_ID
| CONSISTENT
+ | CONSTRAINTS
| CONVERT
| COPY
| COUNT
@@ -1075,10 +1076,10 @@ nonReserved
| DATEADD
| DATEDIFF
| DATETIME
- | DATETIMEV2
- | DATEV2
| DATETIMEV1
+ | DATETIMEV2
| DATEV1
+ | DATEV2
| DAY
| DAYS_ADD
| DAYS_SUB
@@ -1137,6 +1138,8 @@ nonReserved
| INCREMENTAL
| INDEXES
| INVERTED
+ | IPV4
+ | IPV6
| IS_NOT_NULL_PRED
| IS_NULL_PRED
| ISNULL
@@ -1162,6 +1165,17 @@ nonReserved
| LOGICAL
| MANUAL
| MAP
+ | MATCH_ALL
+ | MATCH_ANY
+ | MATCH_ELEMENT_EQ
+ | MATCH_ELEMENT_GE
+ | MATCH_ELEMENT_GT
+ | MATCH_ELEMENT_LE
+ | MATCH_ELEMENT_LT
+ | MATCH_PHRASE
+ | MATCH_PHRASE_EDGE
+ | MATCH_PHRASE_PREFIX
+ | MATCH_REGEXP
| MATERIALIZED
| MAX
| MEMO
@@ -1202,11 +1216,11 @@ nonReserved
| PERMISSIVE
| PHYSICAL
| PLAN
- | PROCESS
| PLUGIN
| PLUGINS
| POLICY
| PROC
+ | PROCESS
| PROCESSLIST
| PROFILE
| PROPERTIES
@@ -1284,6 +1298,7 @@ nonReserved
| VALUE
| VARCHAR
| VARIABLES
+ | VARIANT
| VERBOSE
| VERSION
| VIEW
diff --git a/fe/fe-core/src/main/cup/sql_parser.cup
b/fe/fe-core/src/main/cup/sql_parser.cup
index 4808285c076..34ad7834212 100644
--- a/fe/fe-core/src/main/cup/sql_parser.cup
+++ b/fe/fe-core/src/main/cup/sql_parser.cup
@@ -8164,6 +8164,34 @@ keyword ::=
{: RESULT = id; :}
| KW_BELONG:id
{: RESULT = id; :}
+ | KW_VARIANT:id
+ {: RESULT = id; :}
+ | KW_IPV4:id
+ {: RESULT = id; :}
+ | KW_IPV6:id
+ {: RESULT = id; :}
+ | KW_MATCH_ANY:id
+ {: RESULT = id; :}
+ | KW_MATCH_ALL:id
+ {: RESULT = id; :}
+ | KW_MATCH_PHRASE:id
+ {: RESULT = id; :}
+ | KW_MATCH_PHRASE_PREFIX:id
+ {: RESULT = id; :}
+ | KW_MATCH_REGEXP:id
+ {: RESULT = id; :}
+ | KW_MATCH_PHRASE_EDGE:id
+ {: RESULT = id; :}
+ | KW_MATCH_ELEMENT_EQ:id
+ {: RESULT = id; :}
+ | KW_MATCH_ELEMENT_LT:id
+ {: RESULT = id; :}
+ | KW_MATCH_ELEMENT_GT:id
+ {: RESULT = id; :}
+ | KW_MATCH_ELEMENT_LE:id
+ {: RESULT = id; :}
+ | KW_MATCH_ELEMENT_GE:id
+ {: RESULT = id; :}
;
// Identifier that contain keyword
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
