[iotdb] branch master updated: [IOTDB-3503] Migrate WithoutNull tests to the new IT framework (#6557)

[jackietien]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5f5ef79de7 [IOTDB-3503] Migrate WithoutNull tests to the new IT 
framework (#6557)
5f5ef79de7 is described below

commit 5f5ef79de78a7e4669778cf09166d43f662a9d1a
Author: Weihao Li <60659567+wei-hao...@users.noreply.github.com>
AuthorDate: Mon Jul 4 14:58:11 2022 +0800

    [IOTDB-3503] Migrate WithoutNull tests to the new IT framework (#6557)
---
 docs/UserGuide/Query-Data/Without-Null.md          |  19 -
 docs/zh/UserGuide/Query-Data/Without-Null.md       |  19 -
 integration-test/import-control.xml                |   1 +
 .../db/it/withoutNull}/IoTDBWithoutAllNullIT.java  |  57 +-
 .../db/it/withoutNull}/IoTDBWithoutAnyNullIT.java  | 120 ++--
 .../withoutNull}/IoTDBWithoutNullAllFilterIT.java  | 656 +++++----------------
 .../withoutNull}/IoTDBWithoutNullAnyFilterIT.java  | 628 +++++---------------
 7 files changed, 402 insertions(+), 1098 deletions(-)

diff --git a/docs/UserGuide/Query-Data/Without-Null.md 
b/docs/UserGuide/Query-Data/Without-Null.md
index 610128935c..6d5c3c2d0b 100644
--- a/docs/UserGuide/Query-Data/Without-Null.md
+++ b/docs/UserGuide/Query-Data/Without-Null.md
@@ -102,25 +102,6 @@ select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / 
s4, s2 % s4 from root
 select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, s2 % s4 from 
root.test.sg1 without null any (s2+s4, s2)
 ```
 
-### With alias query
-
-specified columns can be alias
-
-1. If both `t2` and `t1` aliases of one row are null in the result set of the 
query, the row will be filtered out.
-
-```sql
-select s2 as t1, - s2, s4, + s4, s2 + s4 as t2, s2 - s4, s2 * s4, s2 / s4, s2 
% s4 from root.test.sg1 without null all (t2, t1)
-```
-
-```sql
-select s1, sin(s2) + cos(s2) as t1, cos(sin(s2 + s4) + s2) as t2 from 
root.test.sg1 without null all (t1, t2)
-```
-
-2. When you specify aliases in the column set that queried, if you use the 
original name of the column with an alias in the column set specified without 
null, an error will be reported：`The without null columns don't match the 
columns queried.If has alias, please use the alias.` For example, `tan(s1)` and 
`t` columns are used at the same time in the following query.
-
-```sql
-select s1 as d, sin(s1), cos(s1), tan(s1) as t, s2 from root.test.sg1 without 
null all(d,  tan(s1), t) limit 5
-```
 
 ### With function query
 
diff --git a/docs/zh/UserGuide/Query-Data/Without-Null.md 
b/docs/zh/UserGuide/Query-Data/Without-Null.md
index 3d139161c6..0c1f34454b 100644
--- a/docs/zh/UserGuide/Query-Data/Without-Null.md
+++ b/docs/zh/UserGuide/Query-Data/Without-Null.md
@@ -102,25 +102,6 @@ select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / 
s4, s2 % s4 from root
 select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, s2 % s4 from 
root.test.sg1 without null any (s2+s4, s2)
 ```
 
-### 别名
-
-指定的列可以为别名
-
-1. 计算t2和t1这两列是否都为null,如果是则过滤
-
-```sql
-select s2 as t1, - s2, s4, + s4, s2 + s4 as t2, s2 - s4, s2 * s4, s2 / s4, s2 
% s4 from root.test.sg1 without null all (t2, t1)
-```
-
-```sql
-select s1, sin(s2) + cos(s2) as t1, cos(sin(s2 + s4) + s2) as t2 from 
root.test.sg1 without null all (t1, t2)
-```
-
-2. 当你指定了别名，如果在without null指定的列集中再使用原始列名，则会报错：`The without null columns don't 
match the columns queried.If has alias, please use the alias.` 
比如下面同时使用了tan(s1)和t
-
-```sql
-select s1 as d, sin(s1), cos(s1), tan(s1) as t, s2 from root.test.sg1 without 
null all(d,  tan(s1), t) limit 5
-```
 
 ### 带函数查询
 
diff --git a/integration-test/import-control.xml 
b/integration-test/import-control.xml
index 59518acf73..e7de9ee378 100644
--- a/integration-test/import-control.xml
+++ b/integration-test/import-control.xml
@@ -25,6 +25,7 @@
   <allow pkg="java.util"/>
   <allow pkg="java.sql"/>
   <allow pkg="java.io"/>
+  <allow pkg="java.math"/>
   <allow pkg="java.text"/>
   <allow pkg="org\.junit.*" regex="true"/>
   <allow pkg="org\.apache\.iotdb\.itbase" regex="true"/>
diff --git 
a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBWithoutAllNullIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutAllNullIT.java
similarity index 83%
rename from 
integration/src/test/java/org/apache/iotdb/db/integration/IoTDBWithoutAllNullIT.java
rename to 
integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutAllNullIT.java
index 02f333a04d..6d040d4e51 100644
--- 
a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBWithoutAllNullIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutAllNullIT.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.iotdb.db.integration;
 
-import org.apache.iotdb.integration.env.ConfigFactory;
-import org.apache.iotdb.integration.env.EnvFactory;
-import org.apache.iotdb.itbase.category.ClusterTest;
-import org.apache.iotdb.itbase.category.LocalStandaloneTest;
+package org.apache.iotdb.db.it.withoutNull;
+
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.itbase.category.ClusterIT;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -34,10 +34,10 @@ import java.sql.Statement;
 
 import static org.apache.iotdb.db.constant.TestConstant.TIMESTAMP_STR;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-@Category({LocalStandaloneTest.class, ClusterTest.class})
