disable dict optimization when having predicate has dictionary column (…

…#5914) (cherry picked from commit 0c92d3a)
StarRocks · May 11, 2022 · 3d962e9 · 3d962e9
1 parent 4ad057e
commit 3d962e9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/...ain/java/com/starrocks/sql/optimizer/operator/physical/PhysicalHashAggregateOperator.java b/...ain/java/com/starrocks/sql/optimizer/operator/physical/PhysicalHashAggregateOperator.java
@@ -190,15 +190,20 @@ private boolean couldApplyStringDict(CallOperator operator, ColumnRefSet dictSet
     public void fillDisableDictOptimizeColumns(ColumnRefSet resultSet, Set<Integer> dictColIds) {
         ColumnRefSet dictSet = new ColumnRefSet();
         dictColIds.forEach(dictSet::union);
-        getAggregations().values().forEach((v) -> {
+        final ScalarOperator predicate = getPredicate();
+        getAggregations().forEach((k, v) -> {
             if (!couldApplyStringDict(v, dictSet)) {
                 resultSet.union(v.getUsedColumns());
             }
+
+            // disable DictOptimize when having predicate couldn't push down
+            if (predicate != null && predicate.getUsedColumns().isIntersect(k.getUsedColumns())) {
+                resultSet.union(v.getUsedColumns());
+            }
         });
         // Now we disable DictOptimize when group by predicate couldn't push down
-        final ScalarOperator predicate = getPredicate();
         if (predicate != null) {
-            final ColumnRefSet predicateUsedColumns = getPredicate().getUsedColumns();
+            final ColumnRefSet predicateUsedColumns = predicate.getUsedColumns();
             for (Integer dictColId : dictColIds) {
                 if (predicateUsedColumns.contains(dictColId)) {
                     resultSet.union(dictColId);

diff --git a/fe/fe-core/src/test/java/com/starrocks/sql/plan/DecodeRewriteTest.java b/fe/fe-core/src/test/java/com/starrocks/sql/plan/DecodeRewriteTest.java
@@ -618,6 +618,11 @@ public void testAggHaving() throws Exception {
                 "having a < b*1.2 or c not like '%open%'";
         plan = getFragmentPlan(sql);
         Assert.assertFalse(plan.contains("Decode"));
+
+        // test couldn't push down having predicate
+        sql = "SELECT count(*) a FROM supplier having max(S_ADDRESS)='123'";
+        plan = getFragmentPlan(sql);
+        Assert.assertFalse(plan.contains("Decode"));
     }
 
     @Test