From 51adbc1104d4c6c6f9feca71d71490ee8b7b5684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E5=81=A5?= Date: Fri, 14 Jul 2023 11:41:38 +0800 Subject: [PATCH] [fix](Nereids) use groupExpr's children to make logicalPlan (#21794) 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 --- .../jobs/joinorder/hypergraph/receiver/PlanReceiver.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/receiver/PlanReceiver.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/receiver/PlanReceiver.java index be7e462b49867bf..8023d806da7abee 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/receiver/PlanReceiver.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/receiver/PlanReceiver.java @@ -306,7 +306,7 @@ private void makeLogicalExpression(Group root) { } 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 @@ private void makeLogicalExpression(Group root) { 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"); }