remove un-needed grammar from 2.X version

Signed-off-by: YANGDB <[email protected]>
opensearch-project · Jan 8, 2024 · 917b841 · 917b841
1 parent 07904be
commit 917b841
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 29 deletions.
diff --git a/spark/src/main/antlr/SqlBaseLexer.g4 b/spark/src/main/antlr/SqlBaseLexer.g4
@@ -217,7 +217,6 @@ HOURS: 'HOURS';
 IDENTIFIER_KW: 'IDENTIFIER';
 IF: 'IF';
 IGNORE: 'IGNORE';
-IMMEDIATE: 'IMMEDIATE';
 IMPORT: 'IMPORT';
 IN: 'IN';
 INCLUDE: 'INCLUDE';
@@ -382,7 +381,6 @@ TIMESTAMPADD: 'TIMESTAMPADD';
 TIMESTAMPDIFF: 'TIMESTAMPDIFF';
 TINYINT: 'TINYINT';
 TO: 'TO';
-EXECUTE: 'EXECUTE';
 TOUCH: 'TOUCH';
 TRAILING: 'TRAILING';
 TRANSACTION: 'TRANSACTION';

diff --git a/spark/src/main/antlr/SqlBaseParser.g4 b/spark/src/main/antlr/SqlBaseParser.g4
@@ -72,7 +72,6 @@ singleTableSchema
 
 statement
     : query                                                            #statementDefault
-    | executeImmediate                                                 #visitExecuteImmediate
     | ctes? dmlStatementNoWith                                         #dmlStatement
     | USE identifierReference                                          #use
     | USE namespace identifierReference                                #useNamespace
@@ -231,28 +230,6 @@ statement
     | unsupportedHiveNativeCommands .*?                                #failNativeCommand
     ;
 
-executeImmediate
-    : EXECUTE IMMEDIATE queryParam=executeImmediateQueryParam (INTO targetVariable=multipartIdentifierList)? executeImmediateUsing?
-    ;
-
-executeImmediateUsing
-    : USING LEFT_PAREN params=namedExpressionSeq RIGHT_PAREN
-    | USING params=namedExpressionSeq
-    ;
-
-executeImmediateQueryParam
-    : stringLit
-    | multipartIdentifier
-    ;
-
-executeImmediateArgument
-    : (constant|multipartIdentifier) (AS name=errorCapturingIdentifier)?
-    ;
-
-executeImmediateArgumentSeq
-    : executeImmediateArgument (COMMA executeImmediateArgument)*
-    ;
-
 timezone
     : stringLit
     | LOCAL
@@ -1002,7 +979,6 @@ primaryExpression
     | LEFT_PAREN query RIGHT_PAREN                                                             #subqueryExpression
     | functionName LEFT_PAREN (setQuantifier? argument+=functionArgument
        (COMMA argument+=functionArgument)*)? RIGHT_PAREN
-       (WITHIN GROUP LEFT_PAREN ORDER BY sortItem (COMMA sortItem)* RIGHT_PAREN)?
        (FILTER LEFT_PAREN WHERE where=booleanExpression RIGHT_PAREN)?
        (nullsOption=(IGNORE | RESPECT) NULLS)? ( OVER windowSpec)?                             #functionCall
     | identifier ARROW expression                                                              #lambda
@@ -1018,6 +994,9 @@ primaryExpression
        FROM srcStr=valueExpression RIGHT_PAREN                                                 #trim
     | OVERLAY LEFT_PAREN input=valueExpression PLACING replace=valueExpression
       FROM position=valueExpression (FOR length=valueExpression)? RIGHT_PAREN                  #overlay
+    | name=(PERCENTILE_CONT | PERCENTILE_DISC) LEFT_PAREN percentage=valueExpression RIGHT_PAREN
+        WITHIN GROUP LEFT_PAREN ORDER BY sortItem RIGHT_PAREN
+        (FILTER LEFT_PAREN WHERE where=booleanExpression RIGHT_PAREN)? ( OVER windowSpec)?     #percentile
     ;
 
 literalType
@@ -1417,7 +1396,6 @@ ansiNonReserved
     | IDENTIFIER_KW
     | IF
     | IGNORE
-    | IMMEDIATE
     | IMPORT
     | INCLUDE
     | INDEX
@@ -1709,7 +1687,6 @@ nonReserved
     | ESCAPED
     | EXCHANGE
     | EXCLUDE
-    | EXECUTE
     | EXISTS
     | EXPLAIN
     | EXPORT
@@ -1742,7 +1719,6 @@ nonReserved
     | IDENTIFIER_KW
     | IF
     | IGNORE
-    | IMMEDIATE
     | IMPORT
     | IN
     | INCLUDE