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
commit 746d9415ebdc3e81fde69f427dd4d69ba0c122a1 Author: Jinrui.Zhang <[email protected]> AuthorDate: Tue Mar 29 15:42:37 2022 +0800 add more --- .../db/mpp/sql/planner/plan/node/process/OffsetNode.java | 7 +++++++ .../iotdb/db/mpp/sql/planner/plan/node/process/SortNode.java | 11 +++++++++++ .../db/mpp/sql/planner/plan/node/source/SeriesScanNode.java | 2 +- .../org/apache/iotdb/db/mpp/sql/plan/QueryPlannerTest.java | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/OffsetNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/OffsetNode.java index 294b6a6..6fef23b 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/OffsetNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/OffsetNode.java @@ -100,4 +100,11 @@ public class OffsetNode extends ProcessNode { attributes.add("RowOffset: " + this.getOffset()); return new Pair<>(title, attributes); } + + public List<String> getBoxString() { + List<String> ret = new ArrayList<>(); + ret.add(String.format("OffsetNode-%s", getId().getId())); + ret.add(String.format("Count: %d", offset)); + return ret; + } } diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/SortNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/SortNode.java index 0994d53..041c8f4 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/SortNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/SortNode.java @@ -102,4 +102,15 @@ public class SortNode extends ProcessNode { attributes.add("SortOrder: " + (this.getSortOrder() == null ? "null" : this.getSortOrder())); return new Pair<>(title, attributes); } + + public List<String> getBoxString() { + List<String> ret = new ArrayList<>(); + ret.add(String.format("SortNode-%s", getId().getId())); + ret.add(String.format("Order: %s", sortOrder)); + return ret; + } + + public String toString() { + return String.format("SortNode-%s", getId().getId()); + } } 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 e564743..9e6c04a 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 @@ -215,6 +215,6 @@ public class SeriesScanNode extends SourceNode { } private String getPartitionId() { - return getDataRegionReplicaSet() == null ? "Not Assigned" : getDataRegionReplicaSet().getId().toString(); + return getDataRegionReplicaSet() == null ? "<Not Assigned>" : getDataRegionReplicaSet().getId().toString(); } } 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 aca1dab..9918a18 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 @@ -39,7 +39,7 @@ public class QueryPlannerTest { @Test public void TestSqlToDistributedPlan() { - String querySql = "SELECT d1.*, d333.s1 FROM root.sg LIMIT 10"; + String querySql = "SELECT d1.*, d333.s1 FROM root.sg order by time desc LIMIT 10"; Statement stmt = StatementGenerator.createStatement(querySql, ZoneId.systemDefault());
