Skip to content

[To dev/1.3] Fixed the bug that session cannot query minus value when only pass paths #17390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Caideyipi wants to merge 5 commits into
base: dev/1.3
Choose a base branch
from
Open

[To dev/1.3] Fixed the bug that session cannot query minus value when only pass paths #17390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
132990b
fix
Caideyipi Mar 30, 2026
be6d933
fix
Caideyipi Apr 7, 2026
6dd58fd
Merge branch 'dev/1.3' of https://github.com/apache/iotdb into sessio…
Caideyipi Apr 7, 2026
77b85ed
fix
Caideyipi Apr 7, 2026
dc9e9c9
fix
Caideyipi Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ public void selectAllAlignedAndNonAlignedLastTest() {
"40,root.sg1.d2.s2,40,INT32",
"30,root.sg1.d2.s3,30,INT64",
"30,root.sg1.d2.s4,false,BOOLEAN",
"40,root.sg1.d2.s5,non_aligned_test40,TEXT"));
"40,root.sg1.d2.s5,non_aligned_test40,TEXT",
"-40,root.sg1.d2.s6,40.0,DOUBLE"));

try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
Expand Down
320 changes: 164 additions & 156 deletions integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryIT.java
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion ...ation-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithDeletionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ public void selectAllAlignedAndNonAlignedLastTest() {
"40,root.sg1.d2.s2,40,INT32",
"30,root.sg1.d2.s3,30,INT64",
"30,root.sg1.d2.s4,false,BOOLEAN",
"40,root.sg1.d2.s5,non_aligned_test40,TEXT"));
"40,root.sg1.d2.s5,non_aligned_test40,TEXT",
"-40,root.sg1.d2.s6,40.0,DOUBLE"));

try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement();
Expand Down
3 changes: 2 additions & 1 deletion ...n-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ public void selectAllAlignedAndNonAlignedLastTest() {
"40,root.sg1.d2.s2,40,INT32",
"30,root.sg1.d2.s3,30,INT64",
"30,root.sg1.d2.s4,false,BOOLEAN",
"40,root.sg1.d2.s5,non_aligned_test40,TEXT"));
"40,root.sg1.d2.s5,non_aligned_test40,TEXT",
"-40,root.sg1.d2.s6,40.0,DOUBLE"));

