[iotdb] branch master updated: fix the issue that TransformNode is not considered in ExchangeNodeAddr (#6662)

[caogaofei]

This is an automated email from the ASF dual-hosted git repository.

caogaofei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 34c871e6f6 fix the issue that TransformNode is not considered in 
ExchangeNodeAddr (#6662)
34c871e6f6 is described below

commit 34c871e6f6dfc51ee4f3c91cd470c234c30f58d9
Author: Zhang.Jinrui <xingtan...@gmail.com>
AuthorDate: Thu Jul 14 10:29:37 2022 +0800

    fix the issue that TransformNode is not considered in ExchangeNodeAddr 
(#6662)
---
 .../iotdb/db/mpp/plan/planner/distribution/ExchangeNodeAdder.java   | 6 ++++++
 .../iotdb/db/mpp/plan/planner/plan/node/process/TransformNode.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 b9c49eb9c1..4159db3a7e 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
@@ -40,6 +40,7 @@ import 
org.apache.iotdb.db.mpp.plan.planner.plan.node.process.LastQueryMergeNode
 import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.MultiChildNode;
 import 
org.apache.iotdb.db.mpp.plan.planner.plan.node.process.SlidingWindowAggregationNode;
 import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.TimeJoinNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.TransformNode;
 import 
org.apache.iotdb.db.mpp.plan.planner.plan.node.source.AlignedLastQueryScanNode;
 import 
org.apache.iotdb.db.mpp.plan.planner.plan.node.source.AlignedSeriesAggregationScanNode;
 import 
org.apache.iotdb.db.mpp.plan.planner.plan.node.source.AlignedSeriesScanNode;
@@ -212,6 +213,11 @@ public class ExchangeNodeAdder extends 
PlanVisitor<PlanNode, NodeGroupContext> {
     return processMultiChildNode(node, context);
   }
 
+  @Override
+  public PlanNode visitTransform(TransformNode 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/TransformNode.java
 
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/TransformNode.java
index c57fb91317..5d07be4174 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/TransformNode.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/TransformNode.java
@@ -167,6 +167,11 @@ public class TransformNode extends ProcessNode {
     return scanOrder;
   }
 
+  @Override
+  public String toString() {
+    return "TransformNode-" + this.getPlanNodeId();
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {