This is an automated email from the ASF dual-hosted git repository.

jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git


The following commit(s) were added to refs/heads/master by this push:
     new d41192e9a7 fix TextMatchFilterOptimizer grouping for inner compound 
query (#14299)
d41192e9a7 is described below

commit d41192e9a7e342c38ce2d8bbf5d60c3e5679b304
Author: Christopher Peck <[email protected]>
AuthorDate: Thu Oct 31 23:52:59 2024 -0700

    fix TextMatchFilterOptimizer grouping for inner compound query (#14299)
---
 .../optimizer/filter/TextMatchFilterOptimizer.java | 16 +++++++---
 .../core/query/optimizer/QueryOptimizerTest.java   | 36 +++++++++++++---------
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git 
a/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/TextMatchFilterOptimizer.java
 
b/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/TextMatchFilterOptimizer.java
index 065cbc7ebe..87d8f7a040 100644
--- 
a/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/TextMatchFilterOptimizer.java
+++ 
b/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/TextMatchFilterOptimizer.java
@@ -132,7 +132,8 @@ public class TextMatchFilterOptimizer implements 
FilterOptimizer {
       if (allNot) {
         for (Expression expression : entry.getValue()) {
           Expression operand = 
expression.getFunctionCall().getOperands().get(0);
-          
literals.add(operand.getFunctionCall().getOperands().get(1).getLiteral().getStringValue());
+          literals.add(
+              
wrapWithParentheses(operand.getFunctionCall().getOperands().get(1).getLiteral().getStringValue()));
         }
       } else {
         for (Expression expression : entry.getValue()) {
@@ -147,12 +148,13 @@ public class TextMatchFilterOptimizer implements 
FilterOptimizer {
               continue;
             }
 
-            literals.add(FilterKind.NOT.name() + SPACE + 
operand.getFunctionCall().getOperands().get(1).getLiteral()
-                .getStringValue());
+            literals.add(FilterKind.NOT.name() + SPACE + wrapWithParentheses(
+                
operand.getFunctionCall().getOperands().get(1).getLiteral().getStringValue()));
             continue;
           }
           assert 
expression.getFunctionCall().getOperator().equals(FilterKind.TEXT_MATCH.name());
-          
literals.add(expression.getFunctionCall().getOperands().get(1).getLiteral().getStringValue());
+          literals.add(
+              
wrapWithParentheses(expression.getFunctionCall().getOperands().get(1).getLiteral().getStringValue()));
         }
       }
 
@@ -170,7 +172,7 @@ public class TextMatchFilterOptimizer implements 
FilterOptimizer {
       }
       Expression mergedTextMatchExpression =
           RequestUtils.getFunctionExpression(FilterKind.TEXT_MATCH.name(), 
entry.getKey(),
-              RequestUtils.getLiteralExpression("(" + mergedTextMatchFilter + 
")"));
+              RequestUtils.getLiteralExpression(mergedTextMatchFilter));
       if (allNot) {
         
newChildren.add(RequestUtils.getFunctionExpression(FilterKind.NOT.name(), 
mergedTextMatchExpression));
       } else {
@@ -184,4 +186,8 @@ public class TextMatchFilterOptimizer implements 
FilterOptimizer {
     assert operator.equals(FilterKind.OR.name()) || 
operator.equals(FilterKind.AND.name());
     return RequestUtils.getFunctionExpression(operator, newChildren);
   }
+
+  private String wrapWithParentheses(String expression) {
+    return "(" + expression + ")";
+  }
 }
diff --git 
a/pinot-core/src/test/java/org/apache/pinot/core/query/optimizer/QueryOptimizerTest.java
 
b/pinot-core/src/test/java/org/apache/pinot/core/query/optimizer/QueryOptimizerTest.java
index ed01138f24..5070e4c0e1 100644
--- 
a/pinot-core/src/test/java/org/apache/pinot/core/query/optimizer/QueryOptimizerTest.java
+++ 
b/pinot-core/src/test/java/org/apache/pinot/core/query/optimizer/QueryOptimizerTest.java
@@ -176,7 +176,7 @@ public class QueryOptimizerTest {
     List<Expression> operands = filterFunction.getOperands();
     assertEquals(operands.size(), 2);
     assertEquals(operands.get(0), 
RequestUtils.getIdentifierExpression("string"));
-    assertEquals(operands.get(1), RequestUtils.getLiteralExpression("((foo AND 
bar) OR baz)"));
+    assertEquals(operands.get(1), RequestUtils.getLiteralExpression("((foo) 
AND (bar)) OR (baz)"));
   }
 
   private static Expression getRangeFilterExpression(String column, String 
rangeString) {
@@ -264,40 +264,46 @@ public class QueryOptimizerTest {
 
     // TextMatchFilterOptimizer
     testQuery("SELECT * FROM testTable WHERE TEXT_MATCH(string, 'foo') AND 
TEXT_MATCH(string, 'bar')",
-        "SELECT * FROM testTable WHERE TEXT_MATCH(string, '(foo AND bar)')");
+        "SELECT * FROM testTable WHERE TEXT_MATCH(string, '(foo) AND (bar)')");
     testQuery("SELECT * FROM testTable WHERE TEXT_MATCH(string, '\"foo bar\"') 
AND TEXT_MATCH(string, 'baz')",
-        "SELECT * FROM testTable WHERE TEXT_MATCH(string, '(\"foo bar\" AND 
baz)')");
+        "SELECT * FROM testTable WHERE TEXT_MATCH(string, '(\"foo bar\") AND 
(baz)')");
     testQuery("SELECT * FROM testTable WHERE TEXT_MATCH(string, '\"foo bar\"') 
AND TEXT_MATCH(string, '/.*ooba.*/')",
-        "SELECT * FROM testTable WHERE TEXT_MATCH(string, '(\"foo bar\" AND 
/.*ooba.*/)')");
+        "SELECT * FROM testTable WHERE TEXT_MATCH(string, '(\"foo bar\") AND 
(/.*ooba.*/)')");
     testQuery("SELECT * FROM testTable WHERE int = 1 AND TEXT_MATCH(string, 
'foo') AND TEXT_MATCH(string, 'bar')",
-        "SELECT * FROM testTable WHERE int = 1 AND TEXT_MATCH(string, '(foo 
AND bar)')");
+        "SELECT * FROM testTable WHERE int = 1 AND TEXT_MATCH(string, '(foo) 
AND (bar)')");
     testQuery("SELECT * FROM testTable WHERE int = 1 OR TEXT_MATCH(string, 
'foo') AND TEXT_MATCH(string, 'bar')",
-        "SELECT * FROM testTable WHERE int = 1 OR TEXT_MATCH(string, '(foo AND 
bar)')");
+        "SELECT * FROM testTable WHERE int = 1 OR TEXT_MATCH(string, '(foo) 
AND (bar)')");
     testQuery("SELECT * FROM testTable WHERE TEXT_MATCH(string, 'foo') AND NOT 
TEXT_MATCH(string, 'bar')",
-        "SELECT * FROM testTable WHERE TEXT_MATCH(string, '(foo AND NOT 
bar)')");
+        "SELECT * FROM testTable WHERE TEXT_MATCH(string, '(foo) AND NOT 
(bar)')");
     testQuery("SELECT * FROM testTable WHERE NOT TEXT_MATCH(string, 'foo') AND 
TEXT_MATCH(string, 'bar')",
-        "SELECT * FROM testTable WHERE TEXT_MATCH(string, '(NOT foo AND 
bar)')");
+        "SELECT * FROM testTable WHERE TEXT_MATCH(string, 'NOT (foo) AND 
(bar)')");
     testQuery("SELECT * FROM testTable WHERE NOT TEXT_MATCH(string, 'foo') AND 
NOT TEXT_MATCH(string, 'bar')",
-        "SELECT * FROM testTable WHERE NOT TEXT_MATCH(string, '(foo OR 
bar)')");
+        "SELECT * FROM testTable WHERE NOT TEXT_MATCH(string, '(foo) OR 
(bar)')");
     testQuery("SELECT * FROM testTable WHERE NOT TEXT_MATCH(string, 'foo') OR 
NOT TEXT_MATCH(string, 'bar')",
-        "SELECT * FROM testTable WHERE NOT TEXT_MATCH(string, '(foo AND 
bar)')");
+        "SELECT * FROM testTable WHERE NOT TEXT_MATCH(string, '(foo) AND 
(bar)')");
     testQuery("SELECT * FROM testTable WHERE TEXT_MATCH(string, 'foo') AND 
TEXT_MATCH(string, 'bar') OR "
-        + "TEXT_MATCH(string, 'baz')", "SELECT * FROM testTable WHERE 
TEXT_MATCH(string, '((foo AND bar) OR baz)')");
+            + "TEXT_MATCH(string, 'baz')",
+        "SELECT * FROM testTable WHERE TEXT_MATCH(string, '((foo) AND (bar)) 
OR (baz)')");
     testQuery("SELECT * FROM testTable WHERE TEXT_MATCH(string, 'foo') AND 
(TEXT_MATCH(string, 'bar') OR "
-        + "TEXT_MATCH(string, 'baz'))", "SELECT * FROM testTable WHERE 
TEXT_MATCH(string, '(foo AND (bar OR baz))')");
+            + "TEXT_MATCH(string, 'baz'))",
+        "SELECT * FROM testTable WHERE TEXT_MATCH(string, '(foo) AND ((bar) OR 
(baz))')");
     testQuery("SELECT * FROM testTable WHERE TEXT_MATCH(string1, 'foo1') AND 
TEXT_MATCH(string1, 'bar1') OR "
             + "TEXT_MATCH(string1, 'baz1') AND TEXT_MATCH(string2, 'foo')",
-        "SELECT * FROM testTable WHERE TEXT_MATCH(string1, '(foo1 AND bar1)') 
OR TEXT_MATCH(string1, 'baz1') AND "
+        "SELECT * FROM testTable WHERE TEXT_MATCH(string1, '(foo1) AND 
(bar1)') OR TEXT_MATCH(string1, 'baz1') AND "
             + "TEXT_MATCH(string2, 'foo')");
     testQuery("SELECT * FROM testTable WHERE TEXT_MATCH(string1, 'foo1') AND 
TEXT_MATCH(string1, 'bar1')"
             + "AND TEXT_MATCH(string2, 'foo2') AND TEXT_MATCH(string2, 
'bar2')",
-        "SELECT * FROM testTable WHERE TEXT_MATCH(string1, '(foo1 AND bar1)') 
AND TEXT_MATCH(string2, '(foo2 AND "
-            + "bar2)')");
+        "SELECT * FROM testTable WHERE TEXT_MATCH(string1, '(foo1) AND 
(bar1)') AND TEXT_MATCH(string2, '(foo2) AND "
+            + "(bar2)')");
     testQuery("SELECT * FROM testTable WHERE TEXT_MATCH(string, 'foo') OR NOT 
TEXT_MATCH(string, 'bar')",
         "SELECT * FROM testTable WHERE NOT TEXT_MATCH(string, 'bar') OR 
TEXT_MATCH(string, 'foo')");
     testQuery(
         "select * from testTable where intCol > 1 AND (text_match(string, 
'foo') OR NOT text_match(string, 'bar'))",
         "select * from testTable where intCol > 1 AND (NOT text_match(string, 
'bar') OR text_match(string, 'foo'))");
+    testQuery(
+        "select * from testTable where text_match(string, 'foo') AND 
text_match(string, 'bar OR baz')",
+        "select * from testTable where text_match(string, '(foo) AND (bar OR 
baz)')"
+    );
     testCannotOptimizeQuery("SELECT * FROM testTable WHERE TEXT_MATCH(string1, 
'foo') OR TEXT_MATCH(string2, 'bar')");
     testCannotOptimizeQuery(
         "SELECT * FROM testTable WHERE int = 1 AND TEXT_MATCH(string, 'foo') 
OR TEXT_MATCH(string, 'bar')");


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to