[iotdb] branch rel/1.0 updated: [To rel/1.0] Fix IOTDBGroupByIT & IoTDBNullOperandIT

[jackietien]

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

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


The following commit(s) were added to refs/heads/rel/1.0 by this push:
     new 8f4cfc66bb [To rel/1.0] Fix IOTDBGroupByIT & IoTDBNullOperandIT
8f4cfc66bb is described below

commit 8f4cfc66bbe150f854cc44bb444e14385b2d6e29
Author: liuminghui233 <36565497+liuminghui...@users.noreply.github.com>
AuthorDate: Thu Dec 15 08:35:05 2022 +0800

    [To rel/1.0] Fix IOTDBGroupByIT & IoTDBNullOperandIT
---
 .../test/java/org/apache/iotdb/db/it/groupby/IOTDBGroupByIT.java    | 6 ++++--
 .../test/java/org/apache/iotdb/db/it/query/IoTDBNullOperandIT.java  | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/integration-test/src/test/java/org/apache/iotdb/db/it/groupby/IOTDBGroupByIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/db/it/groupby/IOTDBGroupByIT.java
index 63c48cd748..9d39292bb7 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/db/it/groupby/IOTDBGroupByIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/db/it/groupby/IOTDBGroupByIT.java
@@ -533,10 +533,12 @@ public class IOTDBGroupByIT {
   @Test
   public void noDataRegionTest() {
     String[] expectedHeader =
-        new String[] {count("root.test.noDataRegion.s1"), 
sum("root.test.noDataRegion.s1")};
+        new String[] {
+          TIMESTAMP_STR, count("root.test.noDataRegion.s1"), 
sum("root.test.noDataRegion.s1")
+        };
     String[] retArray = new String[] {"1,0,null,", "2,0,null,"};
     resultSetEqualWithDescOrderTest(
-        "select count(s1), sum(s1) from root.test.noDataRegion" + "GROUP BY 
([1, 3), 1ms)",
+        "select count(s1), sum(s1) from root.test.noDataRegion GROUP BY ([1, 
3), 1ms)",
         expectedHeader,
         retArray);
   }
diff --git 
a/integration-test/src/test/java/org/apache/iotdb/db/it/query/IoTDBNullOperandIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/db/it/query/IoTDBNullOperandIT.java
index b08bf9f90b..73233b3242 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/db/it/query/IoTDBNullOperandIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/db/it/query/IoTDBNullOperandIT.java
@@ -181,7 +181,8 @@ public class IoTDBNullOperandIT {
     String[] retArray = new String[] {};
     resultSetEqualTest("select s1, s3, s4 from root.** where s2>0", 
expectedHeader, retArray);
 
-    resultSetEqualTest("select s1, s3, s4 from root.** where s2", 
expectedHeader, retArray);
+    resultSetEqualTest(
+        "select s1, s3, s4 from root.** where s2 is not null", expectedHeader, 
retArray);
 
     retArray =
         new String[] {