You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by sh...@apache.org on 2026/01/26 02:02:55 UTC
(iotdb) branch addLastQueryIT-0126-dev1.3 created (now 11740f21d7e)
This is an automated email from the ASF dual-hosted git repository.
shuwenwei pushed a change to branch addLastQueryIT-0126-dev1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 11740f21d7e add it
This branch includes the following new commits:
new 11740f21d7e add it
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(iotdb) 01/01: add it
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shuwenwei pushed a commit to branch addLastQueryIT-0126-dev1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 11740f21d7e1e860b5d0e9837891c1bf0b27633b
Author: shuwenwei <s1...@gmail.com>
AuthorDate: Fri Jan 23 18:27:39 2026 +0800
add it
---
.../apache/iotdb/itbase/constant/TestConstant.java | 2 +-
.../db/it/aligned/IoTDBAlignedLastQueryIT.java | 14 +++---
.../it/aligned/IoTDBLastQueryWithDeletionIT.java | 16 +++----
.../aligned/IoTDBLastQueryWithoutLastCacheIT.java | 16 +++----
.../db/it/last/IoTDBLastQueryLastCacheIT.java | 52 +++++++++++++++++++---
5 files changed, 71 insertions(+), 29 deletions(-)
diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/constant/TestConstant.java b/integration-test/src/main/java/org/apache/iotdb/itbase/constant/TestConstant.java
index 18fd6fa64d9..65be357a918 100644
--- a/integration-test/src/main/java/org/apache/iotdb/itbase/constant/TestConstant.java
+++ b/integration-test/src/main/java/org/apache/iotdb/itbase/constant/TestConstant.java
@@ -51,7 +51,7 @@ public class TestConstant {
public static boolean testFlag = true;
public static String[] stringValue = new String[] {"A", "B", "C", "D", "E"};
public static String[] booleanValue = new String[] {"true", "false"};
- public static final String TIMESEIRES_STR = ColumnHeaderConstant.TIMESERIES;
+ public static final String TIMESERIES_STR = ColumnHeaderConstant.TIMESERIES;
public static final String VALUE_STR = ColumnHeaderConstant.VALUE;
public static final String DATA_TYPE_STR = ColumnHeaderConstant.DATATYPE;
public static final String FUNCTION_TYPE_NATIVE = "native";
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQueryIT.java
index d8a04e08f19..a32572d4778 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQueryIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQueryIT.java
@@ -41,7 +41,7 @@ import java.util.HashSet;
import java.util.Set;
import static org.apache.iotdb.itbase.constant.TestConstant.DATA_TYPE_STR;
-import static org.apache.iotdb.itbase.constant.TestConstant.TIMESEIRES_STR;
+import static org.apache.iotdb.itbase.constant.TestConstant.TIMESERIES_STR;
import static org.apache.iotdb.itbase.constant.TestConstant.TIMESTAMP_STR;
import static org.apache.iotdb.itbase.constant.TestConstant.VALUE_STR;
import static org.junit.Assert.assertEquals;
@@ -136,7 +136,7 @@ public class IoTDBAlignedLastQueryIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -171,7 +171,7 @@ public class IoTDBAlignedLastQueryIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -208,7 +208,7 @@ public class IoTDBAlignedLastQueryIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -241,7 +241,7 @@ public class IoTDBAlignedLastQueryIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -275,7 +275,7 @@ public class IoTDBAlignedLastQueryIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -313,7 +313,7 @@ public class IoTDBAlignedLastQueryIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithDeletionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithDeletionIT.java
index dc26696be60..f02e2fd6ec8 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithDeletionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithDeletionIT.java
@@ -40,7 +40,7 @@ import java.util.HashSet;
import java.util.Set;
import static org.apache.iotdb.itbase.constant.TestConstant.DATA_TYPE_STR;
-import static org.apache.iotdb.itbase.constant.TestConstant.TIMESEIRES_STR;
+import static org.apache.iotdb.itbase.constant.TestConstant.TIMESERIES_STR;
import static org.apache.iotdb.itbase.constant.TestConstant.TIMESTAMP_STR;
import static org.apache.iotdb.itbase.constant.TestConstant.VALUE_STR;
import static org.junit.Assert.assertEquals;
@@ -96,7 +96,7 @@ public class IoTDBLastQueryWithDeletionIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -137,7 +137,7 @@ public class IoTDBLastQueryWithDeletionIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -169,7 +169,7 @@ public class IoTDBLastQueryWithDeletionIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -203,7 +203,7 @@ public class IoTDBLastQueryWithDeletionIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -234,7 +234,7 @@ public class IoTDBLastQueryWithDeletionIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -267,7 +267,7 @@ public class IoTDBLastQueryWithDeletionIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -303,7 +303,7 @@ public class IoTDBLastQueryWithDeletionIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheIT.java
index 202ecf448a4..25b6a2098c9 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheIT.java
@@ -40,7 +40,7 @@ import java.util.HashSet;
import java.util.Set;
import static org.apache.iotdb.itbase.constant.TestConstant.DATA_TYPE_STR;
-import static org.apache.iotdb.itbase.constant.TestConstant.TIMESEIRES_STR;
+import static org.apache.iotdb.itbase.constant.TestConstant.TIMESERIES_STR;
import static org.apache.iotdb.itbase.constant.TestConstant.TIMESTAMP_STR;
import static org.apache.iotdb.itbase.constant.TestConstant.VALUE_STR;
import static org.junit.Assert.assertEquals;
@@ -90,7 +90,7 @@ public class IoTDBLastQueryWithoutLastCacheIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -134,7 +134,7 @@ public class IoTDBLastQueryWithoutLastCacheIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -169,7 +169,7 @@ public class IoTDBLastQueryWithoutLastCacheIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -206,7 +206,7 @@ public class IoTDBLastQueryWithoutLastCacheIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -239,7 +239,7 @@ public class IoTDBLastQueryWithoutLastCacheIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -273,7 +273,7 @@ public class IoTDBLastQueryWithoutLastCacheIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
@@ -310,7 +310,7 @@ public class IoTDBLastQueryWithoutLastCacheIT {
String ans =
resultSet.getString(TIMESTAMP_STR)
+ ","
- + resultSet.getString(TIMESEIRES_STR)
+ + resultSet.getString(TIMESERIES_STR)
+ ","
+ resultSet.getString(VALUE_STR)
+ ","
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/last/IoTDBLastQueryLastCacheIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/last/IoTDBLastQueryLastCacheIT.java
index feb710be4fa..c59061a65d6 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/last/IoTDBLastQueryLastCacheIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/last/IoTDBLastQueryLastCacheIT.java
@@ -37,7 +37,7 @@ import java.sql.Statement;
import static org.apache.iotdb.db.it.utils.TestUtils.prepareData;
import static org.apache.iotdb.db.it.utils.TestUtils.resultSetEqualTest;
import static org.apache.iotdb.itbase.constant.TestConstant.DATA_TYPE_STR;
-import static org.apache.iotdb.itbase.constant.TestConstant.TIMESEIRES_STR;
+import static org.apache.iotdb.itbase.constant.TestConstant.TIMESERIES_STR;
import static org.apache.iotdb.itbase.constant.TestConstant.TIMESTAMP_STR;
import static org.apache.iotdb.itbase.constant.TestConstant.VALUE_STR;
import static org.junit.Assert.fail;
@@ -102,7 +102,7 @@ public class IoTDBLastQueryLastCacheIT {
@Test
public void testLastQuery() {
String[] expectedHeader =
- new String[] {TIMESTAMP_STR, TIMESEIRES_STR, VALUE_STR, DATA_TYPE_STR};
+ new String[] {TIMESTAMP_STR, TIMESERIES_STR, VALUE_STR, DATA_TYPE_STR};
String[] retArray =
new String[] {
"1679365910000,root.ln_1.tb_6141.11_TEXT,13,TEXT,",
@@ -126,7 +126,7 @@ public class IoTDBLastQueryLastCacheIT {
@Test
public void testLastQueryOrderByTimeDesc() {
String[] expectedHeader =
- new String[] {TIMESTAMP_STR, TIMESEIRES_STR, VALUE_STR, DATA_TYPE_STR};
+ new String[] {TIMESTAMP_STR, TIMESERIES_STR, VALUE_STR, DATA_TYPE_STR};
String[] retArray =
new String[] {
"1679365910000,root.ln_1.tb_6141.waterTP_DOUBLE,15.0,DOUBLE,",
@@ -150,7 +150,7 @@ public class IoTDBLastQueryLastCacheIT {
@Test
public void testLastQuery1() {
String[] expectedHeader =
- new String[] {TIMESTAMP_STR, TIMESEIRES_STR, VALUE_STR, DATA_TYPE_STR};
+ new String[] {TIMESTAMP_STR, TIMESERIES_STR, VALUE_STR, DATA_TYPE_STR};
String[] retArray =
new String[] {
"1679365910000,root.sg.`NH4-N_DOUBLE`,12.0,DOUBLE,",
@@ -169,7 +169,7 @@ public class IoTDBLastQueryLastCacheIT {
@Test
public void testLastQuerySortWithLimit() {
String[] expectedHeader =
- new String[] {TIMESTAMP_STR, TIMESEIRES_STR, VALUE_STR, DATA_TYPE_STR};
+ new String[] {TIMESTAMP_STR, TIMESERIES_STR, VALUE_STR, DATA_TYPE_STR};
String[] retArray =
new String[] {
"1679477545000,root.ln_1.tb_6141.code_DOUBLE,2.0,DOUBLE,",
@@ -179,4 +179,46 @@ public class IoTDBLastQueryLastCacheIT {
expectedHeader,
retArray);
}
+
+ @Test
+ public void testNonAlignedLastQueryWithTimeFilterWithoutCache() throws SQLException {
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("insert into root.db1.g1.d3(time,s_3) values (1,1)");
+ statement.execute("insert into root.db1.g1.d3(time,s_3) values (2,2)");
+ statement.execute("insert into root.db1.g1.d3(time,s_3) values (3,3)");
+ statement.execute("insert into root.db1.g1.d3(time,s_3) values (4,4)");
+ statement.execute("insert into root.db1.g1.d3(time,s_1) values (1,1)");
+ statement.execute("insert into root.db1.g1.d3(time,s_1) values (2,2)");
+ }
+ String[] expectedHeader =
+ new String[] {TIMESTAMP_STR, TIMESERIES_STR, VALUE_STR, DATA_TYPE_STR};
+ String[] retArray =
+ new String[] {
+ "4,root.db1.g1.d3.s_3,4.0,DOUBLE,",
+ };
+ resultSetEqualTest(
+ "select last s_1, s_3 from root.db1.g1.d3 where time > 2;", expectedHeader, retArray);
+ }
+
+ @Test
+ public void testAlignedLastQueryWithTimeFilterWithoutCache() throws SQLException {
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("insert into root.db1.g1.d4(time,s_3) aligned values (1,1)");
+ statement.execute("insert into root.db1.g1.d4(time,s_3) aligned values (2,2)");
+ statement.execute("insert into root.db1.g1.d4(time,s_3) aligned values (3,3)");
+ statement.execute("insert into root.db1.g1.d4(time,s_3) aligned values (4,4)");
+ statement.execute("insert into root.db1.g1.d4(time,s_1) aligned values (1,1)");
+ statement.execute("insert into root.db1.g1.d4(time,s_1) aligned values (2,2)");
+ }
+ String[] expectedHeader =
+ new String[] {TIMESTAMP_STR, TIMESERIES_STR, VALUE_STR, DATA_TYPE_STR};
+ String[] retArray =
+ new String[] {
+ "4,root.db1.g1.d4.s_3,4.0,DOUBLE,",
+ };
+ resultSetEqualTest(
+ "select last s_1, s_3 from root.db1.g1.d4 where time > 2;", expectedHeader, retArray);
+ }
}