Revert "Minor Refactoring (opensearch-project#2308) (opensearch-proje…

…ct#2317)" This reverts commit 051cc4f. Signed-off-by: Eric <menwe@amazon.com>
mengweieric · Nov 8, 2023 · 5a792f8 · 5a792f8
1 parent c5b44b3
commit 5a792f8
Show file tree

Hide file tree

Showing 3 changed files with 175 additions and 158 deletions.
diff --git a/spark/src/main/antlr/SqlBaseParser.g4 b/spark/src/main/antlr/SqlBaseParser.g4
@@ -967,6 +967,7 @@ primaryExpression
     | qualifiedName DOT ASTERISK                                                               #star
     | LEFT_PAREN namedExpression (COMMA namedExpression)+ RIGHT_PAREN                          #rowConstructor
     | LEFT_PAREN query RIGHT_PAREN                                                             #subqueryExpression
+    | IDENTIFIER_KW LEFT_PAREN expression RIGHT_PAREN                                          #identifierClause
     | functionName LEFT_PAREN (setQuantifier? argument+=functionArgument
        (COMMA argument+=functionArgument)*)? RIGHT_PAREN
        (FILTER LEFT_PAREN WHERE where=booleanExpression RIGHT_PAREN)?
@@ -1195,7 +1196,6 @@ qualifiedNameList
 
 functionName
     : IDENTIFIER_KW LEFT_PAREN expression RIGHT_PAREN
-    | identFunc=IDENTIFIER_KW   // IDENTIFIER itself is also a valid function name.
     | qualifiedName
     | FILTER
     | LEFT

diff --git a/spark/src/main/java/org/opensearch/sql/spark/client/StartJobRequest.java b/spark/src/main/java/org/opensearch/sql/spark/client/StartJobRequest.java
@@ -7,14 +7,12 @@
 
 import java.util.Map;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 /**
  * This POJO carries all the fields required for emr serverless job submission. Used as model in
  * {@link EMRServerlessClient} interface.
  */
 @Data
-@EqualsAndHashCode
 public class StartJobRequest {
 
   public static final Long DEFAULT_JOB_TIMEOUT = 120L;