This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new fbfcd105122 [fix](keyword) let some keyword be non-reserved between
old parser and new parser (#35938)
fbfcd105122 is described below
commit fbfcd10512268ad5651568649ce5142b8dd91def
Author: caiconghui <[email protected]>
AuthorDate: Thu Jun 6 10:07:22 2024 +0800
[fix](keyword) let some keyword be non-reserved between old parser and new
parser (#35938)
Followup #35822
Co-authored-by: caiconghui1 <[email protected]>
---
.../src/main/antlr4/org/apache/doris/nereids/DorisLexer.g4 | 11 +++++++++++
.../src/main/antlr4/org/apache/doris/nereids/DorisParser.g4 | 11 +++++++++++
2 files changed, 22 insertions(+)
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 49c794640eb..8b256a7b07c 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
@@ -139,6 +139,7 @@ BUILD: 'BUILD';
BUILTIN: 'BUILTIN';
BULK: 'BULK';
BY: 'BY';
+CACHE: 'CACHE';
CACHED: 'CACHED';
CALL: 'CALL';
CANCEL: 'CANCEL';
@@ -156,6 +157,7 @@ CLUSTERS: 'CLUSTERS';
COLLATE: 'COLLATE';
COLLATION: 'COLLATION';
COLLECT: 'COLLECT';
+COLOCATE: 'COLOCATE';
COLUMN: 'COLUMN';
COLUMNS: 'COLUMNS';
COMMENT: 'COMMENT';
@@ -163,6 +165,7 @@ COMMIT: 'COMMIT';
COMMITTED: 'COMMITTED';
COMPACT: 'COMPACT';
COMPLETE: 'COMPLETE';
+COMPRESS_TYPE: 'COMPRESS_TYPE';
CONFIG: 'CONFIG';
CONNECTION: 'CONNECTION';
CONNECTION_ID: 'CONNECTION_ID';
@@ -170,6 +173,7 @@ CONSISTENT: 'CONSISTENT';
CONSTRAINT: 'CONSTRAINT';
CONSTRAINTS: 'CONSTRAINTS';
CONVERT: 'CONVERT';
+CONVERT_LSC: 'CONVERT_LSC';
COPY: 'COPY';
COUNT: 'COUNT';
CREATE: 'CREATE';
@@ -288,6 +292,7 @@ HISTOGRAM: 'HISTOGRAM';
HLL: 'HLL';
HLL_UNION: 'HLL_UNION';
HOSTNAME: 'HOSTNAME';
+HOTSPOT: 'HOTSPOT';
HOUR: 'HOUR';
HUB: 'HUB';
IDENTIFIED: 'IDENTIFIED';
@@ -410,6 +415,7 @@ PERMISSIVE: 'PERMISSIVE';
PHYSICAL: 'PHYSICAL';
PLACEHOLDER: '?';
PLAN: 'PLAN';
+PRIVILEGES: 'PRIVILEGES';
PROCESS: 'PROCESS';
PLUGIN: 'PLUGIN';
PLUGINS: 'PLUGINS';
@@ -432,6 +438,7 @@ RANGE: 'RANGE';
READ: 'READ';
REAL: 'REAL';
REBALANCE: 'REBALANCE';
+RECENT: 'RECENT';
RECOVER: 'RECOVER';
RECYCLE: 'RECYCLE';
REFRESH: 'REFRESH';
@@ -485,7 +492,9 @@ SMALLINT: 'SMALLINT';
SNAPSHOT: 'SNAPSHOT';
SONAME: 'SONAME';
SPLIT: 'SPLIT';
+SQL: 'SQL';
SQL_BLOCK_RULE: 'SQL_BLOCK_RULE';
+STAGES: 'STAGES';
START: 'START';
STARTS: 'STARTS';
STATS: 'STATS';
@@ -537,6 +546,7 @@ UNION: 'UNION';
UNIQUE: 'UNIQUE';
UNLOCK: 'UNLOCK';
UNSIGNED: 'UNSIGNED';
+UP: 'UP';
UPDATE: 'UPDATE';
USE: 'USE';
USER: 'USER';
@@ -550,6 +560,7 @@ VAULT: 'VAULT';
VERBOSE: 'VERBOSE';
VERSION: 'VERSION';
VIEW: 'VIEW';
+WARM: 'WARM';
WARNINGS: 'WARNINGS';
WEEK: 'WEEK';
WHEN: 'WHEN';
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 58791189739..b0b4961e19f 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
@@ -1047,6 +1047,7 @@ nonReserved
| BUILD
| BUILTIN
| BULK
+ | CACHE
| CACHED
| CALL
| CATALOG
@@ -1059,18 +1060,21 @@ nonReserved
| CLUSTERS
| COLLATION
| COLLECT
+ | COLOCATE
| COLUMNS
| COMMENT
| COMMIT
| COMMITTED
| COMPACT
| COMPLETE
+ | COMPRESS_TYPE
| CONFIG
| CONNECTION
| CONNECTION_ID
| CONSISTENT
| CONSTRAINTS
| CONVERT
+ | CONVERT_LSC
| COPY
| COUNT
| CREATION
@@ -1144,6 +1148,7 @@ nonReserved
| HISTOGRAM
| HLL_UNION
| HOSTNAME
+ | HOTSPOT
| HOUR
| HUB
| IDENTIFIED
@@ -1228,6 +1233,7 @@ nonReserved
| PLUGIN
| PLUGINS
| POLICY
+ | PRIVILEGES
| PROC
| PROCESS
| PROCESSLIST
@@ -1239,6 +1245,7 @@ nonReserved
| QUERY
| QUOTA
| RANDOM
+ | RECENT
| RECOVER
| RECYCLE
| REFRESH
@@ -1273,6 +1280,8 @@ nonReserved
| SNAPSHOT
| SONAME
| SPLIT
+ | SQL
+ | STAGES
| START
| STARTS
| STATS
@@ -1303,6 +1312,7 @@ nonReserved
| TYPES
| UNCOMMITTED
| UNLOCK
+ | UP
| USER
| VALUE
| VARCHAR
@@ -1312,6 +1322,7 @@ nonReserved
| VERBOSE
| VERSION
| VIEW
+ | WARM
| WARNINGS
| WEEK
| WORK
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
