Merge branch 'main' into enh/rocksdbSstate

source/dnode/vnode/src/tsdb/tsdbMergeTree.c

@@ -88,6 +88,10 @@ void getLastBlockLoadInfo(SSttBlockLoadInfo *pLoadInfo, int64_t *blocks, double
 }
 
 void *destroyLastBlockLoadInfo(SSttBlockLoadInfo *pLoadInfo) {
+  if (pLoadInfo == NULL) {
+    return NULL;
+  }
+
   for (int32_t i = 0; i < pLoadInfo->numOfStt; ++i) {
     pLoadInfo[i].currentLoadBlockIndex = 1;
     pLoadInfo[i].blockIndex[0] = -1;

source/libs/stream/src/stream.c

@@ -52,7 +52,7 @@ void streamCleanUp() {
 void streamSchedByTimer(void* param, void* tmrId) {
   SStreamTask* pTask = (void*)param;
 
-  if (atomic_load_8(&pTask->status.taskStatus) == TASK_STATUS__DROPPING) {
+  if (streamTaskShouldStop(&pTask->status)) {
     streamMetaReleaseTask(NULL, pTask);
     return;
   }

tests/system-test/0-others/compatibility.py

@@ -17,12 +17,12 @@ from util.dnodes import TDDnode
 from util.cluster import *
 import subprocess
 
-BASEVERSION = "3.0.1.8"
+BASEVERSION = "3.0.2.3"
 class TDTestCase:
     def caseDescription(self):
-        '''
+        f'''
         3.0 data compatibility test 
-        case1: basedata version is 3.0.1.8
+        case1: basedata version is {BASEVERSION}
         '''
         return
 

tests/system-test/7-tmq/tmqCommon.py

@@ -170,7 +170,7 @@ class TMQCom:
                     if tdSql.getData(i, 1) == 1:
                         loopFlag = 0
                         break
-            time.sleep(0.02)
+            time.sleep(0.10)
         return
 
     def create_database(self,tsql, dbName,dropFlag=1,vgroups=4,replica=1):