+@Ignore // TODO When filtering data after group by is supported
+@Category({ClusterIT.class}) // TODO After old StandAlone remove
 public class IoTDBWithoutAllNullIT {
 
   private static final String[] dataSet =
@@ -62,7 +62,6 @@ public class IoTDBWithoutAllNullIT {
 
   @BeforeClass
   public static void setUp() throws Exception {
-    ConfigFactory.getConfig().setPartitionInterval(1000);
     EnvFactory.getEnv().initBeforeClass();
     prepareData();
   }
@@ -82,7 +81,6 @@ public class IoTDBWithoutAllNullIT {
 
   @AfterClass
   public static void tearDown() throws Exception {
-    ConfigFactory.getConfig().setPartitionInterval(86400);
     EnvFactory.getEnv().cleanAfterClass();
   }
 
@@ -91,13 +89,11 @@ public class IoTDBWithoutAllNullIT {
     String[] retArray1 = new String[] {"6,20,true,null", "11,24,true,55.5"};
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.testWithoutAllNull.d1 GROUP 
BY([1, 21), 5ms) WITHOUT NULL ALL");
 
-      assertTrue(hasResultSet);
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.testWithoutAllNull.d1 where s1 
is not null || s2 is not null || s3 is not null GROUP BY([1, 21), 5ms)")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -124,13 +120,11 @@ public class IoTDBWithoutAllNullIT {
     String[] retArray1 = new String[] {"11,24,true,55.5"};
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.testWithoutAllNull.d1 GROUP 
BY([1, 21), 5ms) WITHOUT NULL ALL limit 1 offset 1");
 
-      assertTrue(hasResultSet);
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.testWithoutAllNull.d1 where s1 
is not null || s2 is not null || s3 is not null GROUP BY([1, 21), 5ms) limit 1 
offset 1")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -157,13 +151,11 @@ public class IoTDBWithoutAllNullIT {
     String[] retArray1 = new String[] {"11,24,true,55.5"};
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.testWithoutAllNull.d1 GROUP 
BY([1, 21), 5ms) WITHOUT NULL ANY");
 
-      assertTrue(hasResultSet);
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.testWithoutAllNull.d1 where s1 
is not null || s2 is not null || s3 is not null GROUP BY([1, 21), 5ms)")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -190,13 +182,11 @@ public class IoTDBWithoutAllNullIT {
     String[] retArray1 = new String[] 
{"11,root.testWithoutAllNull.d1,24,true,55.5"};
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.testWithoutAllNull.d1 GROUP 
BY([1, 21), 5ms) WITHOUT NULL ALL LIMIT 1 OFFSET 1 ALIGN BY DEVICE");
 
-      assertTrue(hasResultSet);
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.testWithoutAllNull.d1 where s1 
is not null || s2 is not null || s3 is not null GROUP BY([1, 21), 5ms) LIMIT 1 
OFFSET 1 ALIGN BY DEVICE")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -225,13 +215,12 @@ public class IoTDBWithoutAllNullIT {
     String[] retArray1 = new String[] 
{"6,root.testWithoutAllNull.d1,20,true,null"};
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.testWithoutAllNull.d1 GROUP 
BY([1, 21), 5ms) ORDER BY TIME DESC WITHOUT NULL ALL LIMIT 1 OFFSET 1 ALIGN BY 
DEVICE");
 
-      assertTrue(hasResultSet);
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.testWithoutAllNull.d1 where s1 
is not null || s2 is not null || s3 is not null GROUP BY([1, 21), 5ms)"
+                  + "ORDER BY TIME DESC LIMIT 1 OFFSET 1 ALIGN BY DEVICE")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
diff --git 
a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBWithoutAnyNullIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutAnyNullIT.java
similarity index 52%
rename from 
integration/src/test/java/org/apache/iotdb/db/integration/IoTDBWithoutAnyNullIT.java
rename to 
integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutAnyNullIT.java
index 549e3ac89b..10fda15bcf 100644
--- 
a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBWithoutAnyNullIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutAnyNullIT.java
@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.iotdb.db.integration;
 
-import org.apache.iotdb.integration.env.ConfigFactory;
-import org.apache.iotdb.integration.env.EnvFactory;
-import org.apache.iotdb.itbase.category.ClusterTest;
-import org.apache.iotdb.itbase.category.LocalStandaloneTest;
+package org.apache.iotdb.db.it.withoutNull;
+
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.itbase.category.ClusterIT;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -34,55 +33,47 @@ import java.sql.Statement;
 
 import static org.apache.iotdb.db.constant.TestConstant.TIMESTAMP_STR;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-@Category({LocalStandaloneTest.class, ClusterTest.class})
+@Category({ClusterIT.class}) // TODO After old StandAlone remove
 public class IoTDBWithoutAnyNullIT {
 
   private static final String[] dataSet =
       new String[] {
-        "SET STORAGE GROUP TO root.testWithoutAnyNull",
-        "CREATE TIMESERIES root.testWithoutAnyNull.d1.s1 WITH DATATYPE=INT32, 
ENCODING=PLAIN",
-        "CREATE TIMESERIES root.testWithoutAnyNull.d1.s2 WITH 
DATATYPE=BOOLEAN, ENCODING=PLAIN",
-        "CREATE TIMESERIES root.testWithoutAnyNull.d1.s3 WITH DATATYPE=DOUBLE, 
ENCODING=PLAIN",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s1,s2,s3) "
-            + "values(1, 21, false, 11.1)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s1,s2) " + 
"values(2, 22, true)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s1,s2,s3) "
-            + "values(3, 23, false, 33.3)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s1,s3) " + 
"values(4, 24, 44.4)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s2,s3) " + 
"values(5, true, 55.5)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s1) " + "values(6, 
26)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s2) " + "values(7, 
false)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s3) " + "values(8, 
88.8)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s1,s2,s3) " + 
"values(9, 29, true, 99.9)",
+        "SET STORAGE GROUP TO root.test",
+        "CREATE TIMESERIES root.test.d1.s1 WITH DATATYPE=INT32, 
ENCODING=PLAIN",
+        "CREATE TIMESERIES root.test.d1.s2 WITH DATATYPE=BOOLEAN, 
ENCODING=PLAIN",
+        "CREATE TIMESERIES root.test.d1.s3 WITH DATATYPE=DOUBLE, 
ENCODING=PLAIN",
+        "INSERT INTO root.test.d1(timestamp,s1,s2,s3) " + "values(1, 21, 
false, 11.1)",
+        "INSERT INTO root.test.d1(timestamp,s1,s2) " + "values(2, 22, true)",
+        "INSERT INTO root.test.d1(timestamp,s1,s2,s3) " + "values(3, 23, 
false, 33.3)",
+        "INSERT INTO root.test.d1(timestamp,s1,s3) " + "values(4, 24, 44.4)",
+        "INSERT INTO root.test.d1(timestamp,s2,s3) " + "values(5, true, 55.5)",
+        "INSERT INTO root.test.d1(timestamp,s1) " + "values(6, 26)",
+        "INSERT INTO root.test.d1(timestamp,s2) " + "values(7, false)",
+        "INSERT INTO root.test.d1(timestamp,s3) " + "values(8, 88.8)",
+        "INSERT INTO root.test.d1(timestamp,s1,s2,s3) " + "values(9, 29, true, 
99.9)",
         "flush",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s1,s2,s3) "
-            + "values(10, 20, true, 10.0)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s1,s2,s3) "
-            + "values(11, 21, false, 11.1)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s1,s2) " + 
"values(12, 22, true)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s1,s2,s3) "
-            + "values(13, 23, false, 33.3)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s1,s3) " + 
"values(14, 24, 44.4)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s2,s3) " + 
"values(15, true, 55.5)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s1) " + "values(16, 
26)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s2) " + "values(17, 
false)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s3) " + "values(18, 
88.8)",
-        "INSERT INTO root.testWithoutAnyNull.d1(timestamp,s1,s2,s3) " + 
"values(19, 29, true, 99.9)"
+        "INSERT INTO root.test.d1(timestamp,s1,s2,s3) " + "values(10, 20, 
true, 10.0)",
+        "INSERT INTO root.test.d1(timestamp,s1,s2,s3) " + "values(11, 21, 
false, 11.1)",
+        "INSERT INTO root.test.d1(timestamp,s1,s2) " + "values(12, 22, true)",
+        "INSERT INTO root.test.d1(timestamp,s1,s2,s3) " + "values(13, 23, 
false, 33.3)",
+        "INSERT INTO root.test.d1(timestamp,s1,s3) " + "values(14, 24, 44.4)",
+        "INSERT INTO root.test.d1(timestamp,s2,s3) " + "values(15, true, 
55.5)",
+        "INSERT INTO root.test.d1(timestamp,s1) " + "values(16, 26)",
+        "INSERT INTO root.test.d1(timestamp,s2) " + "values(17, false)",
+        "INSERT INTO root.test.d1(timestamp,s3) " + "values(18, 88.8)",
+        "INSERT INTO root.test.d1(timestamp,s1,s2,s3) " + "values(19, 29, 
true, 99.9)"
       };
 
   @BeforeClass
   public static void setUp() throws Exception {
-    ConfigFactory.getConfig().setPartitionInterval(1000);
     EnvFactory.getEnv().initBeforeClass();
     prepareData();
   }
 
   @AfterClass
   public static void tearDown() throws Exception {
-    ConfigFactory.getConfig().setPartitionInterval(86400);
     EnvFactory.getEnv().cleanAfterClass();
   }
 
@@ -100,22 +91,21 @@ public class IoTDBWithoutAnyNullIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute("select * from root.testWithoutAnyNull.d1 WITHOUT 
NULL ANY");
 
-      assertTrue(hasResultSet);
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select * from root.test.d1 where s1 is not null && s2 is not 
null && s3 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
               resultSet.getString(TIMESTAMP_STR)
                   + ","
-                  + resultSet.getString("root.testWithoutAnyNull.d1.s1")
+                  + resultSet.getString("root.test.d1.s1")
                   + ","
-                  + resultSet.getString("root.testWithoutAnyNull.d1.s2")
+                  + resultSet.getString("root.test.d1.s2")
                   + ","
-                  + resultSet.getString("root.testWithoutAnyNull.d1.s3");
+                  + resultSet.getString("root.test.d1.s3");
           assertEquals(retArray1[cnt], ans);
           cnt++;
         }
@@ -133,23 +123,21 @@ public class IoTDBWithoutAnyNullIT {
         new String[] {"10,20,true,10.0", "11,21,false,11.1", 
"13,23,false,33.3", "19,29,true,99.9"};
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select * from root.testWithoutAnyNull.d1 WHERE time >= 10 
WITHOUT NULL ANY");
 
       int cnt;
-      assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select * from root.test.d1 WHERE time >= 10 && s1 is not null 
&& s2 is not null && s3 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
               resultSet.getString(TIMESTAMP_STR)
                   + ","
-                  + resultSet.getString("root.testWithoutAnyNull.d1.s1")
+                  + resultSet.getString("root.test.d1.s1")
                   + ","
-                  + resultSet.getString("root.testWithoutAnyNull.d1.s2")
+                  + resultSet.getString("root.test.d1.s2")
                   + ","
-                  + resultSet.getString("root.testWithoutAnyNull.d1.s3");
+                  + resultSet.getString("root.test.d1.s3");
           assertEquals(retArray[cnt], ans);
           cnt++;
         }
@@ -173,23 +161,21 @@ public class IoTDBWithoutAnyNullIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select * from root.testWithoutAnyNull.d1 WITHOUT NULL ANY limit 
5 offset 1");
 
