[BugFix] fix agg skew hint losing having (#53427)

Signed-off-by: before-Sunrise <[email protected]>
StarRocks · Dec 2, 2024 · 51537af · 51537af
1 parent b0329f0
commit 51537af
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/...tarrocks/sql/optimizer/rule/transformation/GroupByCountDistinctDataSkewEliminateRule.java b/...tarrocks/sql/optimizer/rule/transformation/GroupByCountDistinctDataSkewEliminateRule.java
@@ -170,6 +170,7 @@ public List<OptExpression> transform(OptExpression input, OptimizerContext conte
                 .setSplit()
                 .setPartitionByColumns(Lists.newArrayList(groupBy))
                 .setProjection(aggOp.getProjection())
+                .setPredicate(aggOp.getPredicate())
                 .build();
         fourthAggOp.setDistinctColumnDataSkew(new DataSkewInfo(distinctColRef, 0.5, ++stage));
 

diff --git a/fe/fe-core/src/test/java/com/starrocks/analysis/SelectStmtTest.java b/fe/fe-core/src/test/java/com/starrocks/analysis/SelectStmtTest.java
@@ -378,6 +378,19 @@ void testGroupByCountDistinctWithSkewHint() throws Exception {
         FeConstants.runningUnitTest = false;
     }
 
+    @Test
+    void testGroupByCountDistinctWithSkewHintLossPredicate() throws Exception {
+        FeConstants.runningUnitTest = true;
+        String sql =
+                "select t from(select cast(k1 as int), count(distinct [skew] cast(k2 as int)) as t from db1.tbl1 group by cast(k1 as int)) temp where t > 1";
+        String s = starRocksAssert.query(sql).explainQuery();
+        Assert.assertTrue(s, s.contains(" 8:AGGREGATE (merge finalize)\n" +
+                "  |  output: sum(7: count)\n" +
+                "  |  group by: 5: cast\n" +
+                "  |  having: 7: count > 1"));
+        FeConstants.runningUnitTest = false;
+    }
+
     @Test
     void testGroupByMultiColumnCountDistinctWithSkewHint() throws Exception {
         FeConstants.runningUnitTest = true;