Merge branch '2.6' of github.com:taosdata/TDengine into szhou/fixbugs26

taos-tools @ 634399d3

-Subproject commit 05b61e03a15512fc23beb9dcd11238e1d7630c26
+Subproject commit 634399d329d8fa6be61b9cb44144c1d974cd646e

src/query/src/qFilter.c

@@ -3732,7 +3732,7 @@ int32_t filterGetTimeRange(SFilterInfo *info, STimeWindow       *win) {
 
     SFilterRange tra;
     filterGetRangeRes(prev, &tra);
-    win->skey = tra.s; 
+    win->skey = tra.s;
     win->ekey = tra.e;
   }
 
@@ -3786,7 +3786,7 @@ int32_t filterConverNcharColumns(SFilterInfo* info, int32_t rows, bool *gotNchar
       }
 
       fi->data = nfi.data;
-      
+
       *gotNchar = true;
     }
   }
@@ -3820,22 +3820,27 @@ int32_t filterIsIndexedColumnQuery(SFilterInfo* info, int32_t idxId, bool *res)
   CHK_JMP(FILTER_GET_COL_FIELD_ID(FILTER_GET_COL_FIELD(info, 0)) != idxId);
 
   int32_t optr = FILTER_UNIT_OPTR(info->units);
-  
+
   CHK_JMP(optr == TSDB_RELATION_LIKE || optr == TSDB_RELATION_IN || optr == TSDB_RELATION_MATCH 
        || optr == TSDB_RELATION_ISNULL || optr == TSDB_RELATION_NOTNULL || optr == TSDB_RELATION_CONTAINS);
 
   *res = true;
 
   return TSDB_CODE_SUCCESS;
-  
+
 _return:
   *res = false;
-  
+
   return TSDB_CODE_SUCCESS;
 }
 
 
 int32_t filterGetIndexedColumnInfo(SFilterInfo* info, char** val, int32_t *order, int32_t *flag) {
+  if (FILTER_GET_FLAG(info->status, FI_STATUS_EMPTY)) {
+    *order = 0;
+    return TSDB_CODE_SUCCESS;
+  }
+
   SFilterComUnit *cunit = info->cunits;
   uint8_t optr = cunit->optr;
 
@@ -3853,7 +3858,7 @@ int32_t filterGetIndexedColumnInfo(SFilterInfo* info, char** val, int32_t *order
   if (cunit->valData2 == cunit->valData && optr != TSDB_RELATION_EQUAL) {
     FILTER_SET_FLAG(*flag, FI_ACTION_NO_NEED);
   }
-  
+
   return TSDB_CODE_SUCCESS;
 }
 

tests/parallel_test/cases.task

@@ -198,7 +198,7 @@
 37,,script,./test.sh -f unique/arbitrator/offline_replica2_alterTable_online.sim
 37,,script,./test.sh -f general/table/delete_reuse1.sim
 37,,script,./test.sh -f general/db/delete_reuse2.sim
-36,,docs-examples-test,eval sh -c \"if [ `uname -m` != aarch64 ]; then ./test_rust.sh; fi\"
+# 36,,docs-examples-test,eval sh -c \"if [ `uname -m` != aarch64 ]; then ./test_rust.sh; fi\"
 36,,script,./test.sh -f unique/stable/replica3_vnode3.sim
 36,,script,./test.sh -f unique/stable/dnode2_stop.sim
 36,,script,./test.sh -f unique/arbitrator/sync_replica2_alterTable_add.sim