try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
Expand Down
84 changes: 43 additions & 41 deletions ...st/java/org/apache/iotdb/db/it/aligned/IoTDBRawQueryWithoutValueFilterWithDeletionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,46 +155,47 @@ public void selectAllAlignedAndNonAlignedTest() {

String[] retArray =
new String[] {
"1,null,1,true,aligned_test1,1.0,1,1,true,non_aligned_test1",
"2,null,2,null,aligned_test2,2.0,2,2,null,non_aligned_test2",
"3,null,30000,true,aligned_unseq_test3,3.0,null,3,false,non_aligned_test3",
"4,null,null,true,aligned_test4,4.0,4,null,true,non_aligned_test4",
"5,null,null,true,aligned_test5,5.0,5,null,true,non_aligned_test5",
"6,null,6,true,null,6.0,6,6,true,null",
"7,null,7,false,aligned_test7,7.0,7,7,false,non_aligned_test7",
"8,null,8,null,aligned_test8,8.0,8,8,null,non_aligned_test8",
"9,null,9,false,aligned_test9,9.0,9,9,false,non_aligned_test9",
"10,null,10,true,aligned_test10,null,10,10,true,non_aligned_test10",
"11,null,11,null,null,11.0,11,11,null,null",
"12,null,12,null,null,12.0,12,12,null,null",
"13,null,130000,true,aligned_unseq_test13,13.0,13,13,null,null",
"14,null,14,null,null,14.0,14,14,null,null",
"15,null,15,null,null,15.0,15,15,null,null",
"16,null,16,null,null,16.0,16,16,null,null",
"17,null,17,null,null,17.0,17,17,null,null",
"18,null,18,null,null,18.0,18,18,null,null",
"19,null,19,null,null,19.0,19,19,null,null",
"20,null,20,null,null,20.0,20,20,null,null",
"21,null,21,true,null,null,null,21,true,null",
"22,null,22,true,null,null,null,22,true,null",
"23,230000.0,230000,false,null,null,null,23,true,null",
"24,null,24,true,null,null,null,24,true,null",
"25,null,25,true,null,null,null,25,true,null",
"26,null,26,false,null,null,null,26,false,null",
"27,null,27,false,null,null,null,27,false,null",
"28,null,28,false,null,null,null,28,false,null",
"29,null,29,false,null,null,null,29,false,null",
"30,null,30,false,null,null,null,30,false,null",
"31,null,null,null,null,null,31,null,null,non_aligned_test31",
"32,null,null,null,aligned_test32,null,32,null,null,non_aligned_test32",
"33,null,null,null,aligned_test33,null,33,null,null,non_aligned_test33",
"34,null,null,null,aligned_test34,null,34,null,null,non_aligned_test34",
"35,null,null,null,aligned_test35,null,35,null,null,non_aligned_test35",
"36,null,null,null,aligned_test36,null,36,null,null,non_aligned_test36",
"37,null,null,null,aligned_test37,null,37,null,null,non_aligned_test37",
"38,null,null,null,aligned_test38,null,38,null,null,non_aligned_test38",
"39,null,null,null,aligned_test39,null,39,null,null,non_aligned_test39",
"40,null,null,null,aligned_test40,null,40,null,null,non_aligned_test40",
"-40,null,null,null,null,null,null,null,null,null,40.0",
"1,null,1,true,aligned_test1,1.0,1,1,true,non_aligned_test1,null",
"2,null,2,null,aligned_test2,2.0,2,2,null,non_aligned_test2,null",
"3,null,30000,true,aligned_unseq_test3,3.0,null,3,false,non_aligned_test3,null",
"4,null,null,true,aligned_test4,4.0,4,null,true,non_aligned_test4,null",
"5,null,null,true,aligned_test5,5.0,5,null,true,non_aligned_test5,null",
"6,null,6,true,null,6.0,6,6,true,null,null",
"7,null,7,false,aligned_test7,7.0,7,7,false,non_aligned_test7,null",
"8,null,8,null,aligned_test8,8.0,8,8,null,non_aligned_test8,null",
"9,null,9,false,aligned_test9,9.0,9,9,false,non_aligned_test9,null",
"10,null,10,true,aligned_test10,null,10,10,true,non_aligned_test10,null",
"11,null,11,null,null,11.0,11,11,null,null,null",
"12,null,12,null,null,12.0,12,12,null,null,null",
"13,null,130000,true,aligned_unseq_test13,13.0,13,13,null,null,null",
"14,null,14,null,null,14.0,14,14,null,null,null",
"15,null,15,null,null,15.0,15,15,null,null,null",
"16,null,16,null,null,16.0,16,16,null,null,null",
"17,null,17,null,null,17.0,17,17,null,null,null",
"18,null,18,null,null,18.0,18,18,null,null,null",
"19,null,19,null,null,19.0,19,19,null,null,null",
"20,null,20,null,null,20.0,20,20,null,null,null",
"21,null,21,true,null,null,null,21,true,null,null",
"22,null,22,true,null,null,null,22,true,null,null",
"23,230000.0,230000,false,null,null,null,23,true,null,null",
"24,null,24,true,null,null,null,24,true,null,null",
"25,null,25,true,null,null,null,25,true,null,null",
"26,null,26,false,null,null,null,26,false,null,null",
"27,null,27,false,null,null,null,27,false,null,null",
"28,null,28,false,null,null,null,28,false,null,null",
"29,null,29,false,null,null,null,29,false,null,null",
"30,null,30,false,null,null,null,30,false,null,null",
"31,null,null,null,null,null,31,null,null,non_aligned_test31,null",
"32,null,null,null,aligned_test32,null,32,null,null,non_aligned_test32,null",
"33,null,null,null,aligned_test33,null,33,null,null,non_aligned_test33,null",
"34,null,null,null,aligned_test34,null,34,null,null,non_aligned_test34,null",
"35,null,null,null,aligned_test35,null,35,null,null,non_aligned_test35,null",
"36,null,null,null,aligned_test36,null,36,null,null,non_aligned_test36,null",
"37,null,null,null,aligned_test37,null,37,null,null,non_aligned_test37,null",
"38,null,null,null,aligned_test38,null,38,null,null,non_aligned_test38,null",
"39,null,null,null,aligned_test39,null,39,null,null,non_aligned_test39,null",
"40,null,null,null,aligned_test40,null,40,null,null,non_aligned_test40,null",
};

String[] columnNames = {
Expand All @@ -206,7 +207,8 @@ public void selectAllAlignedAndNonAlignedTest() {
"root.sg1.d2.s2",
"root.sg1.d2.s3",
"root.sg1.d2.s4",
"root.sg1.d2.s5"
"root.sg1.d2.s5",
"root.sg1.d2.s6"
};

try (Connection connection = EnvFactory.getEnv().getConnection();
Expand Down
2 changes: 2 additions & 0 deletions integration-test/src/test/java/org/apache/iotdb/db/it/utils/AlignedWriteUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public class AlignedWriteUtil {
"create timeseries root.sg1.d2.s3 WITH DATATYPE=INT64",
"create timeseries root.sg1.d2.s4 WITH DATATYPE=BOOLEAN",
"create timeseries root.sg1.d2.s5 WITH DATATYPE=TEXT",
"create timeseries root.sg1.d2.s6 WITH DATATYPE=DOUBLE",
"insert into root.sg1.d1(time, s1, s2, s3, s4, s5) aligned values(1, 1.0, 1, 1, TRUE, 'aligned_test1')",
"insert into root.sg1.d1(time, s1, s2, s3, s5) aligned values(2, 2.0, 2, 2, 'aligned_test2')",
"insert into root.sg1.d1(time, s1, s3, s4, s5) aligned values(3, 3.0, 3, FALSE, 'aligned_test3')",
Expand Down Expand Up @@ -130,6 +131,7 @@ public class AlignedWriteUtil {
"insert into root.sg1.d2(time, s2, s5) values(38, 38, 'non_aligned_test38')",
"insert into root.sg1.d2(time, s2, s5) values(39, 39, 'non_aligned_test39')",
"insert into root.sg1.d2(time, s2, s5) values(40, 40, 'non_aligned_test40')",
"insert into root.sg1.d2(time, s6) values(-40, 40)",
};

public static void insertData() {
Expand Down
26 changes: 26 additions & 0 deletions integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,32 @@ public static void assertResultSetEqual(
}
}

public static void assertResultSetEqual(
SessionDataSet actualResultSet,
List<String> expectedColumnNames,
Set<String> expectedRetArray,
boolean ignoreTimeStamp) {
try {
List<String> actualColumnNames = actualResultSet.getColumnNames();
if (ignoreTimeStamp) {
assertEquals(expectedColumnNames, actualColumnNames);
} else {
assertEquals(TIMESTAMP_STR, actualColumnNames.get(0));
assertEquals(expectedColumnNames, actualColumnNames.subList(1, actualColumnNames.size()));
}

int count = 0;
while (actualResultSet.hasNext()) {
RowRecord rowRecord = actualResultSet.next();
assertTrue(expectedRetArray.remove(rowRecord.toString().replace('\t', ',')));
}
assertEquals(expectedRetArray.size(), count);
} catch (IoTDBConnectionException | StatementExecutionException e) {
e.printStackTrace();
fail(e.getMessage());
}
}

public static void createUser(String userName, String password) {
createUser(EnvFactory.getEnv(), userName, password);
}
Expand Down
9 changes: 7 additions & 2 deletions integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionQueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

import static org.apache.iotdb.db.it.utils.TestUtils.assertResultSetEqual;
import static org.junit.Assert.fail;
Expand Down Expand Up @@ -149,10 +151,13 @@ public void rawDataQueryWithTimeRangeTest2() throws IoTDBConnectionException {

@Test
public void lastQueryTest() throws IoTDBConnectionException {
String[] retArray = new String[] {"23,root.sg1.d1.s1,230000.0,FLOAT"};
Set<String> retArray =
new HashSet<>(
Arrays.asList("-40,root.sg1.d2.s6,40.0,DOUBLE", "23,root.sg1.d1.s1,230000.0,FLOAT"));

List<String> selectedPaths = Collections.singletonList("root.sg1.d1.s1");
List<String> selectedPaths = Arrays.asList("root.sg1.d1.s1", "root.sg1.d2.s6");

// Does not guarantee sequence
try (ISession session = EnvFactory.getEnv().getSessionConnection()) {
try (SessionDataSet resultSet = session.executeLastDataQuery(selectedPaths)) {
assertResultSetEqual(resultSet, lastQueryColumnNames, retArray, true);
Expand Down
3 changes: 1 addition & 2 deletions iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,8 +1042,7 @@ public SessionDataSet executeLastDataQuery(List<String> paths, long lastTime, lo
@Override
public SessionDataSet executeLastDataQuery(List<String> paths)
throws StatementExecutionException, IoTDBConnectionException {
long time = 0L;
return executeLastDataQuery(paths, time, queryTimeoutInMs);
return executeLastDataQuery(paths, Long.MIN_VALUE, queryTimeoutInMs);
}

@Override
Expand Down
Loading