This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 3199379dc79 [fix](planner)should keep at least one slot materialized
in agg node #26116 (#26419)
3199379dc79 is described below
commit 3199379dc793b1c0facf88834412d0e0e1472294
Author: starocean999 <40539150+starocean...@users.noreply.github.com>
AuthorDate: Sat Nov 4 10:22:49 2023 +0800
[fix](planner)should keep at least one slot materialized in agg node #26116
(#26419)
---
.../org/apache/doris/analysis/AggregateInfo.java | 4 ++-
.../data/correctness_p0/test_agg_materialize.out | 4 +++
.../correctness_p0/test_agg_materialize.groovy | 35 ++++++++++++++++++++++
3 files changed, 42 insertions(+), 1 deletion(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/AggregateInfo.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/AggregateInfo.java
index 8cfc113b16c..87b3653a199 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AggregateInfo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AggregateInfo.java
@@ -905,7 +905,9 @@ public final class AggregateInfo extends AggregateInfoBase {
intermediateSlotDesc.setIsMaterialized(true);
}
- if (!slotDesc.isMaterialized()) {
+ if (!slotDesc.isMaterialized()
+ && !(i == aggregateExprsSize - 1 &&
materializedSlots.isEmpty() && groupingExprs.isEmpty())) {
+ // we need keep at least one materialized slot in agg node
continue;
}
diff --git a/regression-test/data/correctness_p0/test_agg_materialize.out
b/regression-test/data/correctness_p0/test_agg_materialize.out
new file mode 100644
index 00000000000..1969d634862
--- /dev/null
+++ b/regression-test/data/correctness_p0/test_agg_materialize.out
@@ -0,0 +1,4 @@
+-- This file is automatically generated. You should know what you did if you
want to edit this
+-- !select --
+3
+
diff --git a/regression-test/suites/correctness_p0/test_agg_materialize.groovy
b/regression-test/suites/correctness_p0/test_agg_materialize.groovy
new file mode 100644
index 00000000000..bd8dd1d1133
--- /dev/null
+++ b/regression-test/suites/correctness_p0/test_agg_materialize.groovy
@@ -0,0 +1,35 @@
+
+// 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.
+
+// The cases is copied from https://github.com/trinodb/trino/tree/master
+//
/testing/trino-product-tests/src/main/resources/sql-tests/testcases/aggregate
+// and modified by Doris.
+
+suite("test_agg_materialize") {
+ sql "set enable_nereids_planner=false"
+ qt_select """with tb1 as (select * from (select * from (select 1 k1) as t
lateral view explode([1,2,3]) tmp1 as e1)t)
+ select count(*) from (select 1, count(*)
+ from tb1
+ where e1 in (1, 2)
+ group by e1
+ union all
+ select 1, count(*)
+ from tb1
+ where e1 = 1)tttt
+ ; """
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
