This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/fix_transform_align_by_device
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to
refs/heads/xingtanzjr/fix_transform_align_by_device by this push:
new bf5b8389ea fix the issue that TransformNode is not considered in
ExchangeNodeAddr
bf5b8389ea is described below
commit bf5b8389ea33ef36e505038eb4e51cdfc81c5b09
Author: Jinrui.Zhang <[email protected]>
AuthorDate: Wed Jul 13 15:38:26 2022 +0800
fix the issue that TransformNode is not considered in ExchangeNodeAddr
---
.../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) {