[iotdb] branch yanshi updated: fix bug in DistributedPlanner

[xingtanzjr]

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

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


The following commit(s) were added to refs/heads/yanshi by this push:
     new d22e7f5  fix bug in DistributedPlanner
d22e7f5 is described below

commit d22e7f5c3b3862452b7e7e18a6a74d17b0619b4d
Author: Jinrui.Zhang <xingtan...@gmail.com>
AuthorDate: Tue Mar 29 21:09:28 2022 +0800

    fix bug in DistributedPlanner
---
 .../org/apache/iotdb/db/mpp/sql/planner/DistributionPlanner.java    | 2 ++
 .../org/apache/iotdb/db/mpp/sql/planner/plan/node/PlanNode.java     | 6 +++++-
 .../java/org/apache/iotdb/db/mpp/sql/plan/QueryPlannerTest.java     | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/DistributionPlanner.java
 
b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/DistributionPlanner.java
index dac8469..af165ec 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/DistributionPlanner.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/DistributionPlanner.java
@@ -113,6 +113,8 @@ public class DistributionPlanner {
           // SeriesScanNode.
           for (DataRegionReplicaSet dataRegion : dataDistribution) {
             SeriesScanNode split = (SeriesScanNode) handle.clone();
+            // TODO: (Use a local PlanNodeIdAllocator for a query)
+            split.setId(PlanNodeIdAllocator.generateId());
             split.setDataRegionReplicaSet(dataRegion);
             sources.add(split);
           }
diff --git 
a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/PlanNode.java
 
b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/PlanNode.java
index a0d480a..1f8555e 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/PlanNode.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/PlanNode.java
@@ -33,7 +33,7 @@ public abstract class PlanNode {
   protected static final int ONE_CHILD = 1;
   protected static final int CHILD_COUNT_NO_LIMIT = -1;
 
-  private final PlanNodeId id;
+  private PlanNodeId id;
 
   protected PlanNode(PlanNodeId id) {
     requireNonNull(id, "id is null");
@@ -44,6 +44,10 @@ public abstract class PlanNode {
     return id;
   }
 
+  public void setId(PlanNodeId id) {
+    this.id = id;
+  }
+
   public abstract List<PlanNode> getChildren();
 
   public abstract void addChild(PlanNode child);
diff --git 
a/server/src/test/java/org/apache/iotdb/db/mpp/sql/plan/QueryPlannerTest.java 
b/server/src/test/java/org/apache/iotdb/db/mpp/sql/plan/QueryPlannerTest.java
index 088078a..dc74946 100644
--- 
a/server/src/test/java/org/apache/iotdb/db/mpp/sql/plan/QueryPlannerTest.java
+++ 
b/server/src/test/java/org/apache/iotdb/db/mpp/sql/plan/QueryPlannerTest.java
@@ -40,7 +40,7 @@ public class QueryPlannerTest {
   @Test
   public void TestSqlToDistributedPlan() {
 
-    String querySql = "SELECT * FROM root.sg order by time desc LIMIT 10";
+    String querySql = "SELECT d1.s1 FROM root.sg order by time desc LIMIT 10";
 
     Statement stmt = StatementGenerator.createStatement(querySql, 
ZoneId.systemDefault());