This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ty/TableIT
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/ty/TableIT by this push:
new e30117ff4aa Add IT IoTDBAlignByDeviceIT
e30117ff4aa is described below
commit e30117ff4aaa167da3f9aacfc7f08d721258a83d
Author: JackieTien97 <[email protected]>
AuthorDate: Mon Jul 22 21:12:20 2024 +0800
Add IT IoTDBAlignByDeviceIT
---
.../old/alignbydevice/IoTDBAlignByDevice2IT.java | 46 ++
.../old/alignbydevice/IoTDBAlignByDevice3IT.java | 46 ++
.../old/alignbydevice/IoTDBAlignByDeviceIT.java | 501 +++++++++++++++++++++
.../IoTDBOrderByWithAlignByDeviceIT.java | 12 +-
4 files changed, 599 insertions(+), 6 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDevice2IT.java
b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDevice2IT.java
new file mode 100644
index 00000000000..abca27ddc04
--- /dev/null
+++
b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDevice2IT.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.relational.it.query.old.alignbydevice;
+
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.ClusterIT;
+import org.apache.iotdb.itbase.category.LocalStandaloneIT;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+@RunWith(IoTDBTestRunner.class)
+@Category({LocalStandaloneIT.class, ClusterIT.class})
+public class IoTDBAlignByDevice2IT extends IoTDBAlignByDeviceIT {
+ @BeforeClass
+ public static void setUp() throws Exception {
+
EnvFactory.getEnv().getConfig().getCommonConfig().setDegreeOfParallelism(4);
+ EnvFactory.getEnv().initClusterEnvironment();
+ insertData();
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ EnvFactory.getEnv().cleanClusterEnvironment();
+ }
+}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDevice3IT.java
b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDevice3IT.java
new file mode 100644
index 00000000000..3f67ef68d91
--- /dev/null
+++
b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDevice3IT.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.relational.it.query.old.alignbydevice;
+
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.ClusterIT;
+import org.apache.iotdb.itbase.category.LocalStandaloneIT;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+@RunWith(IoTDBTestRunner.class)
+@Category({LocalStandaloneIT.class, ClusterIT.class})
+public class IoTDBAlignByDevice3IT extends IoTDBAlignByDeviceIT {
+ @BeforeClass
+ public static void setUp() throws Exception {
+ EnvFactory.getEnv().getConfig().getCommonConfig().setSeriesSlotNum(1);
+ EnvFactory.getEnv().initClusterEnvironment();
+ insertData();
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ EnvFactory.getEnv().cleanClusterEnvironment();
+ }
+}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceIT.java
b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceIT.java
new file mode 100644
index 00000000000..c28bb9ca582
--- /dev/null
+++
b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceIT.java
@@ -0,0 +1,501 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.relational.it.query.old.alignbydevice;
+
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.ClusterIT;
+import org.apache.iotdb.itbase.category.LocalStandaloneIT;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import java.sql.Connection;
+import java.sql.Statement;
+
+import static org.apache.iotdb.db.it.utils.TestUtils.tableResultSetEqualTest;
+
+@RunWith(IoTDBTestRunner.class)
+@Category({LocalStandaloneIT.class, ClusterIT.class})
+public class IoTDBAlignByDeviceIT {
+
+ private static final String DATABASE_NAME = "db";
+
+ private static final String[] sqls =
+ new String[] {
+ "CREATE DATABASE " + DATABASE_NAME,
+ "use " + DATABASE_NAME,
+ "create table vehicle(device_id STRING ID, s0 INT32 MEASUREMENT, s1
INT64 MEASUREMENT, s2 FLOAT MEASUREMENT, s3 STRING MEASUREMENT, s4 BOOLEAN
MEASUREMENT);",
+ "insert into vehicle(Time, device_id, s0) values(1,'d0', 101)",
+ "insert into vehicle(Time, device_id, s0) values(2,'d0', 198)",
+ "insert into vehicle(Time, device_id, s0) values(100,'d0', 99)",
+ "insert into vehicle(Time, device_id, s0) values(101,'d0', 99)",
+ "insert into vehicle(Time, device_id, s0) values(102,'d0', 80)",
+ "insert into vehicle(Time, device_id, s0) values(103,'d0', 99)",
+ "insert into vehicle(Time, device_id, s0) values(104,'d0', 90)",
+ "insert into vehicle(Time, device_id, s0) values(105,'d0', 99)",
+ "insert into vehicle(Time, device_id, s0) values(106,'d0', 99)",
+ "insert into vehicle(Time, device_id, s0) values(2,'d0', 10000)",
+ "insert into vehicle(Time, device_id, s0) values(50,'d0', 10000)",
+ "insert into vehicle(Time, device_id, s0) values(1000,'d0', 22222)",
+ "insert into vehicle(Time, device_id, s1) values(1,'d0', 1101)",
+ "insert into vehicle(Time, device_id, s1) values(2,'d0', 198)",
+ "insert into vehicle(Time, device_id, s1) values(100,'d0', 199)",
+ "insert into vehicle(Time, device_id, s1) values(101,'d0', 199)",
+ "insert into vehicle(Time, device_id, s1) values(102,'d0', 180)",
+ "insert into vehicle(Time, device_id, s1) values(103,'d0', 199)",
+ "insert into vehicle(Time, device_id, s1) values(104,'d0', 190)",
+ "insert into vehicle(Time, device_id, s1) values(105,'d0', 199)",
+ "insert into vehicle(Time, device_id, s1) values(2,'d0', 40000)",
+ "insert into vehicle(Time, device_id, s1) values(50,'d0', 50000)",
+ "insert into vehicle(Time, device_id, s1) values(1000,'d0', 55555)",
+ "insert into vehicle(Time, device_id, s1)
values(2000-01-01T08:00:00+08:00,'d0', 100)",
+ "insert into vehicle(Time, device_id, s2) values(1000,'d0', 55555)",
+ "insert into vehicle(Time, device_id, s2) values(2,'d0', 2.22)",
+ "insert into vehicle(Time, device_id, s2) values(3,'d0', 3.33)",
+ "insert into vehicle(Time, device_id, s2) values(4,'d0', 4.44)",
+ "insert into vehicle(Time, device_id, s2) values(102,'d0', 10.00)",
+ "insert into vehicle(Time, device_id, s2) values(105,'d0', 11.11)",
+ "insert into vehicle(Time, device_id, s2) values(1000,'d0', 1000.11)",
+ "insert into vehicle(Time, device_id, s3) values(60,'d0', 'aaaaa')",
+ "insert into vehicle(Time, device_id, s3) values(70,'d0', 'bbbbb')",
+ "insert into vehicle(Time, device_id, s3) values(80,'d0', 'ccccc')",
+ "insert into vehicle(Time, device_id, s3) values(101,'d0', 'ddddd')",
+ "insert into vehicle(Time, device_id, s3) values(102,'d0', 'fffff')",
+ "insert into vehicle(Time, device_id, s3)
values(2000-01-01T08:00:00+08:00,'d0', 'good')",
+ "insert into vehicle(Time, device_id, s4) values(100,'d0', false)",
+ "insert into vehicle(Time, device_id, s4) values(100,'d0', true)",
+ "insert into vehicle(Time, device_id, s0) values(1,'d0', 999)",
+ "insert into vehicle(Time, device_id, s0) values(1000,'d0', 888)",
+ };
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ EnvFactory.getEnv().initClusterEnvironment();
+ insertData();
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ EnvFactory.getEnv().cleanClusterEnvironment();
+ }
+
+ protected static void insertData() {
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+
+ for (String sql : sqls) {
+ statement.execute(sql);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void selectTest() {
+ String[] expectedHeader = new String[] {"Time", "device_id", "s0", "s1",
"s2", "s3", "s4"};
+ String[] retArray =
+ new String[] {
+ "1997-01-01T08:00:00.001Z,d0,101,1101,null,null,null,",
+ "1997-01-01T08:00:00.002Z,d0,10000,40000,2.22,null,null,",
+ "1997-01-01T08:00:00.003Z,d0,null,null,3.33,null,null,",
+ "1997-01-01T08:00:00.004Z,d0,null,null,4.44,null,null,",
+ "1997-01-01T08:00:00.050Z,d0,10000,50000,null,null,null,",
+ "1997-01-01T08:00:00.060Z,d0,null,null,null,aaaaa,null,",
+ "1997-01-01T08:00:00.070Z,d0,null,null,null,bbbbb,null,",
+ "1997-01-01T08:00:00.080Z,d0,null,null,null,ccccc,null,",
+ "1997-01-01T08:00:00.100Z,d0,99,199,null,null,true,",
+ "1997-01-01T08:00:00.101Z,d0,99,199,null,ddddd,null,",
+ "1997-01-01T08:00:00.102Z,d0,80,180,10.0,fffff,null,",
+ "1997-01-01T08:00:00.103Z,d0,99,199,null,null,null,",
+ "1997-01-01T08:00:00.104Z,d0,90,190,null,null,null,",
+ "1997-01-01T08:00:00.105Z,d0,99,199,11.11,null,null,",
+ "1997-01-01T08:00:00.106Z,d0,99,null,null,null,null,",
+ "1997-01-01T08:00:01.000Z,d0,22222,55555,1000.11,null,null,",
+ "2000-01-01T00:00:00.000Z,d0,null,100,null,good,null,",
+ "1997-01-01T08:00:00.001Z,d1,999,null,null,null,null,",
+ "1997-01-01T08:00:01.000Z,d1,888,null,null,null,null,",
+ };
+ tableResultSetEqualTest(
+ "select * from vehicle order by device_id", expectedHeader, retArray,
DATABASE_NAME);
+ }
+
+ @Test
+ public void selectTestWithLimitOffset1() {
+
+ String[] expectedHeader = new String[] {"Time", "device_id", "s0", "s1",
"s2", "s3", "s4"};
+ String[] retArray =
+ new String[] {
+ "1997-01-01T08:00:00.001Z,d1,999,null,null,null,null,",
+ "1997-01-01T08:00:00.002Z,d0,10000,40000,2.22,null,null,",
+ "1997-01-01T08:00:00.003Z,d0,null,null,3.33,null,null,",
+ "1997-01-01T08:00:00.004Z,d0,null,null,4.44,null,null,",
+ "1997-01-01T08:00:00.050Z,d0,10000,50000,null,null,null,",
+ };
+ tableResultSetEqualTest(
+ "select * from vehicle order by Time asc, device_id offset 1 limit 5",
+ expectedHeader,
+ retArray,
+ DATABASE_NAME);
+ }
+
+ @Test
+ public void selectTestWithLimitOffset2() {
+
+ String[] expectedHeader = new String[] {"Time", "device_id", "s0", "s1",
"s2", "s3", "s4"};
+ String[] retArray =
+ new String[] {
+ "1997-01-01T08:00:00.001Z,d1,999,null,null,null,null,",
+ "2000-01-01T00:00:00.000Z,d0,null,100,null,good,null,",
+ "1997-01-01T08:00:01.000Z,d0,22222,55555,1000.11,null,null,",
+ "1997-01-01T08:00:00.106Z,d0,99,null,null,null,null,",
+ "1997-01-01T08:00:00.105Z,d0,99,199,11.11,null,null,",
+ };
+ tableResultSetEqualTest(
+ "select * from vehicle order by device_id desc, Time desc offset 1
limit 5",
+ expectedHeader,
+ retArray,
+ DATABASE_NAME);
+ }
+
+ @Test
+ public void selectWithDuplicatedPathsTest() {
+ String[] expectedHeader = new String[] {"Time", "device_id", "s0", "s0",
"s1"};
+ String[] retArray =
+ new String[] {
+ "1997-01-01T08:00:00.001Z,d0,101,101,1101,",
+ "1997-01-01T08:00:00.002Z,d0,101,10000,40000,",
+ "1997-01-01T08:00:00.050Z,d0,10000,10000,50000,",
+ "1997-01-01T08:00:00.100Z,d0,99,99,199,",
+ "1997-01-01T08:00:00.101Z,d0,99,99,199,",
+ "1997-01-01T08:00:00.102Z,d0,80,80,180,",
+ "1997-01-01T08:00:00.103Z,d0,99,99,199,",
+ "1997-01-01T08:00:00.104Z,d0,90,90,190,",
+ "1997-01-01T08:00:00.105Z,d0,99,99,199,",
+ "1997-01-01T08:00:00.106Z,d0,99,99,null,",
+ "1997-01-01T08:00:01.000Z,d0,22222,22222,55555,",
+ "2000-01-01T00:00:00.000Z,d0,null,null,100,",
+ "1997-01-01T08:00:00.001Z,d1,999,999,null,",
+ "1997-01-01T08:00:01.000Z,d1,888,888,null,",
+ };
+ tableResultSetEqualTest(
+ "select s0,s0,s1 from vehicle where device_id = 'd0' or device_id =
'd1' order by device_id",
+ expectedHeader,
+ retArray,
+ DATABASE_NAME);
+ }
+
+ @Test
+ public void selectLimitTest() {
+ String[] expectedHeader = new String[] {"Time", "device_id", "s0", "s0",
"s1"};
+ String[] retArray =
+ new String[] {
+ "1997-01-01T08:00:00.002Z,d0,101,10000,40000,",
+ "1997-01-01T08:00:00.050Z,d0,10000,10000,50000,",
+ "1997-01-01T08:00:00.100Z,d0,99,99,199,",
+ "1997-01-01T08:00:00.101Z,d0,99,99,199,",
+ "1997-01-01T08:00:00.102Z,d0,80,80,180,",
+ "1997-01-01T08:00:00.103Z,d0,99,99,199,",
+ "1997-01-01T08:00:00.104Z,d0,90,90,190,",
+ "1997-01-01T08:00:00.105Z,d0,99,99,199,",
+ "1997-01-01T08:00:00.106Z,d0,99,99,null,",
+ "1997-01-01T08:00:01.000Z,d0,22222,22222,55555,",
+ };
+ tableResultSetEqualTest(
+ "select s0,s0,s1 from vehicle order by device_id offset 1 limit 10",
+ expectedHeader,
+ retArray,
+ DATABASE_NAME);
+ }
+
+ @Test
+ public void selectWithValueFilterTest() {
+
+ String[] expectedHeader = new String[] {"Time", "device_id", "s0", "s1",
"s2", "s3", "s4"};
+ String[] retArray =
+ new String[] {
+ "1997-01-01T08:00:00.100Z,d0,99,199,null,null,true,",
+ "1997-01-01T08:00:00.101Z,d0,99,199,null,ddddd,null,",
+ "1997-01-01T08:00:00.102Z,d0,80,180,10.0,fffff,null,",
+ "1997-01-01T08:00:00.103Z,d0,99,199,null,null,null,",
+ "1997-01-01T08:00:00.104Z,d0,90,190,null,null,null,",
+ "1997-01-01T08:00:00.105Z,d0,99,199,11.11,null,null,",
+ };
+ tableResultSetEqualTest(
+ "select * from vehicle where s0 > 0 AND s1 < 200 order by device_id",
+ expectedHeader,
+ retArray,
+ DATABASE_NAME);
+ }
+
+ @Test
+ public void selectDifferentSeriesWithValueFilterWithoutCacheTest() {
+
+ String[] expectedHeader = new String[] {"Time", "device_id", "s0"};
+ String[] retArray =
+ new String[] {
+ "1997-01-01T08:00:00.100Z,d0,99,",
+ "1997-01-01T08:00:00.101Z,d0,99,",
+ "1997-01-01T08:00:00.102Z,d0,80,",
+ "1997-01-01T08:00:00.103Z,d0,99,",
+ "1997-01-01T08:00:00.104Z,d0,90,",
+ "1997-01-01T08:00:00.105Z,d0,99,",
+ "2000-01-01T00:00:00.000Z,d0,null",
+ };
+ tableResultSetEqualTest(
+ "select s0 from root.vehicle.d0 where s1 < 200 order by device_id",
+ expectedHeader,
+ retArray,
+ DATABASE_NAME);
+ }
+
+ @Test
+ public void selectDifferentSeriesWithBinaryValueFilterWithoutCacheTest() {
+
+ String[] expectedHeader = new String[] {"Time", "device_id", "s0"};
+ String[] retArray =
+ new String[] {
+ "1997-01-01T08:00:00.105Z,d0,99,",
+ };
+ tableResultSetEqualTest(
+ "select s0 from root.vehicle.d0 where s1 < 200 and s2 > 10 order by
device_id",
+ expectedHeader,
+ retArray,
+ DATABASE_NAME);
+ }
+
+ //
+ // @Test
+ // public void aggregateTest() {
+ // String[] retArray =
+ // new String[] {"root.vehicle.d0,11,11,6,6,1,",
"root.vehicle.d1,2,null,null,null,null,"};
+ //
+ // try (Connection connection = EnvFactory.getEnv().getConnection();
+ // Statement statement = connection.createStatement()) {
+ //
+ // try (ResultSet resultSet =
+ // statement.executeQuery(
+ // "select count(s0),count(s1),count(s2),count(s3),count(s4) "
+ // + "from root.vehicle.d1,root.vehicle.d0 align by
device")) {
+ // ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
+ // List<Integer> actualIndexToExpectedIndexList =
+ // checkHeader(
+ // resultSetMetaData,
+ // "Device,count(s0),count(s1),count(s2),count(s3),count(s4)",
+ // new int[] {
+ // Types.VARCHAR,
+ // Types.BIGINT,
+ // Types.BIGINT,
+ // Types.BIGINT,
+ // Types.BIGINT,
+ // Types.BIGINT,
+ // });
+ //
+ // int cnt = 0;
+ // while (resultSet.next()) {
+ // String[] expectedStrings = retArray[cnt].split(",");
+ // StringBuilder expectedBuilder = new StringBuilder();
+ // StringBuilder actualBuilder = new StringBuilder();
+ // for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
+ // actualBuilder.append(resultSet.getString(i)).append(",");
+ // expectedBuilder
+ //
.append(expectedStrings[actualIndexToExpectedIndexList.get(i - 1)])
+ // .append(",");
+ // }
+ // Assert.assertEquals(expectedBuilder.toString(),
actualBuilder.toString());
+ // cnt++;
+ // }
+ // Assert.assertEquals(retArray.length, cnt);
+ // }
+ // } catch (Exception e) {
+ // e.printStackTrace();
+ // fail(e.getMessage());
+ // }
+ // }
+ //
+ // @Test
+ // public void groupByTimeTest() {
+ // String[] retArray =
+ // new String[] {
+ // "2,root.vehicle.d0,1,1,3,0,0,",
+ // "22,root.vehicle.d0,0,0,0,0,0,",
+ // "42,root.vehicle.d0,0,0,0,0,0,",
+ // "2,root.vehicle.d1,0,null,null,null,null,",
+ // "22,root.vehicle.d1,0,null,null,null,null,",
+ // "42,root.vehicle.d1,0,null,null,null,null,"
+ // };
+ //
+ // try (Connection connection = EnvFactory.getEnv().getConnection();
+ // Statement statement = connection.createStatement()) {
+ //
+ // try (ResultSet resultSet =
+ // statement.executeQuery(
+ // "select count(*) from root.vehicle.** GROUP BY ([2,50),20ms)
align by device")) {
+ // ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
+ // List<Integer> actualIndexToExpectedIndexList =
+ // checkHeader(
+ // resultSetMetaData,
+ //
"Time,Device,count(s0),count(s1),count(s2),count(s3),count(s4)",
+ // new int[] {
+ // Types.TIMESTAMP,
+ // Types.VARCHAR,
+ // Types.BIGINT,
+ // Types.BIGINT,
+ // Types.BIGINT,
+ // Types.BIGINT,
+ // Types.BIGINT,
+ // });
+ //
+ // int cnt = 0;
+ // while (resultSet.next()) {
+ // String[] expectedStrings = retArray[cnt].split(",");
+ // StringBuilder expectedBuilder = new StringBuilder();
+ // StringBuilder actualBuilder = new StringBuilder();
+ // for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
+ // actualBuilder.append(resultSet.getString(i)).append(",");
+ // expectedBuilder
+ //
.append(expectedStrings[actualIndexToExpectedIndexList.get(i - 1)])
+ // .append(",");
+ // }
+ // Assert.assertEquals(expectedBuilder.toString(),
actualBuilder.toString());
+ // cnt++;
+ // }
+ // Assert.assertEquals(retArray.length, cnt);
+ // }
+ // } catch (Exception e) {
+ // e.printStackTrace();
+ // fail(e.getMessage());
+ // }
+ // }
+ //
+ // @Test
+ // public void groupByTimeWithValueFilterTest() {
+ // String[] retArray =
+ // new String[] {
+ // "2,root.vehicle.d0,2,", "102,root.vehicle.d0,1",
+ // };
+ //
+ // try (Connection connection = EnvFactory.getEnv().getConnection();
+ // Statement statement = connection.createStatement()) {
+ //
+ // try (ResultSet resultSet =
+ // statement.executeQuery(
+ // "select count(s2) from root.vehicle.d0 where s2 > 3 and s2
<= 10 GROUP BY
+ // ([2,200),100ms) align by device")) {
+ // ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
+ // List<Integer> actualIndexToExpectedIndexList =
+ // checkHeader(
+ // resultSetMetaData,
+ // "Time,Device,count(s2)",
+ // new int[] {
+ // Types.TIMESTAMP, Types.VARCHAR, Types.BIGINT,
+ // });
+ //
+ // int cnt = 0;
+ // while (resultSet.next()) {
+ // String[] expectedStrings = retArray[cnt].split(",");
+ // StringBuilder expectedBuilder = new StringBuilder();
+ // StringBuilder actualBuilder = new StringBuilder();
+ // for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
+ // actualBuilder.append(resultSet.getString(i)).append(",");
+ // expectedBuilder
+ //
.append(expectedStrings[actualIndexToExpectedIndexList.get(i - 1)])
+ // .append(",");
+ // }
+ // Assert.assertEquals(expectedBuilder.toString(),
actualBuilder.toString());
+ // cnt++;
+ // }
+ // Assert.assertEquals(retArray.length, cnt);
+ // }
+ // } catch (Exception e) {
+ // e.printStackTrace();
+ // fail(e.getMessage());
+ // }
+ // }
+
+ @Test
+ public void unusualCaseTest2() {
+
+ String[] expectedHeader =
+ new String[] {"Time", "device_id", "s0", "s0", "s1", "s0", "s1", "s2",
"s3", "s4"};
+ String[] retArray =
+ new String[] {
+ "1997-01-01T08:00:00.001Z,d0,101,101,1101,101,1101,null,null,null,",
+
"1997-01-01T08:00:00.002Z,d0,10000,10000,40000,10000,40000,2.22,null,null,",
+
"1997-01-01T08:00:00.003Z,d0,null,null,null,null,null,3.33,null,null,",
+
"1997-01-01T08:00:00.004Z,d0,null,null,null,null,null,4.44,null,null,",
+ "1997-01-01T08:00:00.001Z,d1,999,999,null,999,null,null,null,null,",
+ };
+ tableResultSetEqualTest(
+ "select * from vehicle where time < 20 and (device_id='d0' or
device_id='d1') order by device_id",
+ expectedHeader,
+ retArray,
+ DATABASE_NAME);
+ }
+
+ @Test
+ public void selectWithRegularExpressionTest() {
+ String[] expectedHeader = new String[] {"Time", "device_id", "s0", "s1",
"s2", "s3", "s4"};
+ String[] retArray =
+ new String[] {
+ "1997-01-01T08:00:00.001Z,d0,101,1101,null,null,null,",
+ "1997-01-01T08:00:00.002Z,d0,10000,40000,2.22,null,null,",
+ "1997-01-01T08:00:00.003Z,d0,null,null,3.33,null,null,",
+ "1997-01-01T08:00:00.004Z,d0,null,null,4.44,null,null,",
+ "1997-01-01T08:00:00.050Z,d0,10000,50000,null,null,null,",
+ "1997-01-01T08:00:00.060Z,d0,null,null,null,aaaaa,null,",
+ "1997-01-01T08:00:00.070Z,d0,null,null,null,bbbbb,null,",
+ "1997-01-01T08:00:00.080Z,d0,null,null,null,ccccc,null,",
+ "1997-01-01T08:00:00.100Z,d0,99,199,null,null,true,",
+ "1997-01-01T08:00:00.101Z,d0,99,199,null,ddddd,null,",
+ "1997-01-01T08:00:00.102Z,d0,80,180,10.0,fffff,null,",
+ "1997-01-01T08:00:00.103Z,d0,99,199,null,null,null,",
+ "1997-01-01T08:00:00.104Z,d0,90,190,null,null,null,",
+ "1997-01-01T08:00:00.105Z,d0,99,199,11.11,null,null,",
+ "1997-01-01T08:00:00.106Z,d0,99,null,null,null,null,",
+ "1997-01-01T08:00:01.000Z,d0,22222,55555,1000.11,null,null,",
+ "2000-01-01T00:00:00.000Z,d0,null,100,null,good,null,",
+ "1997-01-01T08:00:00.001Z,d1,999,null,null,null,null,",
+ "1997-01-01T08:00:01.000Z,d1,888,null,null,null,null,",
+ };
+ tableResultSetEqualTest(
+ "select * from vehicle where device_id like 'd%' order by device_id",
+ expectedHeader, retArray, DATABASE_NAME);
+ }
+
+ @Test
+ public void selectWithNonExistMeasurementInWhereClause() {
+
+ String[] expectedHeader = new String[] {"Time", "device_id", "s0", "s1",
"s2", "s3", "s4"};
+ String[] retArray =
+ new String[] {
+ "1997-01-01T08:00:00.001Z,d0,101,1101,null,null,null,",
+ };
+ tableResultSetEqualTest(
+ "select * from vehicle where s1=1101 order by device_id",
+ expectedHeader,
+ retArray,
+ DATABASE_NAME);
+ }
+}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceIT.java
b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceIT.java
index 538483e2c93..1df91102278 100644
---
a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceIT.java
@@ -1547,12 +1547,12 @@ public class IoTDBOrderByWithAlignByDeviceIT {
new String[] {"Time", "plant_id", "device_id", "temperature",
"status", "hardware"};
String[] retArray =
new String[] {
- "2017-11-01T00:01:00.000Z,wf02,wt02,null,true,v2",
- "2017-11-01T00:01:00.000Z,wf01,wt01,24.36,true,null",
- "2017-11-01T00:00:00.000Z,wf02,wt02,null,false,v2",
- "2017-11-01T00:00:00.000Z,wf01,wt01,25.96,true,null",
- "1970-01-01T08:00:00.002Z,wf02,wt02,null,false,v2",
- "1970-01-01T08:00:00.001Z,wf02,wt02,null,true,v1",
+ "2017-10-31T16:01:00.000Z,wf02,wt02,null,true,v2",
+ "2017-10-31T16:01:00.000Z,wf01,wt01,24.36,true,null",
+ "2017-10-31T16:00:00.000Z,wf02,wt02,null,false,v2",
+ "2017-10-31T16:00:00.000Z,wf01,wt01,25.96,true,null",
+ "1970-01-01T00:00:00.002Z,wf02,wt02,null,false,v2",
+ "1970-01-01T00:00:00.001Z,wf02,wt02,null,true,v1",
};
tableResultSetEqualTest(
