[iotdb] branch yanshi updated: complete YEAH

[xi...@apache.org]

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 6c4a521  complete YEAH
6c4a521 is described below

commit 6c4a521c1516d4e9da7f9e6845f5e3e88187a4d9
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Tue Mar 29 15:28:42 2022 +0800

    complete YEAH
---
 .../java/org/apache/iotdb/db/mpp/sql/planner/DistributionPlanner.java | 4 ++--
 .../iotdb/db/mpp/sql/planner/plan/node/process/TimeJoinNode.java      | 1 +
 .../iotdb/db/mpp/sql/planner/plan/node/source/SeriesScanNode.java     | 2 +-
 .../test/java/org/apache/iotdb/db/mpp/sql/plan/QueryPlannerTest.java  | 4 ++--
 4 files changed, 6 insertions(+), 5 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 9991c8b..dac8469 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
@@ -65,11 +65,11 @@ public class DistributionPlanner {
 
   public DistributedQueryPlan planFragments() {
     PlanNode rootAfterRewrite = rewriteSource();
-    System.out.println("===== Step 2: Partition SourceNode =====");
+    System.out.println("\n===== Step 2: Partition SourceNode =====");
     System.out.println(PlanNodeUtil.nodeToString(rootAfterRewrite));
     PlanNodeVisualizer.printAsBox(rootAfterRewrite);
     PlanNode rootWithExchange = addExchangeNode(rootAfterRewrite);
-    System.out.println("===== Step 3: Add ExchangeNode =====");
+    System.out.println("\n===== Step 3: Add ExchangeNode =====");
     System.out.println(PlanNodeUtil.nodeToString(rootWithExchange));
     PlanNodeVisualizer.printAsBox(rootWithExchange);
     SubPlan subPlan = splitFragment(rootWithExchange);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/TimeJoinNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/TimeJoinNode.java
index 4d2dce7..a613e0f 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/TimeJoinNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/TimeJoinNode.java
@@ -145,6 +145,7 @@ public class TimeJoinNode extends ProcessNode {
   public List<String> getBoxString() {
     List<String> ret = new ArrayList<>();
     ret.add(String.format("TimeJoinNode-%s", getId().getId()));
+//    ret.add(String.format("Order: %s", mergeOrder));
     return ret;
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/source/SeriesScanNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/source/SeriesScanNode.java
index 271ae0e..e564743 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/source/SeriesScanNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/source/SeriesScanNode.java
@@ -208,7 +208,7 @@ public class SeriesScanNode extends SourceNode {
 
   public List<String> getBoxString() {
     List<String> ret = new ArrayList<>();
-    ret.add(String.format("SeriesScan-%s", getId().getId()));
+    ret.add(String.format("SeriesScanNode-%s", getId().getId()));
     ret.add(String.format("Path:%s", getSeriesPath()));
     ret.add(String.format("Partition:%s", getPartitionId()));
     return ret;
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 296a450..aca1dab 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
@@ -50,14 +50,14 @@ public class QueryPlannerTest {
                 querySql, new QueryId("query1"), new SessionInfo(), QueryType.READ));
     queryExecution.doLogicalPlan();
     System.out.printf("SQL: %s%n%n", querySql);
-    System.out.println("===== Step 1: Logical Plan =====");
+    System.out.println("\n===== Step 1: Logical Plan =====");
     System.out.println(PlanNodeUtil.nodeToString(queryExecution.getLogicalPlan().getRootNode()));
     PlanNodeVisualizer.printAsBox(queryExecution.getLogicalPlan().getRootNode());
 
     queryExecution.doDistributedPlan();
     DistributedQueryPlan distributedQueryPlan = queryExecution.getDistributedPlan();
 
-    System.out.println("===== Step 4: Split Fragment Instance =====");
+    System.out.println("\n===== Step 4: Split Fragment Instance =====");
     distributedQueryPlan.getInstances().forEach(System.out::println);
   }
 }