diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index f19fa54cbd85c3f6bda19f25a251950564cc50a6..a2938582075816b8ab901c4c63309450cc5167b2 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -1157,7 +1157,7 @@ int32_t extractDelDataBlock(const void* pData, int32_t len, int64_t ver, SStream
   SDecoder*   pCoder = &(SDecoder){0};
   SDeleteRes* pRes = &(SDeleteRes){0};
 
-  *pRefBlock = NULL;
+  (*pRefBlock) = NULL;
 
   pRes->uidList = taosArrayInit(0, sizeof(tb_uid_t));
   if (pRes->uidList == NULL) {
@@ -1197,7 +1197,7 @@ int32_t extractDelDataBlock(const void* pData, int32_t len, int64_t ver, SStream
 
   taosArrayDestroy(pRes->uidList);
   *pRefBlock = taosAllocateQitem(sizeof(SStreamRefDataBlock), DEF_QITEM, 0);
-  if (pRefBlock == NULL) {
+  if ((*pRefBlock) == NULL) {
     return TSDB_CODE_OUT_OF_MEMORY;
   }
 
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 84dcde06ac348a68b107eec97a79f48d3b8cbde0..29e59daeb9fa4ae6510f0117fa6af82cab39d152 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -3064,6 +3064,7 @@ static int32_t moveToNextFile(STsdbReader* pReader, SBlockNumber* pBlockNum, SAr
     // only check here, since the iterate data in memory is very fast.
     if (pReader->code != TSDB_CODE_SUCCESS) {
       tsdbWarn("tsdb reader is stopped ASAP, code:%s, %s", strerror(pReader->code), pReader->idStr);
+      taosArrayDestroy(pIndexList);
       return pReader->code;
     }
 
@@ -5583,58 +5584,3 @@ void tsdbReaderSetId(STsdbReader* pReader, const char* idstr) {
 }
 
 void tsdbReaderSetCloseFlag(STsdbReader* pReader) { pReader->code = TSDB_CODE_TSC_QUERY_CANCELLED; }
-
-/*-------------todo:refactor the implementation of those APIs in this file to seperate the API into two files------*/
-// opt perf, do NOT create so many readers
-int64_t tsdbGetLastTimestamp(SVnode* pVnode, void* pTableList, int32_t numOfTables, const char* pIdStr) {
-  SQueryTableDataCond cond = {.type = TIMEWINDOW_RANGE_CONTAINED, .numOfCols = 1, .order = TSDB_ORDER_DESC,
-                              .startVersion = -1, .endVersion = -1};
-  cond.twindows.skey = INT64_MIN;
-  cond.twindows.ekey = INT64_MAX;
-
-  cond.colList = taosMemoryCalloc(1, sizeof(SColumnInfo));
-  cond.pSlotList = taosMemoryMalloc(sizeof(int32_t) * cond.numOfCols);
-  if (cond.colList == NULL || cond.pSlotList == NULL) {
-    // todo
-  }
-
-  cond.colList[0].colId = 1;
-  cond.colList[0].slotId = 0;
-  cond.colList[0].type = TSDB_DATA_TYPE_TIMESTAMP;
-
-  cond.pSlotList[0] = 0;
-
-  STableKeyInfo* pTableKeyInfo = pTableList;
-  STsdbReader* pReader = NULL;
-  SSDataBlock* pBlock = createDataBlock();
-
-  SColumnInfoData data = {0};
-  data.info = (SColumnInfo) {.type = TSDB_DATA_TYPE_TIMESTAMP, .colId = 1, .bytes = TSDB_KEYSIZE};
-  blockDataAppendColInfo(pBlock, &data);
-
-  int64_t key = INT64_MIN;
-
-  for(int32_t i = 0; i < numOfTables; ++i) {
-    int32_t code = tsdbReaderOpen(pVnode, &cond, &pTableKeyInfo[i], 1, pBlock, (void**)&pReader, pIdStr, false, NULL);
-    if (code != TSDB_CODE_SUCCESS) {
-      return code;
-    }
-
-    bool hasData = false;
-    code = tsdbNextDataBlock(pReader, &hasData);
-    if (!hasData || code != TSDB_CODE_SUCCESS) {
-      continue;
-    }
-
-    SColumnInfoData* pCol = taosArrayGet(pBlock->pDataBlock, 0);
-    int64_t k = *(int64_t*)pCol->pData;
-
-    if (key < k) {
-      key = k;
-    }
-
-    tsdbReaderClose(pReader);
-  }
-
-  return 0;
-}
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index cfea233a1ca49e47d8eb26b752f380e59b1dd7c1..832750e967dfd6f996d12281a9ece48b6c6d26c7 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -1109,7 +1109,6 @@ int32_t getTableList(void* pVnode, SScanPhysiNode* pScanNode, SNode* pTagCond, S
         code = doFilterTag(pTagIndexCond, &metaArg, pUidList, &status, &pStorageAPI->metaFilter);
         if (code != 0 || status == SFLT_NOT_INDEX) {  // temporarily disable it for performance sake
           qDebug("failed to get tableIds from index, suid:%" PRIu64, pScanNode->uid);
-          code = TSDB_CODE_SUCCESS;
         } else {
           qInfo("succ to get filter result, table num: %d", (int)taosArrayGetSize(pUidList));
         }
diff --git a/source/libs/executor/src/joinoperator.c b/source/libs/executor/src/joinoperator.c
index 13ab5d05a501ca1ff27bf5c32f3ca3f1fe3ed569..f334ae02f6c7694e84f3e85c722316bcdfb0fd61 100644
--- a/source/libs/executor/src/joinoperator.c
+++ b/source/libs/executor/src/joinoperator.c
@@ -150,9 +150,12 @@ static int32_t initTagColskeyBuf(int32_t* keyLen, char** keyBuf, const SArray* p
   int32_t nullFlagSize = sizeof(int8_t) * numOfGroupCols;
   (*keyLen) += nullFlagSize;
 
-  (*keyBuf) = taosMemoryCalloc(1, (*keyLen));
-  if ((*keyBuf) == NULL) {
-    return TSDB_CODE_OUT_OF_MEMORY;
+  if (*keyLen >= 0) {
+
+    (*keyBuf) = taosMemoryCalloc(1, (*keyLen));
+    if ((*keyBuf) == NULL) {
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
   }
 
   return TSDB_CODE_SUCCESS;
diff --git a/source/libs/stream/src/streamData.c b/source/libs/stream/src/streamData.c
index 7c06e7deb30501368b3588cf0906841fd8afaf54..baf2f73f905a15a145d0ad76966b1ce696c4b9e6 100644
--- a/source/libs/stream/src/streamData.c
+++ b/source/libs/stream/src/streamData.c
@@ -27,6 +27,7 @@ SStreamDataBlock* createStreamDataFromDispatchMsg(const SStreamDispatchReq* pReq
   int32_t blockNum = pReq->blockNum;
   SArray* pArray = taosArrayInit_s(sizeof(SSDataBlock), blockNum);
   if (pArray == NULL) {
+    taosFreeQitem(pData);
     return NULL;
   }
 
diff --git a/source/libs/stream/src/streamExec.c b/source/libs/stream/src/streamExec.c
index 46290c306f5b641c21309b2dcc9c97554c93e723..e7ff7311bbaf750ba2ada7a7a03bc8cde7c951bd 100644
--- a/source/libs/stream/src/streamExec.c
+++ b/source/libs/stream/src/streamExec.c
@@ -212,8 +212,9 @@ int32_t streamScanExec(SStreamTask* pTask, int32_t batchSz) {
     }
 
     if (taosArrayGetSize(pRes) == 0) {
+      taosArrayDestroy(pRes);
+
       if (finished) {
-        taosArrayDestroy(pRes);
         qDebug("s-task:%s finish recover exec task ", pTask->id.idStr);
         break;
       } else {