update antlr

opensearch-project · Feb 15, 2022 · 02ed12f · 02ed12f
1 parent 5c6fc8c
commit 02ed12f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/sql/src/main/antlr/OpenSearchSQLParser.g4 b/sql/src/main/antlr/OpenSearchSQLParser.g4
@@ -249,7 +249,7 @@ intervalUnit
     | DAY_SECOND | DAY_MINUTE | DAY_HOUR | YEAR_MONTH
     ;
 
-//    Expressions, predicates
+// predicates
 
 // Simplified approach for expression
 expression
@@ -265,7 +265,11 @@ predicate
     | predicate IS nullNotnull                                      #isNullPredicate
     | left=predicate NOT? LIKE right=predicate                      #likePredicate
     | left=predicate REGEXP right=predicate                         #regexpPredicate
-    | predicate NOT? IN predicateList                               #inList
+    | predicate NOT? IN '(' expressions ')'                         #inPredicate
+    ;
+
+expressions
+    : expression (',' expression)*
     ;
 
 expressionAtom
@@ -289,10 +293,6 @@ nullNotnull
     : NOT? NULL_LITERAL
     ;
 
-predicateList
-    : '(' predicate (COMMA predicate)* ')'
-    ;
-
 functionCall
     : scalarFunctionName LR_BRACKET functionArgs? RR_BRACKET        #scalarFunctionCall
     | specificFunction                                              #specificFunctionCall

diff --git a/sql/src/main/java/org/opensearch/sql/sql/parser/AstExpressionBuilder.java b/sql/src/main/java/org/opensearch/sql/sql/parser/AstExpressionBuilder.java
@@ -238,10 +238,14 @@ public UnresolvedExpression visitRegexpPredicate(RegexpPredicateContext ctx) {
   }
 
   @Override
-  public UnresolvedExpression visitInList(OpenSearchSQLParser.InListContext ctx) {
+  public UnresolvedExpression visitInPredicate(OpenSearchSQLParser.InPredicateContext ctx) {
     UnresolvedExpression field = visit(ctx.predicate());
-    List<UnresolvedExpression> inLists =
-        ctx.predicateList().predicate().stream().map(this::visit).collect(Collectors.toList());
+    List<UnresolvedExpression> inLists = ctx
+        .expressions()
+        .expression()
+        .stream()
+        .map(this::visit)
+        .collect(Collectors.toList());
     UnresolvedExpression in = AstDSL.in(field, inLists);
     return ctx.NOT() != null ? AstDSL.not(in) : in;
   }