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

[iotdb] 04/06: fix UT

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

hui pushed a commit to branch lmh/addOrderByInTransformNode
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 64008883d6697c11cf20b28d573676ec93648d31
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Fri Jun 24 16:55:49 2022 +0800

    fix UT
---
 .../iotdb/db/mpp/plan/plan/QueryLogicalPlanUtil.java   | 18 ++++++++++++------
 .../plan/plan/node/process/FilterNodeSerdeTest.java    |  3 ++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/QueryLogicalPlanUtil.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/QueryLogicalPlanUtil.java
index c5f7e05b19..22449695dd 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/QueryLogicalPlanUtil.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/QueryLogicalPlanUtil.java
@@ -231,7 +231,8 @@ public class QueryLogicalPlanUtil {
             new Expression[] {new TimeSeriesOperand(schemaMap.get("root.sg.d2.s1"))},
             predicate,
             false,
-            ZonedDateTime.now().getOffset());
+            ZonedDateTime.now().getOffset(),
+            OrderBy.TIMESTAMP_DESC);
 
     FilterNullNode filterNullNode =
         new FilterNullNode(
@@ -296,7 +297,8 @@ public class QueryLogicalPlanUtil {
             },
             predicate1,
             false,
-            ZonedDateTime.now().getOffset());
+            ZonedDateTime.now().getOffset(),
+            OrderBy.TIMESTAMP_ASC);
 
     List<PlanNode> sourceNodeList2 = new ArrayList<>();
     sourceNodeList2.add(
@@ -337,7 +339,8 @@ public class QueryLogicalPlanUtil {
             },
             predicate2,
             false,
-            ZonedDateTime.now().getOffset());
+            ZonedDateTime.now().getOffset(),
+            OrderBy.TIMESTAMP_DESC);
 
     Map<String, List<Integer>> deviceToMeasurementIndexesMap = new HashMap<>();
     deviceToMeasurementIndexesMap.put("root.sg.d1", Arrays.asList(1, 2, 3));
@@ -794,7 +797,8 @@ public class QueryLogicalPlanUtil {
             },
             predicate,
             false,
-            ZonedDateTime.now().getOffset());
+            ZonedDateTime.now().getOffset(),
+            OrderBy.TIMESTAMP_DESC);
 
     AggregationNode aggregationNode =
         new AggregationNode(
@@ -915,7 +919,8 @@ public class QueryLogicalPlanUtil {
             },
             predicate1,
             false,
-            ZonedDateTime.now().getOffset());
+            ZonedDateTime.now().getOffset(),
+            OrderBy.TIMESTAMP_DESC);
 
     AggregationNode aggregationNode1 =
         new AggregationNode(
@@ -973,7 +978,8 @@ public class QueryLogicalPlanUtil {
             },
             predicate2,
             false,
-            ZonedDateTime.now().getOffset());
+            ZonedDateTime.now().getOffset(),
+            OrderBy.TIMESTAMP_DESC);
 
     AggregationNode aggregationNode2 =
         new AggregationNode(
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/process/FilterNodeSerdeTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/process/FilterNodeSerdeTest.java
index 43310e8f47..bac6d75cd7 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/process/FilterNodeSerdeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/process/FilterNodeSerdeTest.java
@@ -53,7 +53,8 @@ public class FilterNodeSerdeTest {
                 new TimeSeriesOperand(new PartialPath("root.sg.d1.s1")),
                 new ConstantOperand(TSDataType.INT64, "100")),
             false,
-            ZoneId.systemDefault());
+            ZoneId.systemDefault(),
+            OrderBy.TIMESTAMP_ASC);
 
     ByteBuffer byteBuffer = ByteBuffer.allocate(1024);
     filterNode.serialize(byteBuffer);