fix

Author: Caideyipi

integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryIT.java

@@ -165,6 +165,7 @@ public void selectAllAlignedAndNonAlignedTest() {
 
     String[] retArray =
         new String[] {
+          "-40,null,null,null,null,null,null,null,null,null,null,40.0",
           "1,1.0,1,1,true,aligned_test1,1.0,1,1,true,non_aligned_test1,null",
           "2,2.0,2,2,null,aligned_test2,2.0,2,2,null,non_aligned_test2,null",
           "3,30000.0,null,30000,true,aligned_unseq_test3,3.0,null,3,false,non_aligned_test3,null",
@@ -1896,7 +1897,6 @@ public void selectAllAlignedAndNonAlignedAlignByDeviceTest() {
           "39,root.sg1.d1,null,39,null,null,aligned_test39,null",
           "40,root.sg1.d1,null,40,null,null,aligned_test40,null",
           "-40,root.sg1.d2,null,null,null,null,null,40.0",
-          "-40,null,null,null,null,null,null,null,null,null,null,40.0",
           "1,root.sg1.d2,1.0,1,1,true,non_aligned_test1,null",
           "2,root.sg1.d2,2.0,2,2,null,non_aligned_test2,null",
           "3,root.sg1.d2,3.0,null,3,false,non_aligned_test3,null",

integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java

@@ -1448,6 +1448,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);
   }

integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionQueryIT.java

@@ -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;
@@ -149,11 +151,13 @@ public void rawDataQueryWithTimeRangeTest2() throws IoTDBConnectionException {
 
   @Test
   public void lastQueryTest() throws IoTDBConnectionException {
-    String[] retArray =
-        new String[] {"-40,root.sg1.d2.s6,40.0,DOUBLE", "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 = 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);