This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/fixAbdVfDebug in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 538c94b33c86eaa57720e83e9f44859308dd84ca Author: Minghui Liu <[email protected]> AuthorDate: Thu Jul 28 09:47:59 2022 +0800 Fix the issue that FilterNode is not considered in ExchangeNodeAddr --- .../iotdb/db/mpp/plan/planner/distribution/ExchangeNodeAdder.java | 6 ++++++ .../iotdb/db/mpp/plan/planner/plan/node/process/FilterNode.java | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/ExchangeNodeAdder.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/ExchangeNodeAdder.java index 4159db3a7e..b4b542f617 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/ExchangeNodeAdder.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/ExchangeNodeAdder.java @@ -35,6 +35,7 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.DeviceMergeNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.ExchangeNode; +import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.GroupByLevelNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.LastQueryMergeNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.MultiChildNode; @@ -218,6 +219,11 @@ public class ExchangeNodeAdder extends PlanVisitor<PlanNode, NodeGroupContext> { return processOneChildNode(node, context); } + @Override + public PlanNode visitFilter(FilterNode node, NodeGroupContext context) { + return processOneChildNode(node, context); + } + private PlanNode processMultiChildNode(MultiChildNode node, NodeGroupContext context) { MultiChildNode newNode = (MultiChildNode) node.clone(); List<PlanNode> visitedChildren = new ArrayList<>(); diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/FilterNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/FilterNode.java index 0e513afbbc..a13f414f37 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/FilterNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/FilterNode.java @@ -114,6 +114,11 @@ public class FilterNode extends TransformNode { return predicate; } + @Override + public String toString() { + return "FilterNode-" + this.getPlanNodeId(); + } + @Override public boolean equals(Object o) { if (this == o) {
