From da60a111d02b03089b65a6a5763a80bc52c93604 Mon Sep 17 00:00:00 2001 From: minghong Date: Tue, 12 Mar 2024 09:50:52 +0800 Subject: [PATCH] [refactor](nereids) rename PlanNode.distributeExprLists to childrenDistributeExprLists #32069 --- .../translator/PhysicalPlanTranslator.java | 24 +++++++++---------- .../org/apache/doris/planner/PlanNode.java | 14 +++++------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java index 75c29b3123..af146628ae 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java @@ -325,7 +325,7 @@ public class PhysicalPlanTranslator extends DefaultPlanVisitor> distributeExprLists = getDistributeExprs(partitionTopN.child(0)); PartitionSortNode partitionSortNode = translatePartitionSortNode( partitionTopN, inputFragment.getPlanRoot(), context); - partitionSortNode.setDistributeExprLists(distributeExprLists); + partitionSortNode.setChildrenDistributeExprLists(distributeExprLists); addPlanRoot(inputFragment, partitionSortNode, partitionTopN); // in pipeline engine, we use parallel scan by default, but it broke the rule of data distribution // we need turn of parallel scan to ensure to get correct result. @@ -1996,7 +1996,7 @@ public class PhysicalPlanTranslator extends DefaultPlanVisitorSort, we just need to add sortNode SortNode sortNode = translateSortNode(sort, inputFragment.getPlanRoot(), context); - sortNode.setDistributeExprLists(distributeExprLists); + sortNode.setChildrenDistributeExprLists(distributeExprLists); addPlanRoot(inputFragment, sortNode, sort); } else { // For mergeSort, we need to push sortInfo to exchangeNode @@ -2009,7 +2009,7 @@ public class PhysicalPlanTranslator extends DefaultPlanVisitor implements PlanStats { protected int nereidsId = -1; - private List> distributeExprLists = new ArrayList<>(); + private List> childrenDistributeExprLists = new ArrayList<>(); protected PlanNode(PlanNodeId id, ArrayList tupleIds, String planNodeName, StatisticalType statisticalType) { @@ -540,8 +540,8 @@ public abstract class PlanNode extends TreeNode implements PlanStats { expBuilder.append(detailPrefix).append("project output tuple id: ") .append(outputTupleDesc.getId().asInt()).append("\n"); } - if (!CollectionUtils.isEmpty(distributeExprLists)) { - for (List distributeExprList : distributeExprLists) { + if (!CollectionUtils.isEmpty(childrenDistributeExprLists)) { + for (List distributeExprList : childrenDistributeExprLists) { expBuilder.append(detailPrefix).append("distribute expr lists: ") .append(getExplainString(distributeExprList)).append("\n"); } @@ -638,8 +638,8 @@ public abstract class PlanNode extends TreeNode implements PlanStats { msg.addToOutputSlotIds(slotId.asInt()); } } - if (!CollectionUtils.isEmpty(distributeExprLists)) { - for (List exprList : distributeExprLists) { + if (!CollectionUtils.isEmpty(childrenDistributeExprLists)) { + for (List exprList : childrenDistributeExprLists) { msg.addToDistributeExprLists(new ArrayList<>()); for (Expr expr : exprList) { msg.distribute_expr_lists.get(msg.distribute_expr_lists.size() - 1).add(expr.treeToThrift()); @@ -1198,8 +1198,8 @@ public abstract class PlanNode extends TreeNode implements PlanStats { this.pushDownAggNoGroupingOp = pushDownAggNoGroupingOp; } - public void setDistributeExprLists(List> distributeExprLists) { - this.distributeExprLists = distributeExprLists; + public void setChildrenDistributeExprLists(List> childrenDistributeExprLists) { + this.childrenDistributeExprLists = childrenDistributeExprLists; } public TPushAggOp getPushDownAggNoGroupingOp() {