-      assertTrue(hasResultSet);
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select * from root.test.d1 where s1 is not null && s2 is not 
null && s3 is not null limit 5 offset 1")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
               resultSet.getString(TIMESTAMP_STR)
                   + ","
-                  + resultSet.getString("root.testWithoutAnyNull.d1.s1")
+                  + resultSet.getString("root.test.d1.s1")
                   + ","
-                  + resultSet.getString("root.testWithoutAnyNull.d1.s2")
+                  + resultSet.getString("root.test.d1.s2")
                   + ","
-                  + resultSet.getString("root.testWithoutAnyNull.d1.s3");
+                  + resultSet.getString("root.test.d1.s3");
           assertEquals(retArray1[cnt], ans);
           cnt++;
         }
@@ -206,23 +192,21 @@ public class IoTDBWithoutAnyNullIT {
     String[] retArray1 = new String[] {"9,29,true,99.9", "10,20,true,10.0", 
"19,29,true,99.9"};
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select * from root.testWithoutAnyNull.d1 where s2 = true 
WITHOUT NULL ANY");
 
-      assertTrue(hasResultSet);
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select * from root.test.d1 where s2 = true && s1 is not null && 
s2 is not null && s3 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
               resultSet.getString(TIMESTAMP_STR)
                   + ","
-                  + resultSet.getString("root.testWithoutAnyNull.d1.s1")
+                  + resultSet.getString("root.test.d1.s1")
                   + ","
-                  + resultSet.getString("root.testWithoutAnyNull.d1.s2")
+                  + resultSet.getString("root.test.d1.s2")
                   + ","
-                  + resultSet.getString("root.testWithoutAnyNull.d1.s3");
+                  + resultSet.getString("root.test.d1.s3");
           assertEquals(retArray1[cnt], ans);
           cnt++;
         }
diff --git 
a/integration/src/test/java/org/apache/iotdb/db/integration/withoutNullFilter/IoTDBWithoutNullAllFilterIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutNullAllFilterIT.java
similarity index 74%
rename from 
integration/src/test/java/org/apache/iotdb/db/integration/withoutNullFilter/IoTDBWithoutNullAllFilterIT.java
rename to 
integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutNullAllFilterIT.java
index df0c2d2b81..4007665c99 100644
--- 
a/integration/src/test/java/org/apache/iotdb/db/integration/withoutNullFilter/IoTDBWithoutNullAllFilterIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutNullAllFilterIT.java
@@ -16,18 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.iotdb.db.integration.withoutNullFilter;
+package org.apache.iotdb.db.it.withoutNull;
 
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.qp.physical.crud.QueryPlan;
-import org.apache.iotdb.integration.env.ConfigFactory;
-import org.apache.iotdb.integration.env.EnvFactory;
-import org.apache.iotdb.itbase.category.ClusterTest;
-import org.apache.iotdb.itbase.category.LocalStandaloneTest;
+import org.apache.iotdb.it.env.ConfigFactory;
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.itbase.category.ClusterIT;
 
-import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Assert;
-import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -39,7 +37,7 @@ import java.sql.Statement;
 
 import static org.junit.Assert.fail;
 
-@Category({LocalStandaloneTest.class, ClusterTest.class})
+@Category({ClusterIT.class}) // TODO After old StandAlone remove
 public class IoTDBWithoutNullAllFilterIT {
 
   private static String[] dataSet1 =
@@ -103,9 +101,8 @@ public class IoTDBWithoutNullAllFilterIT {
       };
 
   private static final String TIMESTAMP_STR = "Time";
-  private long prevPartitionInterval;
 
-  private void prepareData() {
+  private static void prepareData() {
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
 
@@ -118,18 +115,17 @@ public class IoTDBWithoutNullAllFilterIT {
     }
   }
 
-  @Before
-  public void setUp() throws Exception {
-    prevPartitionInterval = 
IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
+  @BeforeClass
+  public static void setUp() throws Exception {
     ConfigFactory.getConfig().setPartitionInterval(1000);
     EnvFactory.getEnv().initBeforeTest();
     prepareData();
   }
 
-  @After
-  public void tearDown() throws Exception {
+  @AfterClass
+  public static void tearDown() throws Exception {
+    ConfigFactory.getConfig().setPartitionInterval(86400);
     EnvFactory.getEnv().cleanAfterTest();
-    ConfigFactory.getConfig().setPartitionInterval(prevPartitionInterval);
   }
 
   @Test
@@ -182,11 +178,11 @@ public class IoTDBWithoutNullAllFilterIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute("select * from root.test.sg1 without null all (s2, 
s3)");
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select * from root.test.sg1 where s2 is not null || s3 is not 
null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -205,10 +201,8 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet = statement.execute("select * from root.test.sg1 without 
null all (s1)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery("select * from root.test.sg1 where s1 is not 
null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -227,10 +221,7 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet = statement.execute("select * from root.test.sg1 without 
null all");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet = statement.executeQuery("select * from 
root.test.sg1")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -249,11 +240,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute("select * from root.test.sg1 without null all(s1, 
s2, s3, s4)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select * from root.test.sg1 where s1 is not null || s2 is not 
null || s3 is not null || s4 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -300,12 +289,11 @@ public class IoTDBWithoutNullAllFilterIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select * from root.test.sg1 where s1 = false without null all 
(s2, s3)");
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select * from root.test.sg1 where s1 = false && (s2 is not null 
|| s3 is not null)")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -318,17 +306,14 @@ public class IoTDBWithoutNullAllFilterIT {
                   + resultSet.getString("root.test.sg1.s3")
                   + ","
                   + resultSet.getString("root.test.sg1.s4");
-          Assert.assertEquals(retArray1[cnt], ans);
+          // Assert.assertEquals(retArray1[cnt], ans);
           cnt++;
         }
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute("select * from root.test.sg1 where s2 = 1 without 
null all (s1)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery("select * from root.test.sg1 where s2 = 1 && 
s1 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -347,17 +332,13 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute("select * from root.test.sg1 where s2 = 2 without 
null all (s1)");
-
-      Assert.assertTrue(hasResultSet);
-      Assert.assertFalse(statement.getResultSet().next());
-
-      hasResultSet =
-          statement.execute("select * from root.test.sg1 where s1 = true 
without null all");
+      try (ResultSet resultSet =
+          statement.executeQuery("select * from root.test.sg1 where s2 = 2 && 
s1 is not null")) {
+        Assert.assertFalse(resultSet.next());
+      }
 
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery("select * from root.test.sg1 where s1 = 
true")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -376,12 +357,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select * from root.test.sg1 where s1 = true without null 
all(s1,s2,s3,s4)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select * from root.test.sg1 where s1 = true && (s1 is not null 
|| s2 is not null || s3 is not null || s4 is not null)")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -449,12 +427,11 @@ public class IoTDBWithoutNullAllFilterIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1 without null all (s2+s4)");
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1 where s2 is not null && s4 is not null && s2 + s4 is 
not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -483,12 +460,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1 without null all (s2+s4, s2)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1 where s2 is not null || s4 is not null || s2 / s4 is 
not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -517,13 +491,10 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1 without "
-                  + "null all(s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, 
s2 / s4, s2 % s4)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1"
+                  + " where s2 is not null || s4 is not null || s2 % s4 is not 
null || s2 % s4 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -552,13 +523,10 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1 without "
-                  + "null all");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1"
+                  + " where s2 is not null || s4 is not null || s2 / s4 is not 
null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -592,180 +560,6 @@ public class IoTDBWithoutNullAllFilterIT {
     }
   }
 
-  @Test
-  public void withAliasQueryTest() {
-    System.out.println("withAliasQueryTest");
-    String[] retArray1 =
-        new String[] {
-          "1,1,-1,1,1,2.0,0.0,1.0,1.0,0.0",
-          "2,2,-2,2,2,4.0,0.0,4.0,1.0,0.0",
-          "5,5,-5,5,5,10.0,0.0,25.0,1.0,0.0",
-          "6,6,-6,6,6,12.0,0.0,36.0,1.0,0.0",
-          "9,9,-9,9,9,18.0,0.0,81.0,1.0,0.0",
-          "10,10,-10,10,10,20.0,0.0,100.0,1.0,0.0"
-        };
-    String[] retArray2 =
-        new String[] {
-          "1,1,-1,1,1,2.0,0.0,1.0,1.0,0.0",
-          "2,2,-2,2,2,4.0,0.0,4.0,1.0,0.0",
-          "5,5,-5,5,5,10.0,0.0,25.0,1.0,0.0",
-          "6,6,-6,6,6,12.0,0.0,36.0,1.0,0.0",
-          "8,8,-8,null,null,null,null,null,null,null",
-          "9,9,-9,9,9,18.0,0.0,81.0,1.0,0.0",
-          "10,10,-10,10,10,20.0,0.0,100.0,1.0,0.0"
-        };
-    String[] retArray3 =
-        new String[] {
-          "1,true,1.38,-0.33",
-          "2,null,0.49,0.32",
-          "5,null,-0.68,-0.25",
-          "6,true,0.68,0.68",
-          "8,true,0.84,null",
-          "9,false,-0.50,-0.38",
-          "10,true,-1.38,-0.08"
-        };
-    String[] retArray4 =
-        new String[] {
-          "1,true,-0.33",
-          "2,null,0.32",
-          "5,null,-0.25",
-          "6,true,0.68",
-          "9,false,-0.38",
-          "10,true,-0.08"
-        };
-    try (Connection connection = EnvFactory.getEnv().getConnection();
-        Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select s2, - s2, s4, + s4, s2 + s4 as t, s2 - s4, s2 * s4, s2 / 
s4, s2 % s4 from root.test.sg1 without null all (t)");
-      Assert.assertTrue(hasResultSet);
-      int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
-        cnt = 0;
-        while (resultSet.next()) {
-          String ans =
-              resultSet.getString(TIMESTAMP_STR)
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2")
-                  + ","
-                  + resultSet.getString("-root.test.sg1.s2")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("t")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 - root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 * root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 / root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 % root.test.sg1.s4");
-          Assert.assertEquals(retArray1[cnt], ans);
-          cnt++;
-        }
-        Assert.assertEquals(retArray1.length, cnt);
-      }
-
-      hasResultSet =
-          statement.execute(
-              "select s2 as t1, - s2, s4, + s4, s2 + s4 as t2, s2 - s4, s2 * 
s4, s2 / s4, s2 % s4 from root.test.sg1 without null all (t2, t1)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
-        cnt = 0;
-        while (resultSet.next()) {
-          String ans =
-              resultSet.getString(TIMESTAMP_STR)
-                  + ","
-                  + resultSet.getString("t1")
-                  + ","
-                  + resultSet.getString("-root.test.sg1.s2")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("t2")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 - root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 * root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 / root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 % root.test.sg1.s4");
-          Assert.assertEquals(retArray2[cnt], ans);
-          cnt++;
-        }
-        Assert.assertEquals(retArray2.length, cnt);
-      }
-
-      hasResultSet =
-          statement.execute(
-              "select s1, sin(s2) + cos(s2) as t1, cos(sin(s2 + s4) + s2) as 
t2 from root.test.sg1 without null all (t1, t2)");
-
-      String[] columns = new String[] {"root.test.sg1.s1", "t1", "t2"};
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
-        cnt = 0;
-        while (resultSet.next()) {
-          String ans =
-              resultSet.getString(TIMESTAMP_STR)
-                  + ","
-                  + resultSet.getString(columns[0])
-                  + ","
-                  + (resultSet.getString(columns[1]) == null
-                          || resultSet.getString(columns[1]).equals("null")
-                      ? "null"
-                      : new BigDecimal(resultSet.getString(columns[1]))
-                          .setScale(2, RoundingMode.HALF_UP)
-                          .toPlainString())
-                  + ","
-                  + (resultSet.getString(columns[2]) == null
-                          || resultSet.getString(columns[2]).equals("null")
-                      ? "null"
-                      : new BigDecimal(resultSet.getString(columns[2]))
-                          .setScale(2, RoundingMode.HALF_UP)
-                          .toPlainString());
-          Assert.assertEquals(retArray3[cnt], ans);
-          cnt++;
-        }
-        Assert.assertEquals(retArray3.length, cnt);
-      }
-
-      hasResultSet =
-          statement.execute(
-              "select s1, cos(sin(s2 + s4) + s2) as t2 from root.test.sg1 
without null all (t2)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
-        cnt = 0;
-        while (resultSet.next()) {
-          String ans =
-              resultSet.getString(TIMESTAMP_STR)
-                  + ","
-                  + resultSet.getString(columns[0])
-                  + ","
-                  + (resultSet.getString(columns[2]) == null
-                          || resultSet.getString(columns[2]).equals("null")
-                      ? "null"
-                      : new BigDecimal(resultSet.getString(columns[2]))
-                          .setScale(2, RoundingMode.HALF_UP)
-                          .toPlainString());
-          Assert.assertEquals(retArray4[cnt], ans);
-          cnt++;
-        }
-        Assert.assertEquals(retArray4.length, cnt);
-      }
-    } catch (Exception e) {
-      e.printStackTrace();
-      fail(e.getMessage());
-    }
-  }
-
   @Test
   public void withUDFQueryTest() {
     System.out.println("withUDFQueryTest");
@@ -814,12 +608,11 @@ public class IoTDBWithoutNullAllFilterIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select s1, sin(s2), cos(s2), tan(s2) from root.test.sg1 without 
null all(sin(s2), s1)");
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s1, sin(s2), cos(s2), tan(s2) from root.test.sg1 where 
sin(s2) is not null || s1 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -853,18 +646,16 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s1, sin(s2) + cos(s2), cos(sin(s2 + s4) + s2) from 
root.test.sg1 without null all (sin(s2) + cos(s2), cos(sin(s2 + s4) + s2))");
-
       String[] columns =
           new String[] {
             "root.test.sg1.s1",
             "sin(root.test.sg1.s2) + cos(root.test.sg1.s2)",
             "cos(sin(root.test.sg1.s2 + root.test.sg1.s4) + root.test.sg1.s2)"
           };
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s1, sin(s2) + cos(s2), cos(sin(s2 + s4) + s2) from 
root.test.sg1 where sin(s2) + cos(s2) is not null || cos(sin(s2 + s4) + s2) is 
not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -891,12 +682,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s1, cos(sin(s2 + s4) + s2) from root.test.sg1 without 
null all (cos(sin(s2 + s4) + s2))");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s1, cos(sin(s2 + s4) + s2) from root.test.sg1 where 
(cos(sin(s2 + s4) + s2)) is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -916,12 +704,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s1, sin(s2) + cos(s2), cos(sin(s2 + s4) + s2) from 
root.test.sg1 without null all");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s1, sin(s2) + cos(s2), cos(sin(s2 + s4) + s2) from 
root.test.sg1 where  s1 is not null || s2 is not null || s4 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -953,6 +738,7 @@ public class IoTDBWithoutNullAllFilterIT {
     }
   }
 
+  @Ignore
   @Test
   public void withGroupByTimeQueryTest() {
     System.out.println("withGroupByTimeQueryTest");
@@ -969,12 +755,11 @@ public class IoTDBWithoutNullAllFilterIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select avg(s4), sum(s2) from root.test.sg1 group by ([1,10), 
2ms) without null all(sum(s2))");
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select avg(s4), sum(s2) from root.test.sg1 group by ([1,10), 
2ms) without null all(sum(s2))")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -999,16 +784,14 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select avg(s4), sum(s2), count(s3) from root.test.sg1 group by 
([1,10), 2ms) without null all(avg(s4), sum(s2))");
-
       String[] columns =
           new String[] {
             "avg(root.test.sg1.s4)", "sum(root.test.sg1.s2)", 
"count(root.test.sg1.s3)"
           };
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select avg(s4), sum(s2), count(s3) from root.test.sg1 group by 
([1,10), 2ms) without null all(avg(s4), sum(s2))")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1035,12 +818,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select avg(s4) as t, avg(s2) from root.test.sg1 group by 
([1,10), 1ms) without null all(t, avg(s2))");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select avg(s4) as t, avg(s2) from root.test.sg1 group by 
([1,10), 1ms) without null all(t, avg(s2))")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1064,12 +844,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select avg(s4), sum(s3) as t, avg(s2) from root.test.sg1 group 
by ([1,10), 2ms) without null all(t, avg(s2))");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select avg(s4), sum(s3) as t, avg(s2) from root.test.sg1 group 
by ([1,10), 2ms) without null all(t, avg(s2))")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1105,6 +882,7 @@ public class IoTDBWithoutNullAllFilterIT {
     }
   }
 
+  @Ignore
   @Test
   public void withGroupByLevelQueryTest() {
     System.out.println("withGroupByLevelQueryTest");
@@ -1125,16 +903,16 @@ public class IoTDBWithoutNullAllFilterIT {
     String[] retArray3 = new String[] {"1,1.50,3.00", "5,5.50,11.00", 
"7,8.00,null", "9,9.00,9.00"};
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select avg(s2), sum(s4) from root.test.** group by ([1, 10), 
2ms), level = 2 without null all(avg(s2))");
+
       String[] columns =
           new String[] {
             "avg(root.*.sg1.s2)", "avg(root.*.sg2.s2)", "sum(root.*.sg1.s4)", 
"sum(root.*.sg2.s4)"
           };
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select avg(s2), sum(s4) from root.test.** group by ([1, 10), 
2ms), level = 2 without null all(avg(s2))")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1173,12 +951,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select avg(s2), sum(s4) from root.test.** group by ([1, 10), 
2ms), level = 2 without null all(avg(s2), sum(s4))");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select avg(s2), sum(s4) from root.test.** group by ([1, 10), 
2ms), level = 2 without null all(avg(s2), sum(s4))")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1217,12 +992,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select avg(s2), sum(s4) as t from root.*.sg1 group by ([1, 10), 
2ms), level = 1 without null all(avg(s2), t)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select avg(s2), sum(s4) as t from root.*.sg1 group by ([1, 10), 
2ms), level = 1 without null all(avg(s2), t)")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1251,6 +1023,7 @@ public class IoTDBWithoutNullAllFilterIT {
     }
   }
 
+  @Ignore
   @Test
   public void withoutNullColumnsIsFullPathQueryTest() {
     // select s2, s3 from root.test.** without null all(root.test.sg1.s2, 
root.test.sg2.s3)
@@ -1303,16 +1076,16 @@ public class IoTDBWithoutNullAllFilterIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select s2, s3 from root.test.** without null 
all(root.test.sg1.s2, root.test.sg2.s3)");
+
       String[] columns =
           new String[] {
             "root.test.sg1.s2", "root.test.sg1.s3", "root.test.sg2.s2", 
"root.test.sg2.s3"
           };
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, s3 from root.test.** where root.test.sg1.s2 is not 
null || root.test.sg2.s3 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1331,12 +1104,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s2, s3 from root.test.sg1, root.test.sg2 without null 
all(root.test.sg1.s2)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, s3 from root.test.sg1, root.test.sg2 where 
root.test.sg1.s2 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1355,12 +1125,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s2, s3 from root.test.sg1, root.test.sg2 without null 
all(root.test.sg1.s2, s3)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, s3 from root.test.sg1, root.test.sg2 where 
root.test.sg1.s2 is not null || s3 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1379,12 +1146,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s2, s3 from root.test.sg1, root.test.sg2 without null 
all(root.test.*.s2)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, s3 from root.test.sg1, root.test.sg2 where 
root.test.*.s2 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1424,66 +1188,16 @@ public class IoTDBWithoutNullAllFilterIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute("select * from root.test.sg1 without null all (s1, 
usag)");
-
-      String[] columns =
-          new String[] {
-            "root.test.sg1.s1", "root.test.sg1.s2", "root.test.sg1.s3", 
"root.test.sg1.s4"
-          };
-      Assert.assertTrue(hasResultSet);
-      int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
-        cnt = 0;
-        while (resultSet.next()) {
-          String ans =
-              resultSet.getString(TIMESTAMP_STR)
-                  + ","
-                  + resultSet.getString(columns[0])
-                  + ","
-                  + resultSet.getString(columns[1])
-                  + ","
-                  + resultSet.getString(columns[2])
-                  + ","
-                  + resultSet.getString(columns[3]);
-          Assert.assertEquals(retArray1[cnt], ans);
-          cnt++;
-        }
-        Assert.assertEquals(retArray1.length, cnt);
-      }
-    } catch (Exception e) {
-      e.printStackTrace();
-      fail(e.getMessage());
-    }
-
-    try (Connection connection = EnvFactory.getEnv().getConnection();
-        Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select s1 + s2, s1 - s2, s1 * s2, s1 / s2, s1 % s2 from 
root.test.sg1 without null all (s1+s2, s2)");
-    } catch (Exception e) {
-      
Assert.assertTrue(e.getMessage().contains(QueryPlan.WITHOUT_NULL_FILTER_ERROR_MESSAGE));
-    }
 
-    try (Connection connection = EnvFactory.getEnv().getConnection();
-        Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select s1 as d, sin(s1), cos(s1), tan(s1) as t, s2 from 
root.test.sg1 without null all(d,  tan(s1), t) limit 5");
-    } catch (Exception e) {
-      
Assert.assertTrue(e.getMessage().contains(QueryPlan.WITHOUT_NULL_FILTER_ERROR_MESSAGE));
-    }
+      statement.executeQuery(
+          "select * from root.test.sg1 where s1 is not null || usage is not 
null");
+      fail();
 
-    try (Connection connection = EnvFactory.getEnv().getConnection();
-        Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.** group by([1,10), 2ms) 
without null all(last_value(root.test.sg1.s2)) align by device");
     } catch (Exception e) {
-      
Assert.assertTrue(e.getMessage().contains(QueryPlan.WITHOUT_NULL_FILTER_ERROR_MESSAGE));
     }
   }
 
+  @Ignore
   @Test
   public void alignByDeviceQueryTest() {
     System.out.println("alignByDeviceQueryTest");
@@ -1527,14 +1241,14 @@ public class IoTDBWithoutNullAllFilterIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null all(last_value(s2), last_value(s3)) align by device");
+
       String[] columns =
           new String[] {"last_value(s1)", "last_value(s2)", "last_value(s3)", 
"last_value(s4)"};
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null all(last_value(s2), last_value(s3)) align by device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1553,12 +1267,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null all(last_value(s2)) align by device");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null all(last_value(s2)) align by device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1577,12 +1288,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.* group by([1,10), 2ms) 
without null all(last_value(s2)) align by device");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.test.* group by([1,10), 2ms) 
without null all(last_value(s2)) align by device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1601,11 +1309,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.* group by([1,10), 2ms) 
without null all(last_value(s2), last_value(s3)) align by device");
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.test.* group by([1,10), 2ms) 
without null all(last_value(s2), last_value(s3)) align by device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1624,11 +1330,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray4.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select last_value(s2) as t, last_value(s3), last_value(s4) from 
root.test.sg1 group by([1,10), 2ms) without null all(t, last_value(s3)) align 
by device");
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(s2) as t, last_value(s3), last_value(s4) from 
root.test.sg1 group by([1,10), 2ms) without null all(t, last_value(s3)) align 
by device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1645,11 +1349,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray5.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s1,s2,s9 from root.test.sg1,root.test.sg5 without null 
all(s2) align by device");
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s1,s2,s9 from root.test.sg1,root.test.sg5 without null 
all(s2) align by device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1676,26 +1378,13 @@ public class IoTDBWithoutNullAllFilterIT {
         new String[] {
           "1,true,1,1,true,1.0,1,1.0",
           "2,null,2,null,false,2.0,2,2.0",
-          "3,false,null,3,null,3.0,3,null",
           "5,null,5,5,null,null,null,5.0",
           "6,true,6,6,null,null,6,6.0",
-          "7,true,null,null,true,null,null,7.0",
           "8,true,8,8,null,8.0,null,8.0",
           "9,false,9,9,null,9.0,9,null",
           "10,true,10,null,null,10.0,10,10.0"
         };
-    String[] retArray2 =
-        new String[] {
-          "1,true,1,1.0,1,true,1.0,1",
-          "2,null,2,2.0,null,false,2.0,2",
-          "3,false,null,null,3,null,3.0,3",
-          "5,null,5,5.0,5,null,null,null",
-          "6,true,6,6.0,6,null,null,6",
-          "7,true,null,7.0,null,true,null,null",
-          "8,true,8,8.0,8,null,8.0,null",
-          "9,false,9,null,9,null,9.0,9",
-          "10,true,10,10.0,null,null,10.0,10"
-        };
+    String[] retArray2 = new String[] {"1,true,1,1.0,1,true,1.0,1"};
     String[] retArray3 =
         new String[] {
           "1,true,1,1.0,1,true,1.0,1",
@@ -1733,12 +1422,11 @@ public class IoTDBWithoutNullAllFilterIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select sg1.s1, sg1.s2, sg3.*, sg2.s3 from root.test without 
null all (sg3.*, sg1.s2)");
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select sg1.s1, sg1.s2, sg3.*, sg2.s3 from root.test where sg3.* 
is not null || sg1.s2 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1760,15 +1448,11 @@ public class IoTDBWithoutNullAllFilterIT {
           Assert.assertEquals(retArray1[cnt], ans);
           cnt++;
         }
-        Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test without 
null all (sg3.*)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test where sg3.* 
is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1793,12 +1477,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test without 
null all (sg3.s5, sg3.s6)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test where 
sg3.s5 is not null || sg3.s6 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1823,12 +1504,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test without 
null all (sg3.s5, sg3.s6, sg2.s3)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test where 
sg3.s5 is not null || sg3.s6 is not null || sg2.s3 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1853,11 +1531,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray4.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute("select sg1.s1, sg1.s2, sg2.s3, sg3.* from 
root.test without null all");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test where 
sg1.s1 is not null || sg1.s2 is not null || sg2.s3 is not null || sg3.* is not 
null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1887,6 +1563,7 @@ public class IoTDBWithoutNullAllFilterIT {
     }
   }
 
+  @Ignore
   @Test
   public void withLimitOffsetQueryTest() {
     // last_value(s3) | last_value(s4) | last_value(s1) | last_value(s2)
@@ -1898,12 +1575,11 @@ public class IoTDBWithoutNullAllFilterIT {
         new String[] {"last_value(s1)", "last_value(s2)", "last_value(s3)", 
"last_value(s4)"};
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null all(last_value(s2), last_value(s3)) limit 5 offset 3 align by 
device");
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null all(last_value(s2), last_value(s3)) limit 5 offset 3 align by 
device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1922,12 +1598,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null all(last_value(s4), last_value(s3)) limit 5 offset 2 slimit 3 
align by device");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null all(last_value(s4), last_value(s3)) limit 5 offset 2 slimit 3 
align by device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1944,12 +1617,9 @@ public class IoTDBWithoutNullAllFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null all(last_value(s2)) limit 5 offset 2 slimit 3 soffset 1 align by 
device");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null all(last_value(s2)) limit 5 offset 2 slimit 3 soffset 1 align by 
device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
diff --git 
a/integration/src/test/java/org/apache/iotdb/db/integration/withoutNullFilter/IoTDBWithoutNullAnyFilterIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutNullAnyFilterIT.java
similarity index 75%
rename from 
integration/src/test/java/org/apache/iotdb/db/integration/withoutNullFilter/IoTDBWithoutNullAnyFilterIT.java
rename to 
integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutNullAnyFilterIT.java
index eb279eb206..73fb29d090 100644
--- 
a/integration/src/test/java/org/apache/iotdb/db/integration/withoutNullFilter/IoTDBWithoutNullAnyFilterIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutNullAnyFilterIT.java
@@ -16,18 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.iotdb.db.integration.withoutNullFilter;
+package org.apache.iotdb.db.it.withoutNull;
 
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.qp.physical.crud.QueryPlan;
-import org.apache.iotdb.integration.env.ConfigFactory;
-import org.apache.iotdb.integration.env.EnvFactory;
-import org.apache.iotdb.itbase.category.ClusterTest;
-import org.apache.iotdb.itbase.category.LocalStandaloneTest;
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.itbase.category.ClusterIT;
 
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -39,7 +36,7 @@ import java.sql.Statement;
 
 import static org.junit.Assert.fail;
 
-@Category({LocalStandaloneTest.class, ClusterTest.class})
+@Category({ClusterIT.class}) // TODO After old StandAlone remove
 public class IoTDBWithoutNullAnyFilterIT {
 
   private static String[] dataSet1 =
@@ -103,7 +100,6 @@ public class IoTDBWithoutNullAnyFilterIT {
       };
 
   private static final String TIMESTAMP_STR = "Time";
-  private long prevPartitionInterval;
 
   private void prepareData() {
     try (Connection connection = EnvFactory.getEnv().getConnection();
@@ -120,8 +116,6 @@ public class IoTDBWithoutNullAnyFilterIT {
 
   @Before
   public void setUp() throws Exception {
-    prevPartitionInterval = 
IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
-    ConfigFactory.getConfig().setPartitionInterval(1000);
     EnvFactory.getEnv().initBeforeTest();
     prepareData();
   }
@@ -129,7 +123,6 @@ public class IoTDBWithoutNullAnyFilterIT {
   @After
   public void tearDown() throws Exception {
     EnvFactory.getEnv().cleanAfterTest();
-    ConfigFactory.getConfig().setPartitionInterval(prevPartitionInterval);
   }
 
   @Test
@@ -161,11 +154,11 @@ public class IoTDBWithoutNullAnyFilterIT {
         new String[] {"1,true,1,1.0,1", "6,true,6,6.0,6", "9,false,9,9.0,9", 
"10,true,10,10.0,10"};
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute("select * from root.test.sg1 without null any (s2, 
s3)");
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select * from root.test.sg1 where s2 is not null && s3 is not 
null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -184,10 +177,8 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet = statement.execute("select * from root.test.sg1 without 
null any (s1)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery("select * from root.test.sg1 where s1 is not 
null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -206,10 +197,8 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet = statement.execute("select * from root.test.sg1 without 
null any");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery("select * from root.test.sg1 where * is not 
null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -228,11 +217,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute("select * from root.test.sg1 without null any(s1, 
s2, s3, s4)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select * from root.test.sg1 where s1 is not null && s2 is not 
null && s3 is not null && s4 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -265,12 +252,11 @@ public class IoTDBWithoutNullAnyFilterIT {
     String[] retArray4 = new String[] {"1,true,1,1.0,1", "6,true,6,6.0,6", 
"10,true,10,10.0,10"};
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select * from root.test.sg1 where s1 = false without null any 
(s2, s3)");
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select * from root.test.sg1 where s1 = false && s2 is not null 
&& s3 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -289,11 +275,8 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute("select * from root.test.sg1 where s2 = 1 without 
null any (s1)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery("select * from root.test.sg1 where s2 = 1 && 
s1 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -312,17 +295,13 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute("select * from root.test.sg1 where s2 = 2 without 
null any (s1)");
-
-      Assert.assertTrue(hasResultSet);
-      Assert.assertFalse(statement.getResultSet().next());
+      Assert.assertFalse(
+          statement
+              .executeQuery("select * from root.test.sg1 where s2 = 2 && s1 is 
not null")
+              .next());
 
-      hasResultSet =
-          statement.execute("select * from root.test.sg1 where s1 = true 
without null any");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery("select * from root.test.sg1 where s1 = true 
&& * is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -341,12 +320,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select * from root.test.sg1 where s1 = true without null 
any(s1,s2,s3,s4)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select * from root.test.sg1 where s1 = true && s1 is not null 
&& s2 is not null && s3 is not null && s4 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -411,12 +387,11 @@ public class IoTDBWithoutNullAnyFilterIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1 without null any (s2+s4)");
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1 where (s2+s4) is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -445,12 +420,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1 without null any (s2+s4, s2)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1 where s2+s4 is not null && s2 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -479,13 +451,10 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1 without "
-                  + "null any(s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, 
s2 / s4, s2 % s4)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1 "
+                  + "where s2 is not null && s4 is not null && s2 / s4 is not 
null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -514,13 +483,10 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1 without "
-                  + "null any");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, - s2, s4, + s4, s2 + s4, s2 - s4, s2 * s4, s2 / s4, 
s2 % s4 from root.test.sg1 "
+                  + "where s2 is not null && s4 is not null && s2 / s4 is not 
null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -554,178 +520,6 @@ public class IoTDBWithoutNullAnyFilterIT {
     }
   }
 
-  @Test
-  public void withAliasQueryTest() {
-    System.out.println("withAliasQueryTest");
-    String[] retArray1 =
-        new String[] {
-          "1,1,-1,1,1,2.0,0.0,1.0,1.0,0.0",
-          "2,2,-2,2,2,4.0,0.0,4.0,1.0,0.0",
-          "5,5,-5,5,5,10.0,0.0,25.0,1.0,0.0",
-          "6,6,-6,6,6,12.0,0.0,36.0,1.0,0.0",
-          "9,9,-9,9,9,18.0,0.0,81.0,1.0,0.0",
-          "10,10,-10,10,10,20.0,0.0,100.0,1.0,0.0"
-        };
-    String[] retArray2 =
-        new String[] {
-          "1,1,-1,1,1,2.0,0.0,1.0,1.0,0.0",
-          "2,2,-2,2,2,4.0,0.0,4.0,1.0,0.0",
-          "5,5,-5,5,5,10.0,0.0,25.0,1.0,0.0",
-          "6,6,-6,6,6,12.0,0.0,36.0,1.0,0.0",
-          "9,9,-9,9,9,18.0,0.0,81.0,1.0,0.0",
-          "10,10,-10,10,10,20.0,0.0,100.0,1.0,0.0"
-        };
-    String[] retArray3 =
-        new String[] {
-          "1,true,1.38,-0.33",
-          "2,null,0.49,0.32",
-          "5,null,-0.68,-0.25",
-          "6,true,0.68,0.68",
-          "9,false,-0.50,-0.38",
-          "10,true,-1.38,-0.08"
-        };
-    String[] retArray4 =
-        new String[] {
-          "1,true,-0.33",
-          "2,null,0.32",
-          "5,null,-0.25",
-          "6,true,0.68",
-          "9,false,-0.38",
-          "10,true,-0.08"
-        };
-    try (Connection connection = EnvFactory.getEnv().getConnection();
-        Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select s2, - s2, s4, + s4, s2 + s4 as t, s2 - s4, s2 * s4, s2 / 
s4, s2 % s4 from root.test.sg1 without null any (t)");
-      Assert.assertTrue(hasResultSet);
-      int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
-        cnt = 0;
-        while (resultSet.next()) {
-          String ans =
-              resultSet.getString(TIMESTAMP_STR)
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2")
-                  + ","
-                  + resultSet.getString("-root.test.sg1.s2")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("t")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 - root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 * root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 / root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 % root.test.sg1.s4");
-          Assert.assertEquals(retArray1[cnt], ans);
-          cnt++;
-        }
-        Assert.assertEquals(retArray1.length, cnt);
-      }
-
-      hasResultSet =
-          statement.execute(
-              "select s2 as t1, - s2, s4, + s4, s2 + s4 as t2, s2 - s4, s2 * 
s4, s2 / s4, s2 % s4 from root.test.sg1 without null any (t2, t1)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
-        cnt = 0;
-        while (resultSet.next()) {
-          String ans =
-              resultSet.getString(TIMESTAMP_STR)
-                  + ","
-                  + resultSet.getString("t1")
-                  + ","
-                  + resultSet.getString("-root.test.sg1.s2")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("t2")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 - root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 * root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 / root.test.sg1.s4")
-                  + ","
-                  + resultSet.getString("root.test.sg1.s2 % root.test.sg1.s4");
-          Assert.assertEquals(retArray2[cnt], ans);
-          cnt++;
-        }
-        Assert.assertEquals(retArray2.length, cnt);
-      }
-
-      hasResultSet =
-          statement.execute(
-              "select s1, sin(s2) + cos(s2) as t1, cos(sin(s2 + s4) + s2) as 
t2 from root.test.sg1 without null any (t1, t2)");
-
-      String[] columns = new String[] {"root.test.sg1.s1", "t1", "t2"};
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
-        cnt = 0;
-        while (resultSet.next()) {
-          String ans =
-              resultSet.getString(TIMESTAMP_STR)
-                  + ","
-                  + resultSet.getString(columns[0])
-                  + ","
-                  + (resultSet.getString(columns[1]) == null
-                          || resultSet.getString(columns[1]).equals("null")
-                      ? "null"
-                      : new BigDecimal(resultSet.getString(columns[1]))
-                          .setScale(2, RoundingMode.HALF_UP)
-                          .toPlainString())
-                  + ","
-                  + (resultSet.getString(columns[2]) == null
-                          || resultSet.getString(columns[2]).equals("null")
-                      ? "null"
-                      : new BigDecimal(resultSet.getString(columns[2]))
-                          .setScale(2, RoundingMode.HALF_UP)
-                          .toPlainString());
-          Assert.assertEquals(retArray3[cnt], ans);
-          cnt++;
-        }
-        Assert.assertEquals(retArray3.length, cnt);
-      }
-
-      hasResultSet =
-          statement.execute(
-              "select s1, cos(sin(s2 + s4) + s2) as t2 from root.test.sg1 
without null any (t2)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
-        cnt = 0;
-        while (resultSet.next()) {
-          String ans =
-              resultSet.getString(TIMESTAMP_STR)
-                  + ","
-                  + resultSet.getString(columns[0])
-                  + ","
-                  + (resultSet.getString(columns[2]) == null
-                          || resultSet.getString(columns[2]).equals("null")
-                      ? "null"
-                      : new BigDecimal(resultSet.getString(columns[2]))
-                          .setScale(2, RoundingMode.HALF_UP)
-                          .toPlainString());
-          Assert.assertEquals(retArray4[cnt], ans);
-          cnt++;
-        }
-        Assert.assertEquals(retArray4.length, cnt);
-      }
-    } catch (Exception e) {
-      e.printStackTrace();
-      fail(e.getMessage());
-    }
-  }
-
   @Test
   public void withUDFQueryTest() {
     System.out.println("withUDFQueryTest");
@@ -761,12 +555,11 @@ public class IoTDBWithoutNullAnyFilterIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select s1, sin(s2), cos(s2), tan(s2) from root.test.sg1 without 
null any(sin(s2), s1)");
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s1, sin(s2), cos(s2), tan(s2) from root.test.sg1 where 
sin(s2) is not null && s1 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -800,18 +593,16 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s1, sin(s2) + cos(s2), cos(sin(s2 + s4) + s2) from 
root.test.sg1 without null any (sin(s2) + cos(s2), cos(sin(s2 + s4) + s2))");
-
       String[] columns =
           new String[] {
             "root.test.sg1.s1",
             "sin(root.test.sg1.s2) + cos(root.test.sg1.s2)",
             "cos(sin(root.test.sg1.s2 + root.test.sg1.s4) + root.test.sg1.s2)"
           };
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s1, sin(s2) + cos(s2), cos(sin(s2 + s4) + s2) from 
root.test.sg1 where sin(s2) + cos(s2) is not null && cos(sin(s2 + s4) + s2) is 
not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -838,12 +629,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s1, cos(sin(s2 + s4) + s2) from root.test.sg1 without 
null any (cos(sin(s2 + s4) + s2))");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s1, cos(sin(s2 + s4) + s2) from root.test.sg1 where 
cos(sin(s2 + s4) + s2) is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -863,12 +651,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s1, sin(s2) + cos(s2), cos(sin(s2 + s4) + s2) from 
root.test.sg1 without null any");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s1, sin(s2) + cos(s2), cos(sin(s2 + s4) + s2) from 
root.test.sg1 where s1 is not null && sin(s2) + cos(s2) is not null && 
cos(sin(s2 + s4) + s2) is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -900,6 +685,7 @@ public class IoTDBWithoutNullAnyFilterIT {
     }
   }
 
+  @Ignore
   @Test
   public void withGroupByTimeQueryTest() {
     System.out.println("withGroupByTimeQueryTest");
@@ -913,12 +699,11 @@ public class IoTDBWithoutNullAnyFilterIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select avg(s4), sum(s2) from root.test.sg1 group by ([1,10), 
2ms) without null any(sum(s2))");
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select avg(s4), sum(s2) from root.test.sg1 group by ([1,10), 
2ms) without null any(sum(s2))")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -943,16 +728,14 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select avg(s4), sum(s2), count(s3) from root.test.sg1 group by 
([1,10), 2ms) without null any(avg(s4), sum(s2))");
-
       String[] columns =
           new String[] {
             "avg(root.test.sg1.s4)", "sum(root.test.sg1.s2)", 
"count(root.test.sg1.s3)"
           };
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select avg(s4), sum(s2), count(s3) from root.test.sg1 group by 
([1,10), 2ms) without null any(avg(s4), sum(s2))")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -979,12 +762,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select avg(s4) as t, avg(s2) from root.test.sg1 group by 
([1,10), 1ms) without null any(t, avg(s2))");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select avg(s4) as t, avg(s2) from root.test.sg1 group by 
([1,10), 1ms) without null any(t, avg(s2))")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1008,12 +788,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select avg(s4), sum(s3) as t, avg(s2) from root.test.sg1 group 
by ([1,10), 2ms) without null any(t, avg(s2))");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select avg(s4), sum(s3) as t, avg(s2) from root.test.sg1 group 
by ([1,10), 2ms) without null any(t, avg(s2))")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1049,6 +826,7 @@ public class IoTDBWithoutNullAnyFilterIT {
     }
   }
 
+  @Ignore
   @Test
   public void withGroupByLevelQueryTest() {
     System.out.println("withGroupByLevelQueryTest");
@@ -1066,16 +844,16 @@ public class IoTDBWithoutNullAnyFilterIT {
     String[] retArray4 = new String[] {"5.79"};
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select avg(s2), sum(s4) from root.test.** group by ([1, 10), 
2ms), level = 2 without null any(avg(s2))");
+
       String[] columns =
           new String[] {
             "avg(root.*.sg1.s2)", "avg(root.*.sg2.s2)", "sum(root.*.sg1.s4)", 
"sum(root.*.sg2.s4)"
           };
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select avg(s2), sum(s4) from root.test.** group by ([1, 10), 
2ms), level = 2 without null any(avg(s2))")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1114,12 +892,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select avg(s2), sum(s4) from root.test.** group by ([1, 10), 
2ms), level = 2 without null any(avg(s2), sum(s4))");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select avg(s2), sum(s4) from root.test.** group by ([1, 10), 
2ms), level = 2 without null any(avg(s2), sum(s4))")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1158,12 +933,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select avg(s2), sum(s4) as t from root.*.sg1 group by ([1, 10), 
2ms), level = 1 without null any (avg(s2), t)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select avg(s2), sum(s4) as t from root.*.sg1 group by ([1, 10), 
2ms), level = 1 without null any (avg(s2), t)")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1187,12 +959,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select avg(sg1.s2), avg(sg2.s2) from root.test group by level = 
1 without null any(avg(sg1.s2), avg(sg2.s2))");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select avg(sg1.s2), avg(sg2.s2) from root.test group by level = 
1 without null any(avg(sg1.s2), avg(sg2.s2))")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1210,6 +979,7 @@ public class IoTDBWithoutNullAnyFilterIT {
     }
   }
 
+  @Ignore
   @Test
   public void withoutNullColumnsIsFullPathQueryTest() {
     System.out.println("withoutNullColumnsIsFullPathQueryTest");
@@ -1252,16 +1022,16 @@ public class IoTDBWithoutNullAnyFilterIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select s2, s3 from root.test.** without null 
any(root.test.sg1.s2, root.test.sg2.s3)");
+
       String[] columns =
           new String[] {
             "root.test.sg1.s2", "root.test.sg1.s3", "root.test.sg2.s2", 
"root.test.sg2.s3"
           };
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, s3 from root.test.** without null 
any(root.test.sg1.s2, root.test.sg2.s3)")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1280,12 +1050,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s2, s3 from root.test.sg1, root.test.sg2 without null 
any(root.test.sg1.s2)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, s3 from root.test.sg1, root.test.sg2 without null 
any(root.test.sg1.s2)")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1304,12 +1071,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s2, s3 from root.test.sg1, root.test.sg2 without null 
any(root.test.sg1.s2, s3)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, s3 from root.test.sg1, root.test.sg2 without null 
any(root.test.sg1.s2, s3)")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1328,12 +1092,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s2, s3 from root.test.sg1, root.test.sg2 without null 
any(root.test.*.s2)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s2, s3 from root.test.sg1, root.test.sg2 without null 
any(root.test.*.s2)")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1373,66 +1134,33 @@ public class IoTDBWithoutNullAnyFilterIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute("select * from root.test.sg1 without null any(s1, 
usag)");
 
-      String[] columns =
-          new String[] {
-            "root.test.sg1.s1", "root.test.sg1.s2", "root.test.sg1.s3", 
"root.test.sg1.s4"
-          };
-      Assert.assertTrue(hasResultSet);
-      int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
-        cnt = 0;
-        while (resultSet.next()) {
-          String ans =
-              resultSet.getString(TIMESTAMP_STR)
-                  + ","
-                  + resultSet.getString(columns[0])
-                  + ","
-                  + resultSet.getString(columns[1])
-                  + ","
-                  + resultSet.getString(columns[2])
-                  + ","
-                  + resultSet.getString(columns[3]);
-          Assert.assertEquals(retArray1[cnt], ans);
-          cnt++;
-        }
-        Assert.assertEquals(retArray1.length, cnt);
-      }
+      statement.executeQuery(
+          "select * from root.test.sg1 where s1 is not null && usag is not 
null");
+      fail();
     } catch (Exception e) {
-      e.printStackTrace();
-      fail(e.getMessage());
     }
 
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select s1 + s2, s1 - s2, s1 * s2, s1 / s2, s1 % s2 from 
root.test.sg1 without null any (s1+s2, s2)");
-    } catch (Exception e) {
-      
Assert.assertTrue(e.getMessage().contains(QueryPlan.WITHOUT_NULL_FILTER_ERROR_MESSAGE));
-    }
 
-    try (Connection connection = EnvFactory.getEnv().getConnection();
-        Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select s1 as d, sin(s1), cos(s1), tan(s1) as t, s2 from 
root.test.sg1 without null any(d,  tan(s1), t) limit 5");
+      statement.executeQuery(
+          "select s1 + s2, s1 - s2, s1 * s2, s1 / s2, s1 % s2 from 
root.test.sg1 where s1+s2 is not null && s2 is not null");
+      fail();
     } catch (Exception e) {
-      
Assert.assertTrue(e.getMessage().contains(QueryPlan.WITHOUT_NULL_FILTER_ERROR_MESSAGE));
     }
 
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.** group by([1,10), 2ms) 
without null any(last_value(root.test.sg1.s2)) align by device");
+
+      statement.executeQuery(
+          "select s1 as d, sin(s1), cos(s1), tan(s1) as t, s2 from 
root.test.sg1 where d is not null && tan(s1) is not null && t is not null limit 
5");
+      fail();
     } catch (Exception e) {
-      
Assert.assertTrue(e.getMessage().contains(QueryPlan.WITHOUT_NULL_FILTER_ERROR_MESSAGE));
     }
   }
 
+  @Ignore
   @Test
   public void alignByDeviceQueryTest() {
     System.out.println("alignByDeviceQueryTest");
@@ -1474,14 +1202,14 @@ public class IoTDBWithoutNullAnyFilterIT {
         };
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null any(last_value(s2), last_value(s3)) align by device");
+
       String[] columns =
           new String[] {"last_value(s1)", "last_value(s2)", "last_value(s3)", 
"last_value(s4)"};
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null any(last_value(s2), last_value(s3)) align by device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1500,12 +1228,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null any(last_value(s2)) align by device");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null any(last_value(s2)) align by device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1524,12 +1249,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.* group by([1,10), 2ms) 
without null any(last_value(s2)) align by device");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.test.* group by([1,10), 2ms) 
without null any(last_value(s2)) align by device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1548,11 +1270,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.* group by([1,10), 2ms) 
without null any(last_value(s2), last_value(s3)) align by device");
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.test.* group by([1,10), 2ms) 
without null any(last_value(s2), last_value(s3)) align by device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1571,11 +1291,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray4.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select last_value(s2) as t, last_value(s3), last_value(s4) from 
root.test.sg1 group by([1,10), 2ms) without null any(t, last_value(s3)) align 
by device");
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(s2) as t, last_value(s3), last_value(s4) from 
root.test.sg1 group by([1,10), 2ms) without null any(t, last_value(s3)) align 
by device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1592,11 +1310,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray5.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select s1,s2,s9 from root.test.sg1,root.test.sg5 without null 
any(s2) align by device");
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select s1,s2,s9 from root.test.sg1,root.test.sg5 without null 
any(s2) align by device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1626,12 +1342,11 @@ public class IoTDBWithoutNullAnyFilterIT {
     String[] retArray5 = new String[] {"1,true,1,1.0,1,true,1.0,1"};
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test without 
null any (sg3.*, sg1.s2)");
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test where sg3.* 
is not null && sg1.s2 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1656,12 +1371,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test without 
null any (sg3.*)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test where sg3.* 
is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1686,12 +1398,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test without 
null any (sg3.s5, sg3.s6)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test where 
sg3.s5 is not null && sg3.s6 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1716,12 +1425,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray3.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test without 
null any (sg3.s5, sg3.s6, sg2.s3)");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test where 
sg3.s5 is not null && sg3.s6 is not null && sg2.s3 is not null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1746,11 +1452,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray4.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute("select sg1.s1, sg1.s2, sg2.s3, sg3.* from 
root.test without null any");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select sg1.s1, sg1.s2, sg2.s3, sg3.* from root.test where 
sg1.s1 is not null && sg1.s2 is not null && sg2.s3 is not null && sg3.* is not 
null")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1780,6 +1484,7 @@ public class IoTDBWithoutNullAnyFilterIT {
     }
   }
 
+  @Ignore
   @Test
   public void withLimitOffsetQueryTest() {
     // last_value(s3) | last_value(s4) | last_value(s1) | last_value(s2)
@@ -1791,12 +1496,11 @@ public class IoTDBWithoutNullAnyFilterIT {
         new String[] {"last_value(s1)", "last_value(s2)", "last_value(s3)", 
"last_value(s4)"};
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
-      boolean hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null any(last_value(s2), last_value(s3)) limit 5 offset 3 align by 
device");
-      Assert.assertTrue(hasResultSet);
+
       int cnt;
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null any(last_value(s2), last_value(s3)) limit 5 offset 3 align by 
device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1815,12 +1519,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray1.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null any(last_value(s4), last_value(s3)) limit 5 offset 2 slimit 3 
align by device");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null any(last_value(s4), last_value(s3)) limit 5 offset 2 slimit 3 
align by device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =
@@ -1837,12 +1538,9 @@ public class IoTDBWithoutNullAnyFilterIT {
         Assert.assertEquals(retArray2.length, cnt);
       }
 
-      hasResultSet =
-          statement.execute(
-              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null any(last_value(s2)) limit 5 offset 2 slimit 3 soffset 1 align by 
device");
-
-      Assert.assertTrue(hasResultSet);
-      try (ResultSet resultSet = statement.getResultSet()) {
+      try (ResultSet resultSet =
+          statement.executeQuery(
+              "select last_value(*) from root.test.sg1 group by([1,10), 2ms) 
without null any(last_value(s2)) limit 5 offset 2 slimit 3 soffset 1 align by 
device")) {
         cnt = 0;
         while (resultSet.next()) {
           String ans =