You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/05/11 04:51:00 UTC
[iotdb] 02/02: complete basic verification
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/scheduler
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d7f4a4a8bad39b9ce8bddb071aa8f127c0a9320e
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Wed May 11 12:50:44 2022 +0800
complete basic verification
---
.../java/org/apache/iotdb/db/mpp/common/PlanFragmentId.java | 10 +++-------
.../apache/iotdb/db/mpp/common/schematree/PathPatternTree.java | 1 +
.../db/mpp/execution/fragment/FragmentInstanceManager.java | 2 +-
.../planner/plan/node/metedata/read/SchemaFetchScanNode.java | 1 +
.../db/mpp/plan/planner/plan/node/process/ExchangeNode.java | 2 +-
5 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/common/PlanFragmentId.java b/server/src/main/java/org/apache/iotdb/db/mpp/common/PlanFragmentId.java
index 01cde7ef0b..62a0d0b692 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/common/PlanFragmentId.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/common/PlanFragmentId.java
@@ -82,18 +82,14 @@ public class PlanFragmentId {
@Override
public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
PlanFragmentId that = (PlanFragmentId) o;
return id == that.id && Objects.equals(queryId, that.queryId);
}
@Override
public int hashCode() {
- return Objects.hash(queryId, id, nextFragmentInstanceId);
+ return Objects.hash(queryId, id);
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/PathPatternTree.java b/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/PathPatternTree.java
index 4002204237..d7e70aea7e 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/PathPatternTree.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/PathPatternTree.java
@@ -48,6 +48,7 @@ public class PathPatternTree {
public PathPatternTree(PathPatternNode root) {
this.root = root;
+ this.pathList = new ArrayList<>();
}
public PathPatternTree(PartialPath devicePath, String[] measurements) {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceManager.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceManager.java
index dbbed705c5..29d41fd934 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceManager.java
@@ -116,6 +116,7 @@ public class FragmentInstanceManager {
return createFragmentInstanceExecution(
scheduler, instanceId, context, driver, stateMachine, failedInstances);
} catch (Throwable t) {
+ logger.error("error when create FragmentInstanceExecution.", t);
stateMachine.failed(t);
return null;
}
@@ -127,7 +128,6 @@ public class FragmentInstanceManager {
public FragmentInstanceInfo execSchemaQueryFragmentInstance(
FragmentInstance instance, ISchemaRegion schemaRegion) {
FragmentInstanceId instanceId = instance.getId();
-
FragmentInstanceExecution execution =
instanceExecution.computeIfAbsent(
instanceId,
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchScanNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchScanNode.java
index 3a360954dd..7f0f0e9310 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchScanNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchScanNode.java
@@ -47,6 +47,7 @@ public class SchemaFetchScanNode extends SourceNode {
super(id);
this.storageGroup = storageGroup;
this.patternTree = patternTree;
+ this.patternTree.constructTree();
}
public PartialPath getStorageGroup() {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/ExchangeNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/ExchangeNode.java
index db68bb9624..fe110473c9 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/ExchangeNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/ExchangeNode.java
@@ -129,7 +129,6 @@ public class ExchangeNode extends PlanNode {
ReadWriteIOUtils.write(upstreamEndpoint.getPort(), byteBuffer);
upstreamInstanceId.serialize(byteBuffer);
upstreamPlanNodeId.serialize(byteBuffer);
- List<String> outputColumnNames = remoteSourceNode.getOutputColumnNames();
ReadWriteIOUtils.write(outputColumnNames.size(), byteBuffer);
for (String outputColumnName : outputColumnNames) {
ReadWriteIOUtils.write(outputColumnName, byteBuffer);
@@ -165,6 +164,7 @@ public class ExchangeNode extends PlanNode {
public void setRemoteSourceNode(FragmentSinkNode remoteSourceNode) {
this.remoteSourceNode = remoteSourceNode;
+ this.setOutputColumnNames(remoteSourceNode.getOutputColumnNames());
}
public void cleanChildren() {