Skip to content

[fix](Nereids) cbo rewrite not work when not cte in query #46088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morrySnow merged 1 commit into from
May 28, 2025
Merged

[fix](Nereids) cbo rewrite not work when not cte in query #46088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/rewrite/CostBasedRewriteJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,20 @@ private Optional<Pair<Cost, GroupExpression>> getCost(CascadesContext currentCtx
// set subtree rewrite cache
currentCtx.getStatementContext().getRewrittenCteProducer()
.put(currentCtx.getCurrentTree().orElse(null), (LogicalPlan) cboCtx.getRewritePlan());
// Do post tree rewrite
CascadesContext rootCtxCopy = CascadesContext.newCurrentTreeContext(rootCtx);
Rewriter.getWholeTreeRewriterWithoutCostBasedJobs(rootCtxCopy).execute();
// Do optimize
new Optimizer(rootCtxCopy).execute();
return rootCtxCopy.getMemo().getRoot().getLowestCostPlan(
rootCtxCopy.getCurrentJobContext().getRequiredProperties());
} else {
// Do post tree rewrite
CascadesContext cboCtxCopy = CascadesContext.newCurrentTreeContext(cboCtx);
// Do optimize
new Optimizer(cboCtxCopy).execute();
return cboCtxCopy.getMemo().getRoot().getLowestCostPlan(
cboCtxCopy.getCurrentJobContext().getRequiredProperties());
}
// Do post tree rewrite
CascadesContext rootCtxCopy = CascadesContext.newCurrentTreeContext(rootCtx);
Rewriter.getWholeTreeRewriterWithoutCostBasedJobs(rootCtxCopy).execute();
// Do optimize
new Optimizer(rootCtxCopy).execute();
return rootCtxCopy.getMemo().getRoot().getLowestCostPlan(
rootCtxCopy.getCurrentJobContext().getRequiredProperties());
}
}
38 changes: 21 additions & 17 deletions regression-test/data/shape_check/tpcds_sf100/noStatsRfPrune/query8.out
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 21 additions & 17 deletions regression-test/data/shape_check/tpcds_sf100/no_stats_shape/query8.out
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 21 additions & 17 deletions regression-test/data/shape_check/tpcds_sf100/rf_prune/query8.out
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 21 additions & 17 deletions regression-test/data/shape_check/tpcds_sf100/shape/query8.out
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 21 additions & 17 deletions regression-test/data/shape_check/tpcds_sf1000/bs_downgrade_shape/query8.out
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 21 additions & 17 deletions regression-test/data/shape_check/tpcds_sf1000/hint/query8.out
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 21 additions & 17 deletions regression-test/data/shape_check/tpcds_sf1000/shape/query8.out
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 21 additions & 17 deletions regression-test/data/shape_check/tpcds_sf10t_orc/shape/query8.out
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 16 additions & 10 deletions regression-test/data/shape_check/tpch_sf1000/runtime_filter/test_pushdown_setop.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ PhysicalResultSink
--------PhysicalProject
----------hashJoin[INNER_JOIN broadcast] hashCondition=((T.l_linenumber = expr_cast(r_regionkey as BIGINT))) otherCondition=() build RFs:RF0 expr_cast(r_regionkey as BIGINT)->[cast(l_linenumber as BIGINT),o_orderkey]
------------PhysicalExcept
--------------hashAgg[GLOBAL]
----------------PhysicalDistribute[DistributionSpecHash]
------------------hashAgg[LOCAL]
--------------------PhysicalProject
----------------------PhysicalOlapScan[lineitem] apply RFs: RF0
--------------PhysicalDistribute[DistributionSpecHash]
----------------PhysicalProject
------------------PhysicalOlapScan[lineitem] apply RFs: RF0
--------------PhysicalDistribute[DistributionSpecHash]
----------------PhysicalProject
------------------PhysicalOlapScan[orders] apply RFs: RF0
----------------hashAgg[LOCAL]
------------------PhysicalProject
--------------------PhysicalOlapScan[orders] apply RFs: RF0
------------PhysicalProject
--------------PhysicalOlapScan[region]

Expand All @@ -25,12 +28,15 @@ PhysicalResultSink
----------hashJoin[INNER_JOIN broadcast] hashCondition=((expr_abs(l_linenumber) = expr_cast(r_regionkey as LARGEINT))) otherCondition=() build RFs:RF0 expr_cast(r_regionkey as LARGEINT)->[abs(cast(l_linenumber as BIGINT)),abs(o_orderkey)]
------------PhysicalProject
--------------PhysicalExcept
----------------hashAgg[GLOBAL]
------------------PhysicalDistribute[DistributionSpecHash]
--------------------hashAgg[LOCAL]
----------------------PhysicalProject
------------------------PhysicalOlapScan[lineitem] apply RFs: RF0
----------------PhysicalDistribute[DistributionSpecHash]
------------------PhysicalProject
--------------------PhysicalOlapScan[lineitem] apply RFs: RF0
----------------PhysicalDistribute[DistributionSpecHash]
------------------PhysicalProject
--------------------PhysicalOlapScan[orders] apply RFs: RF0
------------------hashAgg[LOCAL]
--------------------PhysicalProject
----------------------PhysicalOlapScan[orders] apply RFs: RF0
------------PhysicalProject
--------------PhysicalOlapScan[region]

Loading