This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-1.1-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.1-lts by this push:
new 408db561a0 [Bug] fix bug for grouping set query which where condition
is false (#14642)
408db561a0 is described below
commit 408db561a0d0e8ed46fb1644cb4d69e85c519117
Author: shee <[email protected]>
AuthorDate: Tue Nov 29 08:51:30 2022 +0800
[Bug] fix bug for grouping set query which where condition is false (#14642)
* [Bug] fix bug for grouping set query which where condition is false
* 1
Co-authored-by: shizhiqiang03 <[email protected]>
---
.../org/apache/doris/planner/SingleNodePlanner.java | 5 +++++
.../query_p0/grouping_sets/test_grouping_sets.out | 3 +++
.../query_p0/grouping_sets/test_grouping_sets.groovy | 20 ++++++++++++++++++++
3 files changed, 28 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 30dc5eb27e..3f6c569d68 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
@@ -78,6 +78,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;
@@ -960,6 +961,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
new file mode 100644
index 0000000000..f958424e65
--- /dev/null
+++ b/regression-test/data/query_p0/grouping_sets/test_grouping_sets.out
@@ -0,0 +1,3 @@
+-- This file is automatically generated. You should know what you did if you
want to edit this
+-- !select --
+
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
new file mode 100644
index 0000000000..de5c8c7f3e
--- /dev/null
+++ b/regression-test/suites/query_p0/grouping_sets/test_grouping_sets.groovy
@@ -0,0 +1,20 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+suite("test_grouping_sets") {
+ qt_select """ select k1,k2,sum(k3) from test_query_db.test where 1 = 2
group by grouping sets((k1), (k1,k2)) """
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
