database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](Nereids) use groupExpr's children to make logicalPlan (#21794)

Browse Source 
After mergeGroup, the children of the plan are different from GroupExpr. To avoid optimizing out-dated group, we should construct new plan with groupExpr's children rather than plan's children
This commit is contained in:
谢健
2023-07-14 11:41:38 +08:00
committed by GitHub
parent c07e2ada43
commit b2778d0724
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/receiver/PlanReceiver.java
View File

@ -306,7 +306,7 @@ public class PlanReceiver implements AbstractReceiver {
}
hasGenerated.add(groupExpression);
// process child first
// process child first, plan's child may be changed due to mergeGroup
Plan physicalPlan = groupExpression.getPlan();
for (Group child : groupExpression.children()) {
makeLogicalExpression(child);
@ -316,12 +316,12 @@ public class PlanReceiver implements AbstractReceiver {
if (physicalPlan instanceof PhysicalProject) {
PhysicalProject physicalProject = (PhysicalProject) physicalPlan;
logicalPlan = new LogicalProject<>(physicalProject.getProjects(),
physicalProject.child(0));
new GroupPlan(groupExpression.child(0)));
} else if (physicalPlan instanceof AbstractPhysicalJoin) {
AbstractPhysicalJoin physicalJoin = (AbstractPhysicalJoin) physicalPlan;
logicalPlan = new LogicalJoin<>(physicalJoin.getJoinType(), physicalJoin.getHashJoinConjuncts(),
physicalJoin.getOtherJoinConjuncts(), JoinHint.NONE, physicalJoin.getMarkJoinSlotReference(),
physicalJoin.children());
groupExpression.children().stream().map(g -> new GroupPlan(g)).collect(Collectors.toList()));
} else {
throw new RuntimeException("DPhyp can only handle join and project operator");
}