[doris] branch master updated: [Bug] fix bug for grouping set query which where condition is false (#14401)

[yiguolei]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 89c676e597 [Bug] fix bug for grouping set query which where condition 
is false (#14401)
89c676e597 is described below

commit 89c676e597c4ba31e08d03805251df4937e89f8c
Author: shee <13843187+qz...@users.noreply.github.com>
AuthorDate: Tue Nov 22 16:03:43 2022 +0800

    [Bug] fix bug for grouping set query which where condition is false (#14401)
---
 .../src/main/java/org/apache/doris/planner/SingleNodePlanner.java    | 5 +++++
 regression-test/data/query_p0/grouping_sets/test_grouping_sets.out   | 2 ++
 .../suites/query_p0/grouping_sets/test_grouping_sets.groovy          | 2 ++
 3 files changed, 9 insertions(+)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java 
b/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java
index b1234cceec..8bf52d3730 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java
@@ -89,6 +89,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -1134,6 +1135,10 @@ public class SingleNodePlanner {
         }
 
         if (analyzer.hasEmptySpjResultSet() && selectStmt.getAggInfo() != 
null) {
+            GroupByClause groupByClause = selectStmt.getGroupByClause();
+            if (Objects.nonNull(groupByClause) && 
groupByClause.isGroupByExtension()) {
+                
rowTuples.add(selectStmt.getGroupingInfo().getVirtualTuple().getId());
+            }
             final PlanNode emptySetNode = new 
EmptySetNode(ctx.getNextNodeId(), rowTuples);
             emptySetNode.init(analyzer);
             emptySetNode.setOutputSmap(selectStmt.getBaseTblSmap());
diff --git a/regression-test/data/query_p0/grouping_sets/test_grouping_sets.out 
b/regression-test/data/query_p0/grouping_sets/test_grouping_sets.out
index a11a1a577b..f2da1d2f67 100644
--- a/regression-test/data/query_p0/grouping_sets/test_grouping_sets.out
+++ b/regression-test/data/query_p0/grouping_sets/test_grouping_sets.out
@@ -47,3 +47,5 @@
 2      9       1991
 2      10      1991
 
+-- !select7 --
+
diff --git 
a/regression-test/suites/query_p0/grouping_sets/test_grouping_sets.groovy 
b/regression-test/suites/query_p0/grouping_sets/test_grouping_sets.groovy
index 3e70440782..83e517de53 100644
--- a/regression-test/suites/query_p0/grouping_sets/test_grouping_sets.groovy
+++ b/regression-test/suites/query_p0/grouping_sets/test_grouping_sets.groovy
@@ -58,4 +58,6 @@ suite("test_grouping_sets") {
             """
         exception "errCode = 2, detailMessage = column: `k3` cannot both in 
select list and aggregate functions"
     }
+
+   qt_select7 """ select k1,k2,sum(k3) from test_query_db.test where 1 = 2 
group by grouping sets((k1), (k1,k2)) """ 
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org