You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by en...@apache.org on 2023/06/20 01:32:33 UTC
[doris] branch master updated: [fix](Nereids): revert `push down alias into union` (#20991)
This is an automated email from the ASF dual-hosted git repository.
englefly 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 d02ecef406 [fix](Nereids): revert `push down alias into union` (#20991)
d02ecef406 is described below
commit d02ecef406d33074800448d5a165763b1e20742f
Author: jakevin <ja...@gmail.com>
AuthorDate: Tue Jun 20 09:32:26 2023 +0800
[fix](Nereids): revert `push down alias into union` (#20991)
revert #20543 to tmp avoid problem
---
.../src/main/java/org/apache/doris/nereids/rules/RuleSet.java | 4 +---
.../data/nereids_tpcds_shape_sf100_p0/shape/query2.out | 11 ++++++-----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleSet.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleSet.java
index 8e0a4c07e0..3e39cf50b6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleSet.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleSet.java
@@ -72,7 +72,6 @@ import org.apache.doris.nereids.rules.rewrite.MergeFilters;
import org.apache.doris.nereids.rules.rewrite.MergeGenerates;
import org.apache.doris.nereids.rules.rewrite.MergeLimits;
import org.apache.doris.nereids.rules.rewrite.MergeProjects;
-import org.apache.doris.nereids.rules.rewrite.PushdownAliasIntoUnionAll;
import org.apache.doris.nereids.rules.rewrite.PushdownAliasThroughJoin;
import org.apache.doris.nereids.rules.rewrite.PushdownExpressionsInHashCondition;
import org.apache.doris.nereids.rules.rewrite.PushdownFilterThroughAggregation;
@@ -137,8 +136,7 @@ public class RuleSet {
new PushdownProjectThroughCTE(),
new PushdownFilterThroughCTEAnchor(),
new PushdownProjectThroughCTEAnchor(),
- new PushdownAliasThroughJoin(),
- new PushdownAliasIntoUnionAll());
+ new PushdownAliasThroughJoin());
public static final List<Rule> IMPLEMENTATION_RULES = planRuleFactories()
.add(new LogicalCTEProduceToPhysicalCTEProduce())
diff --git a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query2.out b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query2.out
index 131dbc9eaa..329e91f73e 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query2.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query2.out
@@ -7,11 +7,12 @@ CteAnchor[cteId= ( CTEId#4=] )
--------hashAgg[LOCAL]
----------PhysicalProject
------------hashJoin[INNER_JOIN](date_dim.d_date_sk = wscs.sold_date_sk)
---------------PhysicalUnion
-----------------PhysicalProject
-------------------PhysicalOlapScan[web_sales]
-----------------PhysicalProject
-------------------PhysicalOlapScan[catalog_sales]
+--------------PhysicalProject
+----------------PhysicalUnion
+------------------PhysicalProject
+--------------------PhysicalOlapScan[web_sales]
+------------------PhysicalProject
+--------------------PhysicalOlapScan[catalog_sales]
--------------PhysicalDistribute
----------------PhysicalProject
------------------PhysicalOlapScan[date_dim]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org