You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/06/10 06:05:22 UTC

[iotdb] branch OptimizePlanPrint created (now 4bb20b300e)

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

jackietien pushed a change to branch OptimizePlanPrint
in repository https://gitbox.apache.org/repos/asf/iotdb.git


      at 4bb20b300e Optimize Plan Print

This branch includes the following new commits:

     new 4bb20b300e Optimize Plan Print

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[iotdb] 01/01: Optimize Plan Print

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 4bb20b300e7f5f2423d038c0da3f7da7fb009faa
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Fri Jun 10 14:05:06 2022 +0800

    Optimize Plan Print
---
 .../mpp/plan/planner/plan/node/process/LastQueryMergeNode.java |  3 ++-
 .../planner/plan/node/source/AlignedLastQueryScanNode.java     |  4 +++-
 .../plan/node/source/AlignedSeriesAggregationScanNode.java     | 10 ++++++++++
 .../plan/planner/plan/node/source/AlignedSeriesScanNode.java   |  4 +++-
 .../planner/plan/node/source/SeriesAggregationScanNode.java    |  1 +
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/LastQueryMergeNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/LastQueryMergeNode.java
index ae51fdf01e..51a20ea238 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/LastQueryMergeNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/LastQueryMergeNode.java
@@ -83,7 +83,8 @@ public class LastQueryMergeNode extends MultiChildNode {
 
   @Override
   public String toString() {
-    return "LastQueryMergeNode-" + this.getPlanNodeId();
+    return String.format(
+        "LastQueryMergeNode-%s:[TimeFilter: %s]", this.getPlanNodeId(), timeFilter);
   }
 
   @Override
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedLastQueryScanNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedLastQueryScanNode.java
index abb80f86b4..b138fbc73a 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedLastQueryScanNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedLastQueryScanNode.java
@@ -122,7 +122,9 @@ public class AlignedLastQueryScanNode extends SeriesSourceNode {
   public String toString() {
     return String.format(
         "AlignedLastQueryScanNode-%s:[SeriesPath: %s, DataRegion: %s]",
-        this.getPlanNodeId(), this.getSeriesPath(), this.getRegionReplicaSet());
+        this.getPlanNodeId(),
+        this.getSeriesPath().transformToPartialPath(),
+        this.getRegionReplicaSet());
   }
 
   @Override
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java
index c3f1bc2fc7..97d2fbd754 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java
@@ -284,4 +284,14 @@ public class AlignedSeriesAggregationScanNode extends SeriesAggregationSourceNod
   public Filter getPartitionTimeFilter() {
     return timeFilter;
   }
+
+  @Override
+  public String toString() {
+    return String.format(
+        "SeriesAggregationScanNode-%s:[SeriesPath: %s, Descriptor: %s, DataRegion: %s]",
+        this.getPlanNodeId(),
+        this.getAlignedPath().transformToPartialPath(),
+        this.getAggregationDescriptorList(),
+        this.getRegionReplicaSet());
+  }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedSeriesScanNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedSeriesScanNode.java
index 1af4949d50..8a279a300a 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedSeriesScanNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedSeriesScanNode.java
@@ -284,7 +284,9 @@ public class AlignedSeriesScanNode extends SeriesSourceNode {
   public String toString() {
     return String.format(
         "AlignedSeriesScanNode-%s:[SeriesPath: %s, DataRegion: %s]",
-        this.getPlanNodeId(), this.getAlignedPath(), this.getRegionReplicaSet());
+        this.getPlanNodeId(),
+        this.getAlignedPath().transformToPartialPath(),
+        this.getRegionReplicaSet());
   }
 
   @Override
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesAggregationScanNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesAggregationScanNode.java
index cb1bfdbb56..21f1cf6e16 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesAggregationScanNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesAggregationScanNode.java
@@ -296,6 +296,7 @@ public class SeriesAggregationScanNode extends SeriesAggregationSourceNode {
     return timeFilter;
   }
 
+  @Override
   public String toString() {
     return String.format(
         "SeriesAggregationScanNode-%s:[SeriesPath: %s, Descriptor: %s, DataRegion: %s]",