diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterNullIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterNullIT.java index 705f4b8d9ede..2ddb7128d1a5 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterNullIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterNullIT.java @@ -46,7 +46,8 @@ public class IoTDBFilterNullIT { "CREATE DATABASE root.testNullFilter", "CREATE TIMESERIES root.testNullFilter.d1.s1 WITH DATATYPE=INT32, ENCODING=PLAIN", "CREATE TIMESERIES root.testNullFilter.d1.s2 WITH DATATYPE=BOOLEAN, ENCODING=PLAIN", - "CREATE TIMESERIES root.testNullFilter.d1.s3 WITH DATATYPE=DOUBLE, ENCODING=PLAIN" + "CREATE TIMESERIES root.testNullFilter.d1.s3 WITH DATATYPE=DOUBLE, ENCODING=PLAIN", + "CREATE ALIGNED TIMESERIES root.testNullFilter.d2(s1 INT32, s2 BOOLEAN, s3 DOUBLE);" }; private static final String[] insertSqls = @@ -54,6 +55,9 @@ public class IoTDBFilterNullIT { "INSERT INTO root.testNullFilter.d1(timestamp,s2,s3) " + "values(1, false, 11.1)", "INSERT INTO root.testNullFilter.d1(timestamp,s1,s2) " + "values(2, 22, true)", "INSERT INTO root.testNullFilter.d1(timestamp,s1,s3) " + "values(3, 23, 33.3)", + "INSERT INTO root.testNullFilter.d2(timestamp,s2,s3) " + "values(1, false, 11.1)", + "INSERT INTO root.testNullFilter.d2(timestamp,s1,s2) " + "values(2, 22, true)", + "INSERT INTO root.testNullFilter.d2(timestamp,s1,s2) " + "values(3, 22, false)", }; private static void prepareData() { @@ -128,7 +132,34 @@ public void nullFilterTest() { assertEquals(retArray.length, count); } } catch (Exception e) { - e.printStackTrace(); + fail(e.getMessage()); + } + } + + @Test + public void inPushDownTest() { + String[] retArray = new String[] {"2,22,true,null", "3,22,false,null"}; + try (Connection connectionIsNull = EnvFactory.getEnv().getConnection(); + Statement statementIsNull = connectionIsNull.createStatement()) { + int count = 0; + try (ResultSet resultSet = + statementIsNull.executeQuery( + "select * from root.testNullFilter.d2 where s1 in (22, 23)")) { + while (resultSet.next()) { + String ans = + resultSet.getString(ColumnHeaderConstant.TIME) + + "," + + resultSet.getString("root.testNullFilter.d2.s1") + + "," + + resultSet.getString("root.testNullFilter.d2.s2") + + "," + + resultSet.getString("root.testNullFilter.d2.s3"); + assertEquals(retArray[count], ans); + count++; + } + assertEquals(retArray.length, count); + } + } catch (Exception e) { fail(e.getMessage()); } } diff --git a/pom.xml b/pom.xml index 8e0df32992cc..46cc048d9600 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ 0.14.1 1.9 1.5.6-3 - 1.1.0-86d5641f-SNAPSHOT + 1.1.0-1fd60299-SNAPSHOT