Revert some changes - PPL math operation precedence was broken.

Signed-off-by: Yury-Fridlyand <[email protected]>
Bit-Quill · Jan 16, 2023 · b11b239 · b11b239
1 parent 292370c
commit b11b239
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/ppl/src/main/antlr/OpenSearchPPLParser.g4 b/ppl/src/main/antlr/OpenSearchPPLParser.g4
@@ -269,10 +269,10 @@ comparisonExpression
 
 valueExpression
     : left=valueExpression
-        binaryOperator//=(STAR | DIVIDE | MODULE)
+        binaryOperator=(STAR | DIVIDE | MODULE)
             right=valueExpression                                   #binaryArithmetic
     | left=valueExpression
-        binaryOperator//=(PLUS | MINUS)
+        binaryOperator=(PLUS | MINUS)
             right=valueExpression                                   #binaryArithmetic
     | primaryExpression                                             #valueExpressionDefault
     | positionFunction                                              #positionFunctionCall
@@ -597,14 +597,6 @@ comparisonOperator
     | REGEXP
     ;
 
-binaryOperator
-    : PLUS
-    | MINUS
-    | STAR
-    | DIVIDE
-    | MODULE
-    ;
-
 singleFieldRelevanceFunctionName
     : MATCH
     | MATCH_PHRASE

diff --git a/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java b/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java
@@ -154,7 +154,7 @@ public UnresolvedExpression visitInExpr(InExprContext ctx) {
   @Override
   public UnresolvedExpression visitBinaryArithmetic(BinaryArithmeticContext ctx) {
     return new Function(
-        ctx.binaryOperator().getText(),
+        ctx.binaryOperator.getText(),
         Arrays.asList(visit(ctx.left), visit(ctx.right))
     );
   }