This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new e6538664ecc [fix](Nereids) two cloud syntax different with legacy
planner (#41198)
e6538664ecc is described below
commit e6538664eccd609e037dd1354913c0e499029a73
Author: morrySnow <101034200+morrys...@users.noreply.github.com>
AuthorDate: Tue Sep 24 15:18:01 2024 +0800
[fix](Nereids) two cloud syntax different with legacy planner (#41198)
- copy into
- warm up
---
fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisLexer.g4 | 1 +
.../src/main/antlr4/org/apache/doris/nereids/DorisParser.g4 | 8 +++++---
2 files changed, 6 insertions(+), 3 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 abc52a812f9..03997bfee23 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
@@ -206,6 +206,7 @@ DEMAND: 'DEMAND';
DESC: 'DESC';
DESCRIBE: 'DESCRIBE';
DIAGNOSE: 'DIAGNOSE';
+DIAGNOSIS: 'DIAGNOSIS';
DISK: 'DISK';
DISTINCT: 'DISTINCT';
DISTINCTPC: 'DISTINCTPC';
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 f449da72716..eb0dbabf349 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
@@ -185,7 +185,7 @@ unsupportedOtherStatement
| UNLOCK TABLES
#unlockTables
| WARM UP (CLUSTER | COMPUTE GROUP) destination=identifier WITH
((CLUSTER | COMPUTE GROUP) source=identifier |
- (warmUpItem (COMMA warmUpItem)*)) FORCE?
#warmUpCluster
+ (warmUpItem (AND warmUpItem)*)) FORCE?
#warmUpCluster
| BACKUP SNAPSHOT label=multipartIdentifier TO repo=identifier
((ON | EXCLUDE) LEFT_PAREN baseTableRef (COMMA baseTableRef)*
RIGHT_PAREN)?
properties=propertyClause?
#backup
@@ -848,14 +848,15 @@ unsupportedUseStatement
unsupportedDmlStatement
: TRUNCATE TABLE multipartIdentifier specifiedPartition?
#truncateTable
- | COPY INTO selectHint? name=multipartIdentifier columns=identifierList
FROM
+ | COPY INTO selectHint? name=multipartIdentifier columns=identifierList?
FROM
(stageAndPattern | (LEFT_PAREN SELECT selectColumnClause
FROM stageAndPattern whereClause RIGHT_PAREN))
properties=propertyClause?
#copyInto
;
stageAndPattern
- : AT (stage=identifier | TILDE) (pattern=STRING_LITERAL)?
+ : ATSIGN (stage=identifier | TILDE)
+ (LEFT_PAREN pattern=STRING_LITERAL RIGHT_PAREN)?
;
unsupportedKillStatement
@@ -1856,6 +1857,7 @@ nonReserved
| DEFERRED
| DEMAND
| DIAGNOSE
+ | DIAGNOSIS
| DISTINCTPC
| DISTINCTPCSA
| DO
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
