This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 1cc177c21f8 branch-3.0: [fix](nereids)fix logical repeat computefd
#47321 (#47346)
1cc177c21f8 is described below
commit 1cc177c21f8acb9fc8c1db3c83b7e23301a74f42
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jan 31 10:22:49 2025 +0800
branch-3.0: [fix](nereids)fix logical repeat computefd #47321 (#47346)
Cherry-picked from #47321
Co-authored-by: feiniaofeiafei <moail...@selectdb.com>
---
.../org/apache/doris/nereids/properties/DataTrait.java | 4 ++++
.../doris/nereids/trees/plans/logical/LogicalRepeat.java | 2 +-
.../eliminate_gby_key/eliminate_gby_key.out | Bin 0 -> 128 bytes
.../eliminate_gby_key/eliminate_gby_key.groovy | 5 +++++
4 files changed, 10 insertions(+), 1 deletion(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/DataTrait.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/DataTrait.java
index ff4756979e4..9ef4e835108 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/DataTrait.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/DataTrait.java
@@ -226,7 +226,11 @@ public class DataTrait {
fdDgBuilder.addDeps(fd.fdDg);
}
+ /**add Dependency relation for dominate and dependency*/
public void addDeps(Set<Slot> dominate, Set<Slot> dependency) {
+ if (dominate.isEmpty() || dependency.isEmpty()) {
+ return;
+ }
if (dominate.containsAll(dependency)) {
return;
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalRepeat.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalRepeat.java
index 005ac35cf99..6773c1c1a96 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalRepeat.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalRepeat.java
@@ -201,6 +201,6 @@ public class LogicalRepeat<CHILD_TYPE extends Plan> extends
LogicalUnary<CHILD_T
@Override
public void computeFd(DataTrait.Builder builder) {
- builder.addFuncDepsDG(child().getLogicalProperties().getTrait());
+ // don't generate fd
}
}
diff --git
a/regression-test/data/nereids_rules_p0/eliminate_gby_key/eliminate_gby_key.out
b/regression-test/data/nereids_rules_p0/eliminate_gby_key/eliminate_gby_key.out
new file mode 100644
index 00000000000..1ee4ca86f6d
Binary files /dev/null and
b/regression-test/data/nereids_rules_p0/eliminate_gby_key/eliminate_gby_key.out
differ
diff --git
a/regression-test/suites/nereids_rules_p0/eliminate_gby_key/eliminate_gby_key.groovy
b/regression-test/suites/nereids_rules_p0/eliminate_gby_key/eliminate_gby_key.groovy
index 9139fea3c9d..d8370318d8d 100644
---
a/regression-test/suites/nereids_rules_p0/eliminate_gby_key/eliminate_gby_key.groovy
+++
b/regression-test/suites/nereids_rules_p0/eliminate_gby_key/eliminate_gby_key.groovy
@@ -286,4 +286,9 @@ suite("eliminate_gby_key") {
""")
contains("groupByExpr=[t2_c2#19, c1#13, c3#18], outputExpr=[t2_c2#19,
c1#13, c3#18,")
}
+
+ sql "drop table if exists eli_gbk_t"
+ sql "create table eli_gbk_t(a int, b int) distributed by hash(a)
properties('replication_num'='1');"
+ sql "insert into eli_gbk_t values(1,1),(2,1),(3,1);"
+ qt_grouping """select count(1) from (select b as k, a k3, sum(b) as
sum_k1 from eli_gbk_t where b=1 group by cube(k,a)) t group by k,k3 order by
1"""
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
