Skip to content

[Fix](Nereids) fix use cbo rule hint unused because of logic reverse #39715

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
Aug 23, 2024
Merged

[Fix](Nereids) fix use cbo rule hint unused because of logic reverse #39715

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
2 changes: 1 addition & 1 deletion 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 @@ -85,7 +85,7 @@ public void execute(JobContext jobContext) {
}
if (checkHint.first) {
checkHint.second.setStatus(Hint.HintStatus.SUCCESS);
if (((UseCboRuleHint) checkHint.second).isNotUseCboRule()) {
if (!((UseCboRuleHint) checkHint.second).isNotUseCboRule()) {
currentCtx.setRewritePlan(applyCboRuleCtx.getRewritePlan());
}
return;
Expand Down
230 changes: 140 additions & 90 deletions ...on-test/data/nereids_rules_p0/infer_set_operator_distinct/infer_set_operator_distinct.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,11 @@ PhysicalResultSink
--------hashAgg[LOCAL]
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t1]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t1]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t2]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t2]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -350,11 +352,13 @@ PhysicalResultSink
--------hashAgg[LOCAL]
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------filter((t1.score > 10))
----------------PhysicalOlapScan[t1]
--------------hashAgg[LOCAL]
----------------filter((t1.score > 10))
------------------PhysicalOlapScan[t1]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------filter((t2.name = 'Test'))
----------------PhysicalOlapScan[t2]
--------------hashAgg[LOCAL]
----------------filter((t2.name = 'Test'))
------------------PhysicalOlapScan[t2]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -369,11 +373,14 @@ PhysicalResultSink
--------hashAgg[LOCAL]
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t1]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t1]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t2]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t2]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t3]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t3]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -385,9 +392,11 @@ PhysicalResultSink
--PhysicalDistribute[DistributionSpecGather]
----PhysicalExcept
------PhysicalDistribute[DistributionSpecHash]
--------PhysicalOlapScan[t1]
--------hashAgg[LOCAL]
----------PhysicalOlapScan[t1]
------PhysicalDistribute[DistributionSpecHash]
--------PhysicalOlapScan[t2]
--------hashAgg[LOCAL]
----------PhysicalOlapScan[t2]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -399,11 +408,13 @@ PhysicalResultSink
--PhysicalDistribute[DistributionSpecGather]
----PhysicalExcept
------PhysicalDistribute[DistributionSpecHash]
--------filter((t1.id > 100))
----------PhysicalOlapScan[t1]
--------hashAgg[LOCAL]
----------filter((t1.id > 100))
------------PhysicalOlapScan[t1]
------PhysicalDistribute[DistributionSpecHash]
--------filter((t2.id < 50))
----------PhysicalOlapScan[t2]
--------hashAgg[LOCAL]
----------filter((t2.id < 50))
------------PhysicalOlapScan[t2]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -415,9 +426,11 @@ PhysicalResultSink
--PhysicalDistribute[DistributionSpecGather]
----PhysicalIntersect
------PhysicalDistribute[DistributionSpecHash]
--------PhysicalOlapScan[t1]
--------hashAgg[LOCAL]
----------PhysicalOlapScan[t1]
------PhysicalDistribute[DistributionSpecHash]
--------PhysicalOlapScan[t2]
--------hashAgg[LOCAL]
----------PhysicalOlapScan[t2]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand Down Expand Up @@ -451,19 +464,24 @@ SyntaxError:
PhysicalResultSink
--PhysicalDistribute[DistributionSpecGather]
----PhysicalIntersect
------PhysicalExcept
--------hashAgg[GLOBAL]
------hashAgg[LOCAL]
--------PhysicalExcept
----------hashAgg[GLOBAL]
------------PhysicalDistribute[DistributionSpecHash]
--------------hashAgg[LOCAL]
----------------PhysicalUnion
------------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------------hashAgg[LOCAL]
----------------------PhysicalOlapScan[t1]
------------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------------hashAgg[LOCAL]
----------------------PhysicalOlapScan[t2]
----------PhysicalDistribute[DistributionSpecHash]
------------hashAgg[LOCAL]
--------------PhysicalUnion
----------------PhysicalDistribute[DistributionSpecExecutionAny]
------------------PhysicalOlapScan[t1]
----------------PhysicalDistribute[DistributionSpecExecutionAny]
------------------PhysicalOlapScan[t2]
--------PhysicalDistribute[DistributionSpecHash]
----------PhysicalOlapScan[t3]
--------------PhysicalOlapScan[t3]
------PhysicalDistribute[DistributionSpecHash]
--------PhysicalOlapScan[t4]
--------hashAgg[LOCAL]
----------PhysicalOlapScan[t4]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -478,13 +496,15 @@ PhysicalResultSink
--------hashAgg[LOCAL]
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalProject
----------------hashJoin[INNER_JOIN broadcast] hashCondition=((t1.id = t2.id)) otherCondition=()
------------------PhysicalOlapScan[t1]
------------------PhysicalProject
--------------------PhysicalOlapScan[t2]
--------------hashAgg[LOCAL]
----------------PhysicalProject
------------------hashJoin[INNER_JOIN broadcast] hashCondition=((t1.id = t2.id)) otherCondition=()
--------------------PhysicalOlapScan[t1]
--------------------PhysicalProject
----------------------PhysicalOlapScan[t2]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t3]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t3]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -499,11 +519,13 @@ PhysicalResultSink
--------hashAgg[LOCAL]
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------filter((t1.score > 10))
----------------PhysicalOlapScan[t1]
--------------hashAgg[LOCAL]
----------------filter((t1.score > 10))
------------------PhysicalOlapScan[t1]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------filter((t2.score < 5))
----------------PhysicalOlapScan[t2]
--------------hashAgg[LOCAL]
----------------filter((t2.score < 5))
------------------PhysicalOlapScan[t2]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -518,13 +540,17 @@ PhysicalResultSink
--------hashAgg[LOCAL]
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t1]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t1]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t2]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t2]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t3]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t3]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t4]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t4]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -539,12 +565,15 @@ PhysicalResultSink
--------hashAgg[LOCAL]
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t1]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalTopN[MERGE_SORT]
----------------PhysicalDistribute[DistributionSpecGather]
------------------PhysicalTopN[LOCAL_SORT]
--------------------PhysicalOlapScan[t2]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t1]
------------hashAgg[GLOBAL]
--------------PhysicalDistribute[DistributionSpecHash]
----------------hashAgg[LOCAL]
------------------PhysicalTopN[MERGE_SORT]
--------------------PhysicalDistribute[DistributionSpecGather]
----------------------PhysicalTopN[LOCAL_SORT]
------------------------PhysicalOlapScan[t2]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -559,13 +588,15 @@ PhysicalResultSink
--------hashAgg[LOCAL]
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalProject
----------------hashJoin[INNER_JOIN broadcast] hashCondition=((t1.id = t2.id)) otherCondition=()
------------------PhysicalOlapScan[t1]
------------------PhysicalProject
--------------------PhysicalOlapScan[t2]
--------------hashAgg[LOCAL]
----------------PhysicalProject
------------------hashJoin[INNER_JOIN broadcast] hashCondition=((t1.id = t2.id)) otherCondition=()
--------------------PhysicalOlapScan[t1]
--------------------PhysicalProject
----------------------PhysicalOlapScan[t2]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t3]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t3]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -580,13 +611,15 @@ PhysicalResultSink
--------hashAgg[LOCAL]
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalProject
----------------hashJoin[LEFT_OUTER_JOIN broadcast] hashCondition=((t1.id = t2.id)) otherCondition=()
------------------PhysicalOlapScan[t1]
------------------PhysicalProject
--------------------PhysicalOlapScan[t2]
--------------hashAgg[LOCAL]
----------------PhysicalProject
------------------hashJoin[LEFT_OUTER_JOIN broadcast] hashCondition=((t1.id = t2.id)) otherCondition=()
--------------------PhysicalOlapScan[t1]
--------------------PhysicalProject
----------------------PhysicalOlapScan[t2]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t3]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t3]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -600,14 +633,17 @@ PhysicalResultSink
------PhysicalDistribute[DistributionSpecHash]
--------hashAgg[LOCAL]
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalProject
----------------hashJoin[LEFT_OUTER_JOIN broadcast] hashCondition=((t1.id = t2.id)) otherCondition=()
------------hashAgg[GLOBAL]
--------------PhysicalDistribute[DistributionSpecHash]
----------------hashAgg[LOCAL]
------------------PhysicalProject
--------------------PhysicalOlapScan[t2]
------------------PhysicalOlapScan[t1]
--------------------hashJoin[LEFT_OUTER_JOIN broadcast] hashCondition=((t1.id = t2.id)) otherCondition=()
----------------------PhysicalProject
------------------------PhysicalOlapScan[t2]
----------------------PhysicalOlapScan[t1]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t3]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t3]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -621,13 +657,17 @@ PhysicalResultSink
------PhysicalDistribute[DistributionSpecHash]
--------hashAgg[LOCAL]
----------PhysicalUnion
------------PhysicalProject
--------------hashJoin[FULL_OUTER_JOIN shuffle] hashCondition=((t1.id = t2.id)) otherCondition=()
----------------PhysicalOlapScan[t1]
----------------PhysicalProject
------------------PhysicalOlapScan[t2]
------------hashAgg[GLOBAL]
--------------PhysicalDistribute[DistributionSpecHash]
----------------hashAgg[LOCAL]
------------------PhysicalProject
--------------------hashJoin[FULL_OUTER_JOIN shuffle] hashCondition=((t1.id = t2.id)) otherCondition=()
----------------------PhysicalOlapScan[t1]
----------------------PhysicalProject
------------------------PhysicalOlapScan[t2]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t3]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t3]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -642,12 +682,14 @@ PhysicalResultSink
--------hashAgg[LOCAL]
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------hashJoin[LEFT_SEMI_JOIN broadcast] hashCondition=((t1.id = t2.id)) otherCondition=()
----------------PhysicalOlapScan[t1]
----------------PhysicalProject
------------------PhysicalOlapScan[t2]
--------------hashAgg[LOCAL]
----------------hashJoin[LEFT_SEMI_JOIN broadcast] hashCondition=((t1.id = t2.id)) otherCondition=()
------------------PhysicalOlapScan[t1]
------------------PhysicalProject
--------------------PhysicalOlapScan[t2]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t3]
--------------hashAgg[LOCAL]
----------------PhysicalOlapScan[t3]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -659,10 +701,12 @@ PhysicalResultSink
--PhysicalDistribute[DistributionSpecGather]
----PhysicalExcept
------PhysicalDistribute[DistributionSpecHash]
--------PhysicalOlapScan[t1]
--------hashAgg[LOCAL]
----------PhysicalOlapScan[t1]
------PhysicalDistribute[DistributionSpecHash]
--------filter((t2.score > 10))
----------PhysicalOlapScan[t2]
--------hashAgg[LOCAL]
----------filter((t2.score > 10))
------------PhysicalOlapScan[t2]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand All @@ -673,12 +717,16 @@ SyntaxError:
PhysicalResultSink
--PhysicalDistribute[DistributionSpecGather]
----PhysicalIntersect
------PhysicalDistribute[DistributionSpecHash]
--------PhysicalProject
----------PhysicalOlapScan[t1]
------PhysicalDistribute[DistributionSpecHash]
--------PhysicalProject
----------PhysicalOlapScan[t2]
------hashAgg[GLOBAL]
--------PhysicalDistribute[DistributionSpecHash]
----------hashAgg[LOCAL]
------------PhysicalProject
--------------PhysicalOlapScan[t1]
------hashAgg[GLOBAL]
--------PhysicalDistribute[DistributionSpecHash]
----------hashAgg[LOCAL]
------------PhysicalProject
--------------PhysicalOlapScan[t2]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand Down Expand Up @@ -731,12 +779,14 @@ PhysicalResultSink
--PhysicalDistribute[DistributionSpecGather]
----PhysicalExcept
------PhysicalDistribute[DistributionSpecHash]
--------PhysicalProject
----------PhysicalOlapScan[t1]
--------hashAgg[LOCAL]
----------PhysicalProject
------------PhysicalOlapScan[t1]
------PhysicalDistribute[DistributionSpecHash]
--------PhysicalProject
----------filter((t2.score > 20))
------------PhysicalOlapScan[t2]
--------hashAgg[LOCAL]
----------PhysicalProject
------------filter((t2.score > 20))
--------------PhysicalOlapScan[t2]

Hint log:
Used: use_INFER_SET_OPERATOR_DISTINCT
Expand Down