This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new 3ad99cf584 [fix](planner)fix bug of pushing conjunct through agg node
(#23484)
3ad99cf584 is described below
commit 3ad99cf584f0f3a3064dc5ea550efec2b05082d7
Author: starocean999 <[email protected]>
AuthorDate: Sun Aug 27 22:27:25 2023 +0800
[fix](planner)fix bug of pushing conjunct through agg node (#23484)
pick from master #23483
---
.../apache/doris/planner/SingleNodePlanner.java | 2 +-
.../test_push_conjuncts_inlineview.groovy | 155 +++++++++++++++++++++
2 files changed, 156 insertions(+), 1 deletion(-)
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 5cc1b85b54..31c7c4d162 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
@@ -2724,7 +2724,7 @@ public class SingleNodePlanner {
while (sourceExpr instanceof SlotRef) {
SlotRef slotRef = (SlotRef) sourceExpr;
SlotDescriptor slotDesc = slotRef.getDesc();
- if (slotDesc.getSourceExprs().isEmpty()) {
+ if (slotDesc.getSourceExprs().size() != 1) {
break;
}
sourceExpr = slotDesc.getSourceExprs().get(0);
diff --git
a/regression-test/suites/correctness_p0/test_push_conjuncts_inlineview.groovy
b/regression-test/suites/correctness_p0/test_push_conjuncts_inlineview.groovy
new file mode 100644
index 0000000000..1276b58807
--- /dev/null
+++
b/regression-test/suites/correctness_p0/test_push_conjuncts_inlineview.groovy
@@ -0,0 +1,155 @@
+// 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_push_conjuncts_inlineview") {
+ sql """ set enable_nereids_planner=false"""
+ sql """ DROP TABLE IF EXISTS `push_conjunct_table` """
+ sql """
+ CREATE TABLE `push_conjunct_table` (
+ `a_key` varchar(255) NULL ,
+ `d_key` varchar(255) NULL ,
+ `c_key` varchar(32) NULL ,
+ `b_key` date NOT NULL
+ ) ENGINE=OLAP
+ UNIQUE KEY(`a_key`, `d_key`, `c_key`)
+ DISTRIBUTED BY HASH(`a_key`, `d_key`, `c_key`) BUCKETS 4
+ PROPERTIES (
+ "replication_allocation" = "tag.location.default: 1",
+ "in_memory" = "false",
+ "storage_format" = "V2",
+ "disable_auto_compaction" = "false"
+ );
+ """
+ explain {
+ sql("""select
+ 1
+ from
+ (
+ select
+ rank() over(
+ partition by a_key
+ , c_key
+ , d_key
+ order by
+ b_key desc
+ ) as px
+ from
+ push_conjunct_table a
+
+ union all
+ select 2 as px
+ from
+ push_conjunct_table a
+ )a
+ where
+ a.px = 1;""")
+ contains "5:VSELECT"
+ }
+
+explain {
+ sql("""SELECT *
+ FROM
+ (SELECT `a_key` AS `a_key`
+ FROM
+ (SELECT `b`.`a_key` AS `a_key`
+ FROM
+ (SELECT `a`.`a_key` AS `a_key`
+ FROM `push_conjunct_table` a) b
+ GROUP BY 1 ) t2 ) t1
+ WHERE a_key = '123';""")
+ notContains "having"
+ contains "= '123'"
+ }
+
+explain {
+ sql("""SELECT *
+ FROM
+ (SELECT `a`.`a_key` AS `a_key`,
+ now() as d
+ FROM `push_conjunct_table` a) t1
+ join
+ (SELECT `a`.`a_key` AS `a_key`,
+ b_key
+ FROM `push_conjunct_table` a) t2
+ on t1. d = t2.b_key;""")
+ notContains "VNESTED LOOP JOIN"
+ }
+
+sql """
+ WITH ttt AS
+ (SELECT c1,
+ c2,
+ c3,
+ c4,
+ c5,
+ c6,
+ c7
+ FROM
+ (SELECT '10000003' c1, '0816ffk' c2, '1' c3, 1416.0800 c4, '0816ffk'
c5, '2023-07-03 15:36:36' c6, 1 c7 ) a
+ WHERE c7 = 1 )
+ SELECT dd.c1,
+ dd.d1
+ FROM
+ (SELECT src.c1,
+
+ CASE
+ WHEN IFNULL(src.c3,'') = ''
+ OR src.c3 = '3' THEN
+ '-1'
+ WHEN src.c4 = 0 THEN
+ '0'
+ WHEN src.c4 <= 200 THEN
+ '1'
+ WHEN src.c4 > 200
+ AND src.c4 <= 500 THEN
+ '2'
+ WHEN src.c4 > 500
+ AND src.c4 <= 1000 THEN
+ '3'
+ ELSE '4'
+ END AS d1
+ FROM ttt src
+ WHERE src.c1 = '10000003'
+ GROUP BY src.c1, d1 ) dd
+ WHERE dd.d1 IN ('-1');
+"""
+
+explain {
+ sql("""SELECT max(b_key)
+ FROM
+ (SELECT a_key,
+ max(b_key) AS b_key
+ FROM
+ (SELECT a_key,
+ max(b_key) AS b_key
+ FROM push_conjunct_table
+ GROUP BY a_key
+ UNION all
+ SELECT a_key,
+ max(b_key) AS b_key
+ FROM push_conjunct_table
+ GROUP BY a_key) t2
+ GROUP BY t2.a_key ) t
+ WHERE t.a_key = "abcd"
+ GROUP BY t.a_key;""")
+ notContains "having"
+ contains "= 'abcd'"
+ }
+
+ sql """ DROP TABLE IF EXISTS `push_conjunct_table` """
+}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
