other: merge 3.0

include/common/tdatablock.h

@@ -49,7 +49,7 @@ typedef struct SBlockOrderInfo {
 #define colDataSetNull_f_s(c_, r_)                                        \
   do {                                                                    \
     colDataSetNull_f((c_)->nullbitmap, r_);                               \
-    memset(((char*)(c_)->pData) + (c_)->info.bytes * (r_), 0, (c_)->info.bytes); \
+    (void)memset(((char*)(c_)->pData) + (c_)->info.bytes * (r_), 0, (c_)->info.bytes); \
   } while (0)
 
 #define colDataClearNull_f(bm_, r_)                             \

include/common/tmsg.h

@@ -2828,19 +2828,24 @@ static FORCE_INLINE int32_t tSerializeSCMSubscribeReq(void** buf, const SCMSubsc
   return tlen;
 }
 
-static FORCE_INLINE void* tDeserializeSCMSubscribeReq(void* buf, SCMSubscribeReq* pReq) {
+static FORCE_INLINE int32_t tDeserializeSCMSubscribeReq(void* buf, SCMSubscribeReq* pReq) {
   buf = taosDecodeFixedI64(buf, &pReq->consumerId);
   buf = taosDecodeStringTo(buf, pReq->cgroup);
   buf = taosDecodeStringTo(buf, pReq->clientId);
 
-  int32_t topicNum;
+  int32_t topicNum = 0;
   buf = taosDecodeFixedI32(buf, &topicNum);
 
   pReq->topicNames = taosArrayInit(topicNum, sizeof(void*));
+  if (pReq->topicNames == NULL){
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
   for (int32_t i = 0; i < topicNum; i++) {
-    char* name;
+    char* name = NULL;
     buf = taosDecodeString(buf, &name);
-    taosArrayPush(pReq->topicNames, &name);
+    if (taosArrayPush(pReq->topicNames, &name) == NULL){
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
   }
 
   buf = taosDecodeFixedI8(buf, &pReq->withTbName);
@@ -2849,7 +2854,7 @@ static FORCE_INLINE void* tDeserializeSCMSubscribeReq(void* buf, SCMSubscribeReq
   buf = taosDecodeFixedI8(buf, &pReq->resetOffsetCfg);
   buf = taosDecodeFixedI8(buf, &pReq->enableReplay);
   buf = taosDecodeFixedI8(buf, &pReq->enableBatchMeta);
-  return buf;
+  return 0;
 }
 
 typedef struct {

include/dnode/qnode/qnode.h

@@ -34,9 +34,10 @@ typedef struct {
  * @brief Start one Qnode in Dnode.
  *
  * @param pOption Option of the qnode.
- * @return SQnode* The qnode object.
+ * @param pQnode The qnode object.
+ * @return int32_t The error code.
  */
-SQnode *qndOpen(const SQnodeOpt *pOption);
+int32_t qndOpen(const SQnodeOpt *pOption, SQnode **pQnode);
 
 /**
  * @brief Stop Qnode in Dnode.

include/libs/function/function.h

@@ -36,7 +36,7 @@ typedef struct SFuncExecEnv {
 } SFuncExecEnv;
 
 typedef bool (*FExecGetEnv)(struct SFunctionNode *pFunc, SFuncExecEnv *pEnv);
-typedef bool (*FExecInit)(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo *pResultCellInfo);
+typedef int32_t (*FExecInit)(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo *pResultCellInfo);
 typedef int32_t (*FExecProcess)(struct SqlFunctionCtx *pCtx);
 typedef int32_t (*FExecFinalize)(struct SqlFunctionCtx *pCtx, SSDataBlock *pBlock);
 typedef int32_t (*FScalarExecProcess)(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);

include/libs/function/functionMgt.h

@@ -260,7 +260,7 @@ bool fmIsProcessByRowFunc(int32_t funcId);
 bool fmisSelectGroupConstValueFunc(int32_t funcId);
 
 void getLastCacheDataType(SDataType* pType, int32_t pkBytes);
-SFunctionNode* createFunction(const char* pName, SNodeList* pParameterList);
+int32_t createFunction(const char* pName, SNodeList* pParameterList, SFunctionNode** pFunc);
 
 int32_t fmGetDistMethod(const SFunctionNode* pFunc, SFunctionNode** pPartialFunc, SFunctionNode** pMidFunc, SFunctionNode** pMergeFunc);
 
@@ -273,7 +273,7 @@ typedef enum EFuncDataRequired {
 } EFuncDataRequired;
 
 EFuncDataRequired fmFuncDataRequired(SFunctionNode* pFunc, STimeWindow* pTimeWindow);
-EFuncDataRequired fmFuncDynDataRequired(int32_t funcId, void* pRes, SDataBlockInfo* pBlockInfo);
+int32_t fmFuncDynDataRequired(int32_t funcId, void* pRes, SDataBlockInfo* pBlockInfo, int32_t *reqStatus);
 
 int32_t fmGetFuncExecFuncs(int32_t funcId, SFuncExecFuncs* pFpSet);
 int32_t fmGetScalarFuncExecFuncs(int32_t funcId, SScalarFuncExecFuncs* pFpSet);

include/libs/function/tudf.h

@@ -77,7 +77,7 @@ void freeUdfInterBuf(SUdfInterBuf *buf);
 
 // high level APIs
 bool    udfAggGetEnv(struct SFunctionNode *pFunc, SFuncExecEnv *pEnv);
-bool    udfAggInit(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo *pResultCellInfo);
+int32_t udfAggInit(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo *pResultCellInfo);
 int32_t udfAggProcess(struct SqlFunctionCtx *pCtx);
 int32_t udfAggFinalize(struct SqlFunctionCtx *pCtx, SSDataBlock *pBlock);
 

include/libs/wal/wal.h

@@ -12,6 +12,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
 #ifndef _TD_WAL_H_
 #define _TD_WAL_H_
 
@@ -20,19 +21,11 @@
 #include "tdef.h"
 #include "tlog.h"
 #include "tmsg.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-// clang-format off
-#define wFatal(...) { if (wDebugFlag & DEBUG_FATAL) { taosPrintLog("WAL FATAL ", DEBUG_FATAL, 255,        __VA_ARGS__); }}
-#define wError(...) { if (wDebugFlag & DEBUG_ERROR) { taosPrintLog("WAL ERROR ", DEBUG_ERROR, 255,        __VA_ARGS__); }}
-#define wWarn(...)  { if (wDebugFlag & DEBUG_WARN)  { taosPrintLog("WAL WARN ",  DEBUG_WARN, 255,         __VA_ARGS__); }}
-#define wInfo(...)  { if (wDebugFlag & DEBUG_INFO)  { taosPrintLog("WAL ",       DEBUG_INFO, 255,         __VA_ARGS__); }}
-#define wDebug(...) { if (wDebugFlag & DEBUG_DEBUG) { taosPrintLog("WAL ",       DEBUG_DEBUG, wDebugFlag, __VA_ARGS__); }}
-#define wTrace(...) { if (wDebugFlag & DEBUG_TRACE) { taosPrintLog("WAL ",       DEBUG_TRACE, wDebugFlag, __VA_ARGS__); }}
-// clang-format on
-
 #define WAL_PROTO_VER     0
 #define WAL_NOSUFFIX_LEN  20
 #define WAL_SUFFIX_AT     (WAL_NOSUFFIX_LEN + 1)
@@ -131,7 +124,6 @@ typedef struct SWal {
 typedef struct {
   int64_t refId;
   int64_t refVer;
-  //  int64_t refFile;
   SWal   *pWal;
 } SWalRef;
 
@@ -143,10 +135,8 @@ typedef struct {
   int8_t enableRef;
 } SWalFilterCond;
 
-typedef struct SWalReader SWalReader;
-
 // todo hide this struct
-struct SWalReader {
+typedef struct SWalReader {
   SWal     *pWal;
   int64_t   readerId;
   TdFilePtr pLogFile;
@@ -159,7 +149,7 @@ struct SWalReader {
   TdThreadMutex  mutex;
   SWalFilterCond cond;
   SWalCkHead    *pHead;
-};
+} SWalReader;
 
 // module initialization
 int32_t walInit();
@@ -172,17 +162,9 @@ int32_t walPersist(SWal *);
 void    walClose(SWal *);
 
 // write interfaces
-
 // By assigning index by the caller, wal gurantees linearizability
-int32_t walWrite(SWal *, int64_t index, tmsg_t msgType, const void *body, int32_t bodyLen);
+int32_t walAppendLog(SWal *, int64_t index, tmsg_t msgType, SWalSyncInfo syncMeta, const void *body, int32_t bodyLen);
-int32_t walWriteWithSyncInfo(SWal *, int64_t index, tmsg_t msgType, SWalSyncInfo syncMeta, const void *body,
+int32_t walFsync(SWal *, bool force);
-                             int32_t bodyLen);
-
-// Assign version automatically and return to caller,
-// -1 will be returned for failed writes
-int64_t walAppendLog(SWal *, int64_t index, tmsg_t msgType, SWalSyncInfo syncMeta, const void *body, int32_t bodyLen);
-
-void walFsync(SWal *, bool force);
 
 // apis for lifecycle management
 int32_t walCommit(SWal *, int64_t ver);
@@ -191,17 +173,13 @@ int32_t walRollback(SWal *, int64_t ver);
 int32_t walBeginSnapshot(SWal *, int64_t ver, int64_t logRetention);
 int32_t walEndSnapshot(SWal *);
 int32_t walRestoreFromSnapshot(SWal *, int64_t ver);
-// for tq
 int32_t walApplyVer(SWal *, int64_t ver);
 
-// int32_t  walDataCorrupted(SWal*);
-
 // wal reader
 SWalReader *walOpenReader(SWal *, SWalFilterCond *pCond, int64_t id);
 void        walCloseReader(SWalReader *pRead);
 void        walReadReset(SWalReader *pReader);
 int32_t     walReadVer(SWalReader *pRead, int64_t ver);
-void        decryptBody(SWalCfg *cfg, SWalCkHead *pHead, int32_t plainBodyLen, const char *func);
 int32_t     walReaderSeekVer(SWalReader *pRead, int64_t ver);
 int32_t     walNextValidMsg(SWalReader *pRead);
 int64_t     walReaderGetCurrentVer(const SWalReader *pReader);
@@ -216,12 +194,11 @@ int32_t walFetchHead(SWalReader *pRead, int64_t ver);
 int32_t walFetchBody(SWalReader *pRead);
 int32_t walSkipFetchBody(SWalReader *pRead);
 
-void walRefFirstVer(SWal *, SWalRef *);
-void walRefLastVer(SWal *, SWalRef *);
-
 SWalRef *walOpenRef(SWal *);
 void     walCloseRef(SWal *pWal, int64_t refId);
 int32_t  walSetRefVer(SWalRef *, int64_t ver);
+void     walRefFirstVer(SWal *, SWalRef *);
+void     walRefLastVer(SWal *, SWalRef *);
 
 // helper function for raft
 bool walLogExist(SWal *, int64_t ver);

include/os/os.h

@@ -97,6 +97,7 @@ extern "C" {
 #include <nmmintrin.h>
 #endif
 
+
 #include "osThread.h"
 
 #include "osAtomic.h"

include/os/osEnv.h

@@ -54,7 +54,7 @@ extern SDiskSpace tsDataSpace;
 extern SDiskSpace tsLogSpace;
 extern SDiskSpace tsTempSpace;
 
-void osDefaultInit();
+int32_t osDefaultInit();
 void osUpdate();
 void osCleanup();
 
@@ -66,7 +66,7 @@ bool osLogSpaceSufficient();
 bool osDataSpaceSufficient();
 bool osTempSpaceSufficient();
 
-void osSetTimezone(const char *timezone);
+int32_t osSetTimezone(const char *timezone);
 void osSetSystemLocale(const char *inLocale, const char *inCharSet);
 void osSetProcPath(int32_t argc, char **argv);
 

include/os/osTime.h

@@ -65,28 +65,28 @@ int32_t taosGetTimestampSec();
 //@return timestamp in millisecond
 static FORCE_INLINE int64_t taosGetTimestampMs() {
   struct timeval systemTime;
-  taosGetTimeOfDay(&systemTime);
+  (void)taosGetTimeOfDay(&systemTime);
   return (int64_t)systemTime.tv_sec * 1000LL + (int64_t)systemTime.tv_usec / 1000;
 }
 
 //@return timestamp in microsecond
 static FORCE_INLINE int64_t taosGetTimestampUs() {
   struct timeval systemTime;
-  taosGetTimeOfDay(&systemTime);
+  (void)taosGetTimeOfDay(&systemTime);
   return (int64_t)systemTime.tv_sec * 1000000LL + (int64_t)systemTime.tv_usec;
 }
 
 //@return timestamp in nanosecond
 static FORCE_INLINE int64_t taosGetTimestampNs() {
   struct timespec systemTime = {0};
-  taosClockGetTime(CLOCK_REALTIME, &systemTime);
+  (void)taosClockGetTime(CLOCK_REALTIME, &systemTime);
   return (int64_t)systemTime.tv_sec * 1000000000LL + (int64_t)systemTime.tv_nsec;
 }
 
 //@return timestamp of monotonic clock in millisecond
 static FORCE_INLINE int64_t taosGetMonoTimestampMs() {
   struct timespec systemTime = {0};
-  taosClockGetTime(CLOCK_MONOTONIC, &systemTime);
+  (void)taosClockGetTime(CLOCK_MONOTONIC, &systemTime);
   return (int64_t)systemTime.tv_sec * 1000LL + (int64_t)systemTime.tv_nsec / 1000000;
 }
 

include/os/osTimezone.h

@@ -55,7 +55,7 @@ enum TdTimezone {
 };
 
 void taosGetSystemTimezone(char *outTimezone, enum TdTimezone *tsTimezone);
-void taosSetSystemTimezone(const char *inTimezone, char *outTimezone, int8_t *outDaylight, enum TdTimezone *tsTimezone);
+int32_t taosSetSystemTimezone(const char *inTimezone, char *outTimezone, int8_t *outDaylight, enum TdTimezone *tsTimezone);
 
 #ifdef __cplusplus
 }

include/util/taoserror.h

@@ -860,6 +860,11 @@ int32_t  taosGetErrSize();
 #define TSDB_CODE_FUNC_TO_TIMESTAMP_FAILED_TS_ERR TAOS_DEF_ERROR_CODE(0, 0x2807)
 #define TSDB_CODE_FUNC_TO_TIMESTAMP_FAILED_NOT_SUPPORTED TAOS_DEF_ERROR_CODE(0, 0x2808)
 #define TSDB_CODE_FUNC_TO_CHAR_NOT_SUPPORTED    TAOS_DEF_ERROR_CODE(0, 0x2809)
+#define TSDB_CODE_FUNC_TIME_UNIT_INVALID        TAOS_DEF_ERROR_CODE(0, 0x280A)
+#define TSDB_CODE_FUNC_TIME_UNIT_TOO_SMALL      TAOS_DEF_ERROR_CODE(0, 0x280B)
+#define TSDB_CODE_FUNC_INVALID_VALUE_RANGE      TAOS_DEF_ERROR_CODE(0, 0x280C)
+#define TSDB_CODE_FUNC_SETUP_ERROR              TAOS_DEF_ERROR_CODE(0, 0x280D)
+
 
 //udf
 #define TSDB_CODE_UDF_STOPPING                  TAOS_DEF_ERROR_CODE(0, 0x2901)

include/util/tdef.h

@@ -556,7 +556,8 @@ typedef struct {
   char name[TSDB_LOG_VAR_LEN];
 } SLogVar;
 
-#define TMQ_SEPARATOR ':'
+#define TMQ_SEPARATOR ":"
+#define TMQ_SEPARATOR_CHAR ':'
 
 enum {
   SND_WORKER_TYPE__SHARED = 1,

include/util/tdigest.h

@@ -64,10 +64,10 @@ typedef struct TDigest {
 } TDigest;
 
 TDigest *tdigestNewFrom(void *pBuf, int32_t compression);
-void     tdigestAdd(TDigest *t, double x, int64_t w);
+int32_t  tdigestAdd(TDigest *t, double x, int64_t w);
-void     tdigestMerge(TDigest *t1, TDigest *t2);
+int32_t  tdigestMerge(TDigest *t1, TDigest *t2);
 double   tdigestQuantile(TDigest *t, double q);
-void     tdigestCompress(TDigest *t);
+int32_t  tdigestCompress(TDigest *t);
 void     tdigestFreeFrom(TDigest *t);
 void     tdigestAutoFill(TDigest *t, int32_t compression);
 

source/client/src/clientEnv.c

@@ -897,7 +897,11 @@ void taos_init_imp(void) {
     tscError("failed to init task queue");
     return;
   }
-  fmFuncMgtInit();
+  if (fmFuncMgtInit() != TSDB_CODE_SUCCESS) {
+    tscInitRes = -1;
+    tscError("failed to init function manager");
+    return;
+  }
   nodesInitAllocatorSet();
 
   clientConnRefPool = taosOpenRef(200, destroyTscObj);

source/client/src/clientMonitor.c

@@ -801,9 +801,8 @@ int32_t monitorInit() {
   }
 
   if (taosMulModeMkDir(tmpSlowLogPath, 0777, true) != 0) {
-    terrno = TAOS_SYSTEM_ERROR(errno);
     tscError("failed to create dir:%s since %s", tmpSlowLogPath, terrstr());
-    return -1;
+    return terrno;
   }
 
   if (tsem2_init(&monitorSem, 0, 0) != 0) {

source/client/src/clientTmq.c

@@ -456,11 +456,7 @@ static int32_t doSendCommitMsg(tmq_t* tmq, int32_t vgId, SEpSet* epSet, STqOffse
   pOffset.consumerId = tmq->consumerId;
   pOffset.offset.val = *offset;
 
-  int32_t groupLen = strlen(tmq->groupId);
+  (void)snprintf(pOffset.offset.subKey, TSDB_SUBSCRIBE_KEY_LEN, "%s%s%s", tmq->groupId, TMQ_SEPARATOR, pTopicName);
-  memcpy(pOffset.offset.subKey, tmq->groupId, groupLen);
-  pOffset.offset.subKey[groupLen] = TMQ_SEPARATOR;
-  strcpy(pOffset.offset.subKey + groupLen + 1, pTopicName);
-
   int32_t len = 0;
   int32_t code = 0;
   tEncodeSize(tEncodeMqVgOffset, &pOffset, len, code);
@@ -1667,11 +1663,7 @@ static bool doUpdateLocalEp(tmq_t* tmq, int32_t epoch, const SMqAskEpRsp* pRsp)
 }
 
 void tmqBuildConsumeReqImpl(SMqPollReq* pReq, tmq_t* tmq, int64_t timeout, SMqClientTopic* pTopic, SMqClientVg* pVg) {
-  int32_t groupLen = strlen(tmq->groupId);
+  (void)snprintf(pReq->subKey, TSDB_SUBSCRIBE_KEY_LEN, "%s%s%s", tmq->groupId, TMQ_SEPARATOR, pTopic->topicName);
-  memcpy(pReq->subKey, tmq->groupId, groupLen);
-  pReq->subKey[groupLen] = TMQ_SEPARATOR;
-  strcpy(pReq->subKey + groupLen + 1, pTopic->topicName);
-
   pReq->withTbName = tmq->withTbName;
   pReq->consumerId = tmq->consumerId;
   pReq->timeout = timeout;
@@ -2902,11 +2894,7 @@ int64_t getCommittedFromServer(tmq_t* tmq, char* tname, int32_t vgId, SEpSet* ep
   SMqVgOffset pOffset = {0};
 
   pOffset.consumerId = tmq->consumerId;
-
+  (void)snprintf(pOffset.offset.subKey, TSDB_SUBSCRIBE_KEY_LEN, "%s%s%s", tmq->groupId, TMQ_SEPARATOR, tname);
-  int32_t groupLen = strlen(tmq->groupId);
-  memcpy(pOffset.offset.subKey, tmq->groupId, groupLen);
-  pOffset.offset.subKey[groupLen] = TMQ_SEPARATOR;
-  strcpy(pOffset.offset.subKey + groupLen + 1, tname);
 
   int32_t len = 0;
   tEncodeSize(tEncodeMqVgOffset, &pOffset, len, code);

source/common/src/tglobal.c

@@ -1306,7 +1306,6 @@ int32_t taosCreateLog(const char *logname, int32_t logFileNum, const char *cfgDi
   taosSetAllDebugFlag(pCfg, cfgGetItem(pCfg, "debugFlag")->i32);
 
   if (taosMulModeMkDir(tsLogDir, 0777, true) != 0) {
-    terrno = TAOS_SYSTEM_ERROR(errno);
     printf("failed to create dir:%s since %s", tsLogDir, terrstr());
     cfgCleanup(pCfg);
     return -1;

source/common/src/tmsg.c

@@ -9197,23 +9197,23 @@ int32_t tDecodeSTqOffsetVal(SDecoder *pDecoder, STqOffsetVal *pOffsetVal) {
 
 int32_t tFormatOffset(char *buf, int32_t maxLen, const STqOffsetVal *pVal) {
   if (pVal->type == TMQ_OFFSET__RESET_NONE) {
-    snprintf(buf, maxLen, "none");
+    (void)snprintf(buf, maxLen, "none");
   } else if (pVal->type == TMQ_OFFSET__RESET_EARLIEST) {
-    snprintf(buf, maxLen, "earliest");
+    (void)snprintf(buf, maxLen, "earliest");
   } else if (pVal->type == TMQ_OFFSET__RESET_LATEST) {
-    snprintf(buf, maxLen, "latest");
+    (void)snprintf(buf, maxLen, "latest");
   } else if (pVal->type == TMQ_OFFSET__LOG) {
-    snprintf(buf, maxLen, "wal:%" PRId64, pVal->version);
+    (void)snprintf(buf, maxLen, "wal:%" PRId64, pVal->version);
   } else if (pVal->type == TMQ_OFFSET__SNAPSHOT_DATA || pVal->type == TMQ_OFFSET__SNAPSHOT_META) {
     if (IS_VAR_DATA_TYPE(pVal->primaryKey.type)) {
       char *tmp = taosMemoryCalloc(1, pVal->primaryKey.nData + 1);
       if (tmp == NULL) return TSDB_CODE_OUT_OF_MEMORY;
-      memcpy(tmp, pVal->primaryKey.pData, pVal->primaryKey.nData);
+      (void)memcpy(tmp, pVal->primaryKey.pData, pVal->primaryKey.nData);
-      snprintf(buf, maxLen, "tsdb:%" PRId64 "|%" PRId64 ",pk type:%d,val:%s", pVal->uid, pVal->ts,
+      (void)snprintf(buf, maxLen, "tsdb:%" PRId64 "|%" PRId64 ",pk type:%d,val:%s", pVal->uid, pVal->ts,
                pVal->primaryKey.type, tmp);
       taosMemoryFree(tmp);
     } else {
-      snprintf(buf, maxLen, "tsdb:%" PRId64 "|%" PRId64 ",pk type:%d,val:%" PRId64, pVal->uid, pVal->ts,
+      (void)snprintf(buf, maxLen, "tsdb:%" PRId64 "|%" PRId64 ",pk type:%d,val:%" PRId64, pVal->uid, pVal->ts,
                pVal->primaryKey.type, pVal->primaryKey.val);
     }
   } else {

source/dnode/mgmt/mgmt_qnode/src/qmInt.c

@@ -34,11 +34,8 @@ static void qmClose(SQnodeMgmt *pMgmt) {
 }
 
 static int32_t qndOpenWrapper(SQnodeOpt *pOption, SQnode **pQnode) {
-  *pQnode = qndOpen(pOption);
+  int32_t code = qndOpen(pOption, pQnode);
-  if (*pQnode == NULL) {
+  return code;
-    return terrno;
-  }
-  return 0;
 }
 static int32_t qmOpen(SMgmtInputOpt *pInput, SMgmtOutputOpt *pOutput) {
   int32_t     code = 0;
@@ -62,7 +59,7 @@ static int32_t qmOpen(SMgmtInputOpt *pInput, SMgmtOutputOpt *pOutput) {
   if (code != 0) {
     dError("failed to open qnode since %s", tstrerror(code));
     qmClose(pMgmt);
-    return -1;
+    return code;
   }
   tmsgReportStartup("qnode-impl", "initialized");
 

source/dnode/mgmt/mgmt_qnode/src/qmWorker.c

@@ -48,8 +48,8 @@ static int32_t qmPutNodeMsgToWorker(SSingleWorker *pWorker, SRpcMsg *pMsg) {
 }
 
 int32_t qmPutNodeMsgToQueryQueue(SQnodeMgmt *pMgmt, SRpcMsg *pMsg) {
-  qndPreprocessQueryMsg(pMgmt->pQnode, pMsg);
+  int32_t code = qndPreprocessQueryMsg(pMgmt->pQnode, pMsg);
-
+  if (code) return code;
   return qmPutNodeMsgToWorker(&pMgmt->queryWorker, pMsg);
 }
 

source/dnode/mgmt/node_mgmt/src/dmEnv.c

@@ -262,7 +262,7 @@ static int32_t dmProcessCreateNodeReq(EDndNodeType ntype, SRpcMsg *pMsg) {
   pWrapper = &pDnode->wrappers[ntype];
   if (taosMkDir(pWrapper->path) != 0) {
     dmReleaseWrapper(pWrapper);
-    code = TAOS_SYSTEM_ERROR(errno);
+    code = terrno;
     dError("failed to create dir:%s since %s", pWrapper->path, tstrerror(code));
     return code;
   }
@@ -333,7 +333,7 @@ static int32_t dmProcessAlterNodeTypeReq(EDndNodeType ntype, SRpcMsg *pMsg) {
   pWrapper = &pDnode->wrappers[ntype];
   if (taosMkDir(pWrapper->path) != 0) {
     taosThreadMutexUnlock(&pDnode->mutex);
-    code = TAOS_SYSTEM_ERROR(errno);
+    code = terrno;
     dError("failed to create dir:%s since %s", pWrapper->path, tstrerror(code));
     return code;
   }

source/dnode/mgmt/node_mgmt/src/dmNodes.c

@@ -21,7 +21,7 @@ int32_t dmOpenNode(SMgmtWrapper *pWrapper) {
   SDnode *pDnode = pWrapper->pDnode;
 
   if (taosMkDir(pWrapper->path) != 0) {
-    code = TAOS_SYSTEM_ERROR(errno);
+    code = terrno;
     dError("node:%s, failed to create dir:%s since %s", pWrapper->name, pWrapper->path, tstrerror(code));
     return code;
   }

source/dnode/mgmt/node_util/src/dmFile.c

@@ -417,7 +417,7 @@ int32_t dmUpdateEncryptKey(char *key, bool toLogFile) {
   }
 
   if (taosMkDir(folder) != 0) {
-    code = TAOS_SYSTEM_ERROR(errno);
+    code = terrno;
     encryptError("failed to create dir:%s since %s", folder, tstrerror(code));
     goto _OVER;
   }

source/dnode/mnode/impl/inc/mndConsumer.h

@@ -30,9 +30,9 @@ enum {
 
 int32_t mndInitConsumer(SMnode *pMnode);
 void    mndCleanupConsumer(SMnode *pMnode);
-void    mndSendConsumerMsg(SMnode *pMnode, int64_t consumerId, uint16_t msgType, SRpcHandleInfo* info);
+int32_t mndSendConsumerMsg(SMnode *pMnode, int64_t consumerId, uint16_t msgType, SRpcHandleInfo* info);
 
-SMqConsumerObj *mndAcquireConsumer(SMnode *pMnode, int64_t consumerId);
+int32_t mndAcquireConsumer(SMnode *pMnode, int64_t consumerId, SMqConsumerObj** pConsumer);
 void    mndReleaseConsumer(SMnode *pMnode, SMqConsumerObj *pConsumer);
 
 SSdbRaw *mndConsumerActionEncode(SMqConsumerObj *pConsumer);
@@ -43,6 +43,22 @@ int32_t mndSetConsumerDropLogs(STrans *pTrans, SMqConsumerObj *pConsumer);
 
 const char *mndConsumerStatusName(int status);
 
+#define MND_TMQ_NULL_CHECK(c)                \
+  do {                                   \
+    if (c == NULL) {                     \
+      code = TSDB_CODE_OUT_OF_MEMORY;     \
+      goto END;                          \
+    }                                    \
+  } while (0)
+
+#define MND_TMQ_RETURN_CHECK(c)                \
+  do {                                     \
+    code = c;                            \
+    if (code != 0) {                     \
+      goto END;                          \
+    }                                    \
+  } while (0)
+
 #ifdef __cplusplus
 }
 #endif

source/dnode/mnode/impl/inc/mndDef.h

@@ -622,7 +622,8 @@ typedef struct {
   int32_t resetOffsetCfg;
 } SMqConsumerObj;
 
-SMqConsumerObj *tNewSMqConsumerObj(int64_t consumerId, char *cgroup, int8_t updateType, char *topic, SCMSubscribeReq *subscribe);
+int32_t         tNewSMqConsumerObj(int64_t consumerId, char *cgroup, int8_t updateType,
+                           char *topic, SCMSubscribeReq *subscribe, SMqConsumerObj** ppConsumer);
 void            tClearSMqConsumerObj(SMqConsumerObj* pConsumer);
 void            tDeleteSMqConsumerObj(SMqConsumerObj* pConsumer);
 int32_t         tEncodeSMqConsumerObj(void** buf, const SMqConsumerObj* pConsumer);
@@ -665,8 +666,8 @@ typedef struct {
   char*     qmsg;  // SubPlanToString
 } SMqSubscribeObj;
 
-SMqSubscribeObj* tNewSubscribeObj(const char key[TSDB_SUBSCRIBE_KEY_LEN]);
+int32_t          tNewSubscribeObj(const char *key, SMqSubscribeObj **ppSub);
-SMqSubscribeObj* tCloneSubscribeObj(const SMqSubscribeObj* pSub);
+int32_t          tCloneSubscribeObj(const SMqSubscribeObj* pSub, SMqSubscribeObj **ppSub);
 void             tDeleteSubscribeObj(SMqSubscribeObj* pSub);
 int32_t          tEncodeSubscribeObj(void** buf, const SMqSubscribeObj* pSub);
 void*            tDecodeSubscribeObj(const void* buf, SMqSubscribeObj* pSub, int8_t sver);

source/dnode/mnode/impl/inc/mndSubscribe.h

@@ -26,12 +26,9 @@ int32_t mndInitSubscribe(SMnode *pMnode);
 void    mndCleanupSubscribe(SMnode *pMnode);
 
 int32_t          mndGetGroupNumByTopic(SMnode *pMnode, const char *topicName);
-SMqSubscribeObj *mndAcquireSubscribe(SMnode *pMnode, const char *CGroup, const char *topicName);
+int32_t          mndAcquireSubscribeByKey(SMnode *pMnode, const char *key, SMqSubscribeObj** pSub);
-SMqSubscribeObj *mndAcquireSubscribeByKey(SMnode *pMnode, const char *key);
 void             mndReleaseSubscribe(SMnode *pMnode, SMqSubscribeObj *pSub);
 
-void    mndMakeSubscribeKey(char *key, const char *cgroup, const char *topicName);
-
 int32_t mndDropSubByTopic(SMnode *pMnode, STrans *pTrans, const char *topic);
 int32_t mndSetDropSubCommitLogs(SMnode *pMnode, STrans *pTrans, SMqSubscribeObj *pSub);
 

source/dnode/mnode/impl/inc/mndTopic.h

@@ -25,13 +25,12 @@ extern "C" {
 int32_t mndInitTopic(SMnode *pMnode);
 void    mndCleanupTopic(SMnode *pMnode);
 
-SMqTopicObj *mndAcquireTopic(SMnode *pMnode, const char *topicName);
+int32_t      mndAcquireTopic(SMnode *pMnode, const char *topicName, SMqTopicObj **pTopic);
 void         mndReleaseTopic(SMnode *pMnode, SMqTopicObj *pTopic);
 int32_t      mndDropTopicByDB(SMnode *pMnode, STrans *pTrans, SDbObj *pDb);
 bool         mndTopicExistsForDb(SMnode *pMnode, SDbObj *pDb);
-const char  *mndTopicGetShowName(const char topic[TSDB_TOPIC_FNAME_LEN]);
+void         mndTopicGetShowName(const char* fullTopic, char* topic);
 
-int32_t mndSetTopicCommitLogs(SMnode *pMnode, STrans *pTrans, SMqTopicObj *pTopic);
 int32_t mndGetNumOfTopics(SMnode *pMnode, char *dbName, int32_t *pNumOfTopics);
 
 #ifdef __cplusplus

source/dnode/mnode/impl/src/mndConsumer.c

@@ -40,7 +40,6 @@ static int32_t mndProcessSubscribeReq(SRpcMsg *pMsg);
 static int32_t mndProcessAskEpReq(SRpcMsg *pMsg);
 static int32_t mndProcessMqHbReq(SRpcMsg *pMsg);
 static int32_t mndProcessConsumerClearMsg(SRpcMsg *pMsg);
-static int32_t mndProcessConsumerRecoverMsg(SRpcMsg *pMsg);
 
 int32_t mndInitConsumer(SMnode *pMnode) {
   SSdbTable table = {
@@ -57,7 +56,6 @@ int32_t mndInitConsumer(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_MND_TMQ_HB, mndProcessMqHbReq);
   mndSetMsgHandle(pMnode, TDMT_MND_TMQ_ASK_EP, mndProcessAskEpReq);
   //  mndSetMsgHandle(pMnode, TDMT_MND_TMQ_TIMER, mndProcessMqTimerMsg);
-  mndSetMsgHandle(pMnode, TDMT_MND_TMQ_CONSUMER_RECOVER, mndProcessConsumerRecoverMsg);
   mndSetMsgHandle(pMnode, TDMT_MND_TMQ_LOST_CONSUMER_CLEAR, mndProcessConsumerClearMsg);
 
   mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_CONSUMERS, mndRetrieveConsumer);
@@ -68,13 +66,10 @@ int32_t mndInitConsumer(SMnode *pMnode) {
 
 void mndCleanupConsumer(SMnode *pMnode) {}
 
-void mndSendConsumerMsg(SMnode *pMnode, int64_t consumerId, uint16_t msgType, SRpcHandleInfo *info) {
+int32_t mndSendConsumerMsg(SMnode *pMnode, int64_t consumerId, uint16_t msgType, SRpcHandleInfo *info) {
+  int32_t code = 0;
   void   *msg  = rpcMallocCont(sizeof(int64_t));
-  if (msg == NULL) {
+  MND_TMQ_NULL_CHECK(msg);
-    mError("consumer:0x%" PRIx64 " failed to clear consumer due to out of memory. alloc size:%d", consumerId,
-           (int32_t)sizeof(int64_t));
-    return;
-  }
 
   *(int64_t*)msg = consumerId;
   SRpcMsg rpcMsg = {
@@ -85,108 +80,51 @@ void mndSendConsumerMsg(SMnode *pMnode, int64_t consumerId, uint16_t msgType, SR
   };
 
   mInfo("mndSendConsumerMsg type:%d consumer:0x%" PRIx64, msgType, consumerId);
-  int32_t code = tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg);
+  MND_TMQ_RETURN_CHECK(tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg));
-  if (code != 0){
+  return code;
-    mError("consumer:%"PRId64" send consumer msg:%d error:%d", consumerId, msgType, code);
+
-  }
+END:
+  taosMemoryFree(msg);
+  return code;
 }
 
 static int32_t validateTopics(const SArray *pTopicList, SMnode *pMnode, const char *pUser,
                               bool enableReplay) {
   SMqTopicObj *pTopic = NULL;
   int32_t      code = 0;
-  int32_t      lino = 0;
 
   int32_t numOfTopics = taosArrayGetSize(pTopicList);
   for (int32_t i = 0; i < numOfTopics; i++) {
     char *pOneTopic = taosArrayGetP(pTopicList, i);
-    pTopic = mndAcquireTopic(pMnode, pOneTopic);
+    MND_TMQ_RETURN_CHECK(mndAcquireTopic(pMnode, pOneTopic, &pTopic));
-    if (pTopic == NULL) {  // terrno has been set by callee function
+    MND_TMQ_RETURN_CHECK(mndCheckTopicPrivilege(pMnode, pUser, MND_OPER_SUBSCRIBE, pTopic));
-      code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+    MND_TMQ_RETURN_CHECK(grantCheckExpire(TSDB_GRANT_SUBSCRIPTION));
-      if (terrno != 0) code = terrno;
-      goto FAILED;
-    }
-
-    TAOS_CHECK_GOTO(mndCheckTopicPrivilege(pMnode, pUser, MND_OPER_SUBSCRIBE, pTopic), &lino, FAILED);
-
-    TAOS_CHECK_GOTO(grantCheckExpire(TSDB_GRANT_SUBSCRIPTION), &lino, FAILED);
 
     if (enableReplay) {
       if (pTopic->subType != TOPIC_SUB_TYPE__COLUMN) {
         code = TSDB_CODE_TMQ_REPLAY_NOT_SUPPORT;
-        goto FAILED;
+        goto END;
       } else if (pTopic->ntbUid == 0 && pTopic->ctbStbUid == 0) {
         SDbObj *pDb = mndAcquireDb(pMnode, pTopic->db);
         if (pDb == NULL) {
           code = TSDB_CODE_MND_RETURN_VALUE_NULL;
-          if (terrno != 0) code = terrno;
+          goto END;
-          goto FAILED;
         }
         if (pDb->cfg.numOfVgroups != 1) {
           mndReleaseDb(pMnode, pDb);
           code = TSDB_CODE_TMQ_REPLAY_NEED_ONE_VGROUP;
-          goto FAILED;
+          goto END;
         }
         mndReleaseDb(pMnode, pDb);
       }
     }
-
     mndReleaseTopic(pMnode, pTopic);
   }
-
   return 0;
-FAILED:
-  mndReleaseTopic(pMnode, pTopic);
-  TAOS_RETURN(code);
-}
 
-static int32_t mndProcessConsumerRecoverMsg(SRpcMsg *pMsg) {
-  int32_t                code = 0;
-  int32_t                lino = 0;
-  SMnode                *pMnode = pMsg->info.node;
-  SMqConsumerRecoverMsg *pRecoverMsg = pMsg->pCont;
-  SMqConsumerObj        *pConsumerNew = NULL;
-  STrans                *pTrans = NULL;
-  SMqConsumerObj        *pConsumer = mndAcquireConsumer(pMnode, pRecoverMsg->consumerId);
-  if (pConsumer == NULL) {
-    mError("cannot find consumer %" PRId64 " when processing consumer recover msg", pRecoverMsg->consumerId);
-    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
-    if (terrno != 0) code = terrno;
-    goto END;
-  }
-
-  mInfo("receive consumer recover msg, consumer:0x%" PRIx64 " status:%d(%s)", pRecoverMsg->consumerId,
-        pConsumer->status, mndConsumerStatusName(pConsumer->status));
-
-  if (pConsumer->status != MQ_CONSUMER_STATUS_LOST) {
-    code = TSDB_CODE_MND_CONSUMER_NOT_READY;
-    goto END;
-  }
-
-  pConsumerNew = tNewSMqConsumerObj(pConsumer->consumerId, pConsumer->cgroup, CONSUMER_UPDATE_REC, NULL, NULL);
-  if (pConsumerNew == NULL){
-    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
-    if (terrno != 0) code = terrno;
-    goto END;
-  }
-
-  pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_CONFLICT_NOTHING, pMsg, "recover-csm");
-  if (pTrans == NULL) {
-    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
-    if (terrno != 0) code = terrno;
-    goto END;
-  }
-
-  TAOS_CHECK_GOTO(validateTopics(pConsumer->assignedTopics, pMnode, pMsg->info.conn.user, false), &lino, END);
-
-  TAOS_CHECK_GOTO(mndSetConsumerCommitLogs(pTrans, pConsumerNew), &lino, END);
-
-  code = mndTransPrepare(pMnode, pTrans);
 END:
-  mndReleaseConsumer(pMnode, pConsumer);
+  mndReleaseTopic(pMnode, pTopic);
-  tDeleteSMqConsumerObj(pConsumerNew);
+  return code;
-  mndTransDrop(pTrans);
-  TAOS_RETURN(code);
 }
 
 static int32_t mndProcessConsumerClearMsg(SRpcMsg *pMsg) {
@@ -196,55 +134,39 @@ static int32_t mndProcessConsumerClearMsg(SRpcMsg *pMsg) {
   SMqConsumerClearMsg *pClearMsg = pMsg->pCont;
   SMqConsumerObj      *pConsumerNew = NULL;
   STrans              *pTrans = NULL;
+  SMqConsumerObj      *pConsumer = NULL;
 
-  SMqConsumerObj *pConsumer = mndAcquireConsumer(pMnode, pClearMsg->consumerId);
+  MND_TMQ_RETURN_CHECK(mndAcquireConsumer(pMnode, pClearMsg->consumerId, &pConsumer));
-  if (pConsumer == NULL) {
-    mError("consumer:0x%" PRIx64 " failed to be found to clear it", pClearMsg->consumerId);
-    TAOS_RETURN(code);
-  }
-
   mInfo("consumer:0x%" PRIx64 " needs to be cleared, status %s", pClearMsg->consumerId,
         mndConsumerStatusName(pConsumer->status));
 
-  pConsumerNew = tNewSMqConsumerObj(pConsumer->consumerId, pConsumer->cgroup, -1, NULL, NULL);
+  MND_TMQ_RETURN_CHECK(tNewSMqConsumerObj(pConsumer->consumerId, pConsumer->cgroup, -1, NULL, NULL, &pConsumerNew));
-  if (pConsumerNew == NULL){
-    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
-    if (terrno != 0) code = terrno;
-    goto END;
-  }
-
   pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_CONFLICT_NOTHING, pMsg, "clear-csm");
-  if (pTrans == NULL) {
+  MND_TMQ_NULL_CHECK(pTrans);
-    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+  MND_TMQ_RETURN_CHECK(mndSetConsumerDropLogs(pTrans, pConsumerNew));
-    if (terrno != 0) code = terrno;
-    goto END;
-  }
-
-  // this is the drop action, not the update action
-  TAOS_CHECK_GOTO(mndSetConsumerDropLogs(pTrans, pConsumerNew), &lino, END);
-
   code = mndTransPrepare(pMnode, pTrans);
 
 END:
   mndReleaseConsumer(pMnode, pConsumer);
   tDeleteSMqConsumerObj(pConsumerNew);
   mndTransDrop(pTrans);
-  TAOS_RETURN(code);
+  return code;
 }
 
 static int32_t checkPrivilege(SMnode *pMnode, SMqConsumerObj *pConsumer, SMqHbRsp *rsp, char *user) {
+  int32_t code = 0;
   rsp->topicPrivileges = taosArrayInit(taosArrayGetSize(pConsumer->currentTopics), sizeof(STopicPrivilege));
-  if (rsp->topicPrivileges == NULL) {
+  MND_TMQ_NULL_CHECK(rsp->topicPrivileges);
-    return TSDB_CODE_OUT_OF_MEMORY;
-  }
   for (int32_t i = 0; i < taosArrayGetSize(pConsumer->currentTopics); i++) {
     char        *topic = taosArrayGetP(pConsumer->currentTopics, i);
-    SMqTopicObj *pTopic = mndAcquireTopic(pMnode, topic);
+    SMqTopicObj *pTopic = NULL;
-    if (pTopic == NULL) {  // terrno has been set by callee function
+    code = mndAcquireTopic(pMnode, topic, &pTopic);
+    if (code != TDB_CODE_SUCCESS) {
       continue;
     }
     STopicPrivilege *data = taosArrayReserve(rsp->topicPrivileges, 1);
-    strcpy(data->topic, topic);
+    MND_TMQ_NULL_CHECK(data);
+    (void)strcpy(data->topic, topic);
     if (mndCheckTopicPrivilege(pMnode, user, MND_OPER_SUBSCRIBE, pTopic) != 0 ||
         grantCheckExpire(TSDB_GRANT_SUBSCRIPTION) < 0) {
       data->noPrivilege = 1;
@@ -253,22 +175,30 @@ static int32_t checkPrivilege(SMnode *pMnode, SMqConsumerObj *pConsumer, SMqHbRs
     }
     mndReleaseTopic(pMnode, pTopic);
   }
-  return 0;
+END:
+  return code;
 }
 
 static void storeOffsetRows(SMnode *pMnode, SMqHbReq *req, SMqConsumerObj *pConsumer){
   for (int i = 0; i < taosArrayGetSize(req->topics); i++) {
     TopicOffsetRows *data = taosArrayGet(req->topics, i);
+    if (data == NULL){
+      continue;
+    }
     mInfo("heartbeat report offset rows.%s:%s", pConsumer->cgroup, data->topicName);
 
-    SMqSubscribeObj *pSub = mndAcquireSubscribe(pMnode, pConsumer->cgroup, data->topicName);
+    SMqSubscribeObj *pSub = NULL;
-    if (pSub == NULL) {
+    char  key[TSDB_SUBSCRIBE_KEY_LEN] = {0};
+    (void)snprintf(key, TSDB_SUBSCRIBE_KEY_LEN, "%s%s%s", pConsumer->cgroup, TMQ_SEPARATOR, data->topicName);
+    int32_t code = mndAcquireSubscribeByKey(pMnode, key, &pSub);
+    if (code != 0) {
+      mError("failed to acquire subscribe by key:%s, code:%d", key, code);
       continue;
     }
     taosWLockLatch(&pSub->lock);
     SMqConsumerEp *pConsumerEp = taosHashGet(pSub->consumerHash, &pConsumer->consumerId, sizeof(int64_t));
     if (pConsumerEp) {
-      taosArrayDestroy(pConsumerEp->offsetRows);
+      (void)taosArrayDestroy(pConsumerEp->offsetRows);
       pConsumerEp->offsetRows = data->offsetRows;
       data->offsetRows = NULL;
     }
@@ -303,36 +233,24 @@ static int32_t mndProcessMqHbReq(SRpcMsg *pMsg) {
   SMqHbReq        req = {0};
   SMqHbRsp        rsp = {0};
   SMqConsumerObj *pConsumer = NULL;
-
+  MND_TMQ_RETURN_CHECK(tDeserializeSMqHbReq(pMsg->pCont, pMsg->contLen, &req));
-  TAOS_CHECK_GOTO(tDeserializeSMqHbReq(pMsg->pCont, pMsg->contLen, &req), NULL, end);
-
   int64_t consumerId = req.consumerId;
-  pConsumer = mndAcquireConsumer(pMnode, consumerId);
+  MND_TMQ_RETURN_CHECK(mndAcquireConsumer(pMnode, consumerId, &pConsumer));
-  if (pConsumer == NULL) {
+  MND_TMQ_RETURN_CHECK(checkPrivilege(pMnode, pConsumer, &rsp, pMsg->info.conn.user));
-    mError("consumer:0x%" PRIx64 " not exist", consumerId);
-    code = TSDB_CODE_MND_CONSUMER_NOT_EXIST;
-    goto end;
-  }
-
-  TAOS_CHECK_GOTO(checkPrivilege(pMnode, pConsumer, &rsp, pMsg->info.conn.user), NULL, end);
-
   atomic_store_32(&pConsumer->hbStatus, 0);
-
   int32_t status = atomic_load_32(&pConsumer->status);
-
   if (status == MQ_CONSUMER_STATUS_LOST) {
     mInfo("try to recover consumer:0x%" PRIx64, consumerId);
-    mndSendConsumerMsg(pMnode, pConsumer->consumerId, TDMT_MND_TMQ_CONSUMER_RECOVER, &pMsg->info);
+    MND_TMQ_RETURN_CHECK(mndSendConsumerMsg(pMnode, pConsumer->consumerId, TDMT_MND_TMQ_CONSUMER_RECOVER, &pMsg->info));
   }
-
   storeOffsetRows(pMnode, &req, pConsumer);
   code = buildMqHbRsp(pMsg, &rsp);
 
-end:
+END:
   tDestroySMqHbRsp(&rsp);
   mndReleaseConsumer(pMnode, pConsumer);
   tDestroySMqHbReq(&req);
-  TAOS_RETURN(code);
+  return code;
 }
 
 static int32_t addEpSetInfo(SMnode *pMnode, SMqConsumerObj *pConsumer, int32_t epoch, SMqAskEpRsp *rsp){
@@ -349,19 +267,22 @@ static int32_t addEpSetInfo(SMnode *pMnode, SMqConsumerObj *pConsumer, int32_t e
   // handle all topics subscribed by this consumer
   for (int32_t i = 0; i < numOfTopics; i++) {
     char            *topic = taosArrayGetP(pConsumer->currentTopics, i);
-    SMqSubscribeObj *pSub = mndAcquireSubscribe(pMnode, pConsumer->cgroup, topic);
+    SMqSubscribeObj *pSub = NULL;
-    // txn guarantees pSub is created
+    char  key[TSDB_SUBSCRIBE_KEY_LEN] = {0};
-    if (pSub == NULL) {
+    (void)snprintf(key, TSDB_SUBSCRIBE_KEY_LEN, "%s%s%s", pConsumer->cgroup, TMQ_SEPARATOR, topic);
+    int32_t code = mndAcquireSubscribeByKey(pMnode, key, &pSub);
+    if (code != 0) {
       continue;
     }
     taosRLockLatch(&pSub->lock);
 
     SMqSubTopicEp topicEp = {0};
-    strcpy(topicEp.topic, topic);
+    (void)strcpy(topicEp.topic, topic);
 
     // 2.1 fetch topic schema
-    SMqTopicObj *pTopic = mndAcquireTopic(pMnode, topic);
+    SMqTopicObj *pTopic = NULL;
-    if (pTopic == NULL) {
+    code = mndAcquireTopic(pMnode, topic, &pTopic);
+    if (code != TDB_CODE_SUCCESS) {
       taosRUnLockLatch(&pSub->lock);
       mndReleaseSubscribe(pMnode, pSub);
       continue;
@@ -371,16 +292,27 @@ static int32_t addEpSetInfo(SMnode *pMnode, SMqConsumerObj *pConsumer, int32_t e
     topicEp.schema.nCols = pTopic->schema.nCols;
     if (topicEp.schema.nCols) {
       topicEp.schema.pSchema = taosMemoryCalloc(topicEp.schema.nCols, sizeof(SSchema));
-      memcpy(topicEp.schema.pSchema, pTopic->schema.pSchema, topicEp.schema.nCols * sizeof(SSchema));
+      if (topicEp.schema.pSchema == NULL) {
+        taosRUnLockLatch(&pTopic->lock);
+        taosRUnLockLatch(&pSub->lock);
+        mndReleaseSubscribe(pMnode, pSub);
+        mndReleaseTopic(pMnode, pTopic);
+        return TSDB_CODE_OUT_OF_MEMORY;
+      }
+      (void)memcpy(topicEp.schema.pSchema, pTopic->schema.pSchema, topicEp.schema.nCols * sizeof(SSchema));
     }
     taosRUnLockLatch(&pTopic->lock);
     mndReleaseTopic(pMnode, pTopic);
 
     // 2.2 iterate all vg assigned to the consumer of that topic
     SMqConsumerEp *pConsumerEp = taosHashGet(pSub->consumerHash, &pConsumer->consumerId, sizeof(int64_t));
+    if (pConsumerEp == NULL) {
+      taosRUnLockLatch(&pConsumer->lock);
+      taosRUnLockLatch(&pSub->lock);
+      mndReleaseSubscribe(pMnode, pSub);
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
     int32_t vgNum = taosArrayGetSize(pConsumerEp->vgs);
-
-    // this customer assigned vgroups
     topicEp.vgs = taosArrayInit(vgNum, sizeof(SMqSubVgEp));
     if (topicEp.vgs == NULL) {
       taosRUnLockLatch(&pConsumer->lock);
@@ -391,9 +323,9 @@ static int32_t addEpSetInfo(SMnode *pMnode, SMqConsumerObj *pConsumer, int32_t e
 
     for (int32_t j = 0; j < vgNum; j++) {
       SMqVgEp *pVgEp = taosArrayGetP(pConsumerEp->vgs, j);
-      //        char     offsetKey[TSDB_PARTITION_KEY_LEN];
+      if (pVgEp == NULL) {
-      //        mndMakePartitionKey(offsetKey, pConsumer->cgroup, topic, pVgEp->vgId);
+        continue;
-
+      }
       if (epoch == -1) {
         SVgObj *pVgroup = mndAcquireVgroup(pMnode, pVgEp->vgId);
         if (pVgroup) {
@@ -401,17 +333,10 @@ static int32_t addEpSetInfo(SMnode *pMnode, SMqConsumerObj *pConsumer, int32_t e
           mndReleaseVgroup(pMnode, pVgroup);
         }
       }
-      // 2.2.1 build vg ep
+      SMqSubVgEp vgEp = {.epSet = pVgEp->epSet, .vgId = pVgEp->vgId, .offset = -1};
-      SMqSubVgEp vgEp = {
+      (void)taosArrayPush(topicEp.vgs, &vgEp);
-          .epSet = pVgEp->epSet,
-          .vgId = pVgEp->vgId,
-          .offset = -1,
-      };
-
-      taosArrayPush(topicEp.vgs, &vgEp);
     }
-    taosArrayPush(rsp->topics, &topicEp);
+    (void)taosArrayPush(rsp->topics, &topicEp);
-
     taosRUnLockLatch(&pSub->lock);
     mndReleaseSubscribe(pMnode, pSub);
   }
@@ -437,12 +362,15 @@ static int32_t buildAskEpRsp(SRpcMsg *pMsg, SMqAskEpRsp *rsp, int32_t serverEpoc
   pHead->walever = 0;
 
   void *abuf = POINTER_SHIFT(buf, sizeof(SMqRspHead));
-  tEncodeSMqAskEpRsp(&abuf, rsp);
+  if (tEncodeSMqAskEpRsp(&abuf, rsp) < 0) {
+    rpcFreeCont(buf);
+    return TSDB_CODE_TSC_INTERNAL_ERROR;
+  }
 
   // send rsp
   pMsg->info.rsp = buf;
   pMsg->info.rspLen = tlen;
-  TAOS_RETURN(code);
+  return code;
 }
 
 static int32_t mndProcessAskEpReq(SRpcMsg *pMsg) {
@@ -450,33 +378,22 @@ static int32_t mndProcessAskEpReq(SRpcMsg *pMsg) {
   SMqAskEpReq req = {0};
   SMqAskEpRsp rsp = {0};
   int32_t     code = 0;
+  SMqConsumerObj *pConsumer = NULL;
 
-  TAOS_CHECK_RETURN(tDeserializeSMqAskEpReq(pMsg->pCont, pMsg->contLen, &req));
+  MND_TMQ_RETURN_CHECK(tDeserializeSMqAskEpReq(pMsg->pCont, pMsg->contLen, &req));
-
   int64_t consumerId = req.consumerId;
-
+  MND_TMQ_RETURN_CHECK(mndAcquireConsumer(pMnode, consumerId, &pConsumer));
-  SMqConsumerObj *pConsumer = mndAcquireConsumer(pMnode, consumerId);
-  if (pConsumer == NULL) {
-    mError("consumer:0x%" PRIx64 " group:%s not exists in sdb", consumerId, req.cgroup);
-    return TSDB_CODE_MND_CONSUMER_NOT_EXIST;
-  }
-
   if (strncmp(req.cgroup, pConsumer->cgroup, tListLen(pConsumer->cgroup)) != 0) {
     mError("consumer:0x%" PRIx64 " group:%s not consistent with data in sdb, saved cgroup:%s", consumerId, req.cgroup,
            pConsumer->cgroup);
     code = TSDB_CODE_MND_CONSUMER_NOT_EXIST;
     goto END;
   }
-
   atomic_store_32(&pConsumer->hbStatus, 0);
-
-  // 1. check consumer status
   int32_t status = atomic_load_32(&pConsumer->status);
-
   if (status == MQ_CONSUMER_STATUS_LOST) {
-    mndSendConsumerMsg(pMnode, pConsumer->consumerId, TDMT_MND_TMQ_CONSUMER_RECOVER, &pMsg->info);
+    MND_TMQ_RETURN_CHECK(mndSendConsumerMsg(pMnode, pConsumer->consumerId, TDMT_MND_TMQ_CONSUMER_RECOVER, &pMsg->info));
   }
-
   if (status != MQ_CONSUMER_STATUS_READY) {
     mInfo("consumer:0x%" PRIx64 " not ready, status: %s", consumerId, mndConsumerStatusName(status));
     code = TSDB_CODE_MND_CONSUMER_NOT_READY;
@@ -490,10 +407,7 @@ static int32_t mndProcessAskEpReq(SRpcMsg *pMsg) {
   if (epoch != serverEpoch) {
     mInfo("process ask ep, consumer:0x%" PRIx64 "(epoch %d) update with server epoch %d",
           consumerId, epoch, serverEpoch);
-    code = addEpSetInfo(pMnode, pConsumer, epoch, &rsp);
+    MND_TMQ_RETURN_CHECK(addEpSetInfo(pMnode, pConsumer, epoch, &rsp));
-    if(code != 0){
-      goto END;
-    }
   }
 
   code = buildAskEpRsp(pMsg, &rsp, serverEpoch, consumerId);
@@ -507,27 +421,29 @@ END:
 int32_t mndSetConsumerDropLogs(STrans *pTrans, SMqConsumerObj *pConsumer) {
   int32_t  code = 0;
   SSdbRaw *pCommitRaw = mndConsumerActionEncode(pConsumer);
-  if (pCommitRaw == NULL) {
+  MND_TMQ_NULL_CHECK(pCommitRaw);
-    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+  code = mndTransAppendCommitlog(pTrans, pCommitRaw);
-    if (terrno != 0) code = terrno;
+  if (code != 0) {
-    TAOS_RETURN(code);
+    sdbFreeRaw(pCommitRaw);
+    goto END;
   }
-  TAOS_CHECK_RETURN(mndTransAppendCommitlog(pTrans, pCommitRaw));
+  MND_TMQ_RETURN_CHECK(sdbSetRawStatus(pCommitRaw, SDB_STATUS_DROPPED));
-  TAOS_CHECK_RETURN(sdbSetRawStatus(pCommitRaw, SDB_STATUS_DROPPED));
+END:
-  TAOS_RETURN(code);
+  return code;
 }
 
 int32_t mndSetConsumerCommitLogs(STrans *pTrans, SMqConsumerObj *pConsumer) {
   int32_t  code = 0;
   SSdbRaw *pCommitRaw = mndConsumerActionEncode(pConsumer);
-  if (pCommitRaw == NULL) {
+  MND_TMQ_NULL_CHECK(pCommitRaw);
-    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+  code = mndTransAppendCommitlog(pTrans, pCommitRaw);
-    if (terrno != 0) code = terrno;
+  if (code != 0) {
-    TAOS_RETURN(code);
+    sdbFreeRaw(pCommitRaw);
+    goto END;
   }
-  TAOS_CHECK_RETURN(mndTransAppendCommitlog(pTrans, pCommitRaw));
+  MND_TMQ_RETURN_CHECK(sdbSetRawStatus(pCommitRaw, SDB_STATUS_READY));
-  TAOS_CHECK_RETURN(sdbSetRawStatus(pCommitRaw, SDB_STATUS_READY));
+END:
-  TAOS_RETURN(code);
+  return code;
 }
 
 static void freeItem(void *param) {
@@ -538,29 +454,35 @@ static void freeItem(void *param) {
 }
 
 static int32_t getTopicAddDelete(SMqConsumerObj *pExistedConsumer, SMqConsumerObj *pConsumerNew){
+  int32_t code = 0;
   pConsumerNew->rebNewTopics = taosArrayInit(0, sizeof(void *));
+  MND_TMQ_NULL_CHECK(pConsumerNew->rebNewTopics);
   pConsumerNew->rebRemovedTopics = taosArrayInit(0, sizeof(void *));
-  if(pConsumerNew->rebNewTopics == NULL || pConsumerNew->rebRemovedTopics == NULL){
+  MND_TMQ_NULL_CHECK(pConsumerNew->rebRemovedTopics);
-    return TSDB_CODE_OUT_OF_MEMORY;
+
-  }
   int32_t newTopicNum = taosArrayGetSize(pConsumerNew->assignedTopics);
   int32_t oldTopicNum = taosArrayGetSize(pExistedConsumer->currentTopics);
-
   int32_t i = 0, j = 0;
   while (i < oldTopicNum || j < newTopicNum) {
     if (i >= oldTopicNum) {
-      char *newTopicCopy = taosStrdup(taosArrayGetP(pConsumerNew->assignedTopics, j));
+      void* tmp = taosArrayGetP(pConsumerNew->assignedTopics, j);
-      taosArrayPush(pConsumerNew->rebNewTopics, &newTopicCopy);
+      MND_TMQ_NULL_CHECK(tmp);
+      char *newTopicCopy = taosStrdup(tmp);
+      MND_TMQ_NULL_CHECK(taosArrayPush(pConsumerNew->rebNewTopics, &newTopicCopy));
       j++;
       continue;
     } else if (j >= newTopicNum) {
-      char *oldTopicCopy = taosStrdup(taosArrayGetP(pExistedConsumer->currentTopics, i));
+      void* tmp = taosArrayGetP(pExistedConsumer->currentTopics, i);
-      taosArrayPush(pConsumerNew->rebRemovedTopics, &oldTopicCopy);
+      MND_TMQ_NULL_CHECK(tmp);
+      char *oldTopicCopy = taosStrdup(tmp);
+      MND_TMQ_NULL_CHECK(taosArrayPush(pConsumerNew->rebRemovedTopics, &oldTopicCopy));
       i++;
       continue;
     } else {
       char *oldTopic = taosArrayGetP(pExistedConsumer->currentTopics, i);
+      MND_TMQ_NULL_CHECK(oldTopic);
       char *newTopic = taosArrayGetP(pConsumerNew->assignedTopics, j);
+      MND_TMQ_NULL_CHECK(newTopic);
       int   comp = strcmp(oldTopic, newTopic);
       if (comp == 0) {
         i++;
@@ -568,22 +490,22 @@ static int32_t getTopicAddDelete(SMqConsumerObj *pExistedConsumer, SMqConsumerOb
         continue;
       } else if (comp < 0) {
         char *oldTopicCopy = taosStrdup(oldTopic);
-        taosArrayPush(pConsumerNew->rebRemovedTopics, &oldTopicCopy);
+        MND_TMQ_NULL_CHECK(taosArrayPush(pConsumerNew->rebRemovedTopics, &oldTopicCopy));
         i++;
         continue;
       } else {
         char *newTopicCopy = taosStrdup(newTopic);
-        taosArrayPush(pConsumerNew->rebNewTopics, &newTopicCopy);
+        MND_TMQ_NULL_CHECK(taosArrayPush(pConsumerNew->rebNewTopics, &newTopicCopy));
         j++;
         continue;
       }
     }
   }
-  return 0;
+END:
+  return code;
 }
 
 static int32_t checkAndSortTopic(SMnode *pMnode, SArray *pTopicList){
-  int32_t code = 0;
   taosArraySort(pTopicList, taosArrayCompareString);
   taosArrayRemoveDuplicate(pTopicList, taosArrayCompareString, freeItem);
 
@@ -594,24 +516,21 @@ static int32_t checkAndSortTopic(SMnode *pMnode, SArray *pTopicList){
       return TSDB_CODE_TMQ_GROUP_OUT_OF_RANGE;
     }
   }
-  TAOS_RETURN(code);
+  return 0;
 }
 
-static SMqConsumerObj* buildSubConsumer(SMnode *pMnode, SCMSubscribeReq *subscribe){
+static int32_t buildSubConsumer(SMnode *pMnode, SCMSubscribeReq *subscribe, SMqConsumerObj** ppConsumer){
   int64_t         consumerId = subscribe->consumerId;
   char           *cgroup     = subscribe->cgroup;
   SMqConsumerObj *pConsumerNew     = NULL;
   SMqConsumerObj *pExistedConsumer = NULL;
-  pExistedConsumer = mndAcquireConsumer(pMnode, consumerId);
+  int32_t code = mndAcquireConsumer(pMnode, consumerId, &pExistedConsumer);
-  if (pExistedConsumer == NULL) {
+  if (code != 0) {
     mInfo("receive subscribe request from new consumer:0x%" PRIx64
               ",cgroup:%s, numOfTopics:%d", consumerId,
           subscribe->cgroup, (int32_t)taosArrayGetSize(subscribe->topicNames));
 
-    pConsumerNew = tNewSMqConsumerObj(consumerId, cgroup, CONSUMER_INSERT_SUB, NULL, subscribe);
+    MND_TMQ_RETURN_CHECK(tNewSMqConsumerObj(consumerId, cgroup, CONSUMER_INSERT_SUB, NULL, subscribe, &pConsumerNew));
-    if (pConsumerNew == NULL) {
-      goto _over;
-    }
   } else {
     int32_t status = atomic_load_32(&pExistedConsumer->status);
 
@@ -621,82 +540,53 @@ static SMqConsumerObj* buildSubConsumer(SMnode *pMnode, SCMSubscribeReq *subscri
           (int32_t)taosArrayGetSize(subscribe->topicNames));
 
     if (status != MQ_CONSUMER_STATUS_READY) {
-      terrno = TSDB_CODE_MND_CONSUMER_NOT_READY;
+      code = TSDB_CODE_MND_CONSUMER_NOT_READY;
-      goto _over;
+      goto END;
-    }
-    pConsumerNew = tNewSMqConsumerObj(consumerId, cgroup, CONSUMER_UPDATE_SUB, NULL, subscribe);
-    if (pConsumerNew == NULL) {
-      goto _over;
-    }
-
-    int32_t code = getTopicAddDelete(pExistedConsumer, pConsumerNew);
-    if (code != 0){
-      terrno = code;
-      goto _over;
     }
+    MND_TMQ_RETURN_CHECK(tNewSMqConsumerObj(consumerId, cgroup, CONSUMER_UPDATE_SUB, NULL, subscribe, &pConsumerNew));
+    MND_TMQ_RETURN_CHECK(getTopicAddDelete(pExistedConsumer, pConsumerNew));
   }
   mndReleaseConsumer(pMnode, pExistedConsumer);
-  return pConsumerNew;
+  if (ppConsumer){
+    *ppConsumer = pConsumerNew;
+  }
+  return code;
 
-_over:
+END:
   mndReleaseConsumer(pMnode, pExistedConsumer);
   tDeleteSMqConsumerObj(pConsumerNew);
-  return NULL;
+  return code;
 }
 
 int32_t mndProcessSubscribeReq(SRpcMsg *pMsg) {
   SMnode *pMnode = pMsg->info.node;
   char   *msgStr = pMsg->pCont;
   int32_t code = 0;
-
-  SCMSubscribeReq subscribe = {0};
-  tDeserializeSCMSubscribeReq(msgStr, &subscribe);
-
   SMqConsumerObj *pConsumerNew = NULL;
   STrans         *pTrans = NULL;
 
+  SCMSubscribeReq subscribe = {0};
+  MND_TMQ_RETURN_CHECK(tDeserializeSCMSubscribeReq(msgStr, &subscribe));
   if(taosArrayGetSize(subscribe.topicNames) == 0){
-    SMqConsumerObj *pConsumerTmp = mndAcquireConsumer(pMnode, subscribe.consumerId);
+    SMqConsumerObj *pConsumerTmp = NULL;
-    if(pConsumerTmp == NULL){
+    MND_TMQ_RETURN_CHECK(mndAcquireConsumer(pMnode, subscribe.consumerId, &pConsumerTmp));
-      goto _over;
-    }
     mndReleaseConsumer(pMnode, pConsumerTmp);
   }
-
+  MND_TMQ_RETURN_CHECK(checkAndSortTopic(pMnode, subscribe.topicNames));
-  code = checkAndSortTopic(pMnode, subscribe.topicNames);
-  if(code != TSDB_CODE_SUCCESS){
-    goto _over;
-  }
-
   pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_CONFLICT_NOTHING, pMsg, "subscribe");
-  if (pTrans == NULL) {
+  MND_TMQ_NULL_CHECK(pTrans);
-    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
-    if (terrno != 0) code = terrno;
-    goto _over;
-  }
 
-  code = validateTopics(subscribe.topicNames, pMnode, pMsg->info.conn.user, subscribe.enableReplay);
+  MND_TMQ_RETURN_CHECK(validateTopics(subscribe.topicNames, pMnode, pMsg->info.conn.user, subscribe.enableReplay));
-  if (code != TSDB_CODE_SUCCESS) {
+  MND_TMQ_RETURN_CHECK(buildSubConsumer(pMnode, &subscribe, &pConsumerNew));
-    goto _over;
+  MND_TMQ_RETURN_CHECK(mndSetConsumerCommitLogs(pTrans, pConsumerNew));
-  }
+  MND_TMQ_RETURN_CHECK(mndTransPrepare(pMnode, pTrans));
-
-  pConsumerNew = buildSubConsumer(pMnode, &subscribe);
-  if(pConsumerNew == NULL){
-    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
-    if (terrno != 0) code = terrno;
-    goto _over;
-  }
-
-  TAOS_CHECK_GOTO(mndSetConsumerCommitLogs(pTrans, pConsumerNew), NULL, _over);
-
-  TAOS_CHECK_GOTO(mndTransPrepare(pMnode, pTrans), NULL, _over);
   code = TSDB_CODE_ACTION_IN_PROGRESS;
 
-_over:
+END:
   mndTransDrop(pTrans);
   tDeleteSMqConsumerObj(pConsumerNew);
   taosArrayDestroyP(subscribe.topicNames, (FDelete)taosMemoryFree);
-  TAOS_RETURN(code);
+  return code;
 }
 
 SSdbRaw *mndConsumerActionEncode(SMqConsumerObj *pConsumer) {
@@ -713,7 +603,9 @@ SSdbRaw *mndConsumerActionEncode(SMqConsumerObj *pConsumer) {
   if (buf == NULL) goto CM_ENCODE_OVER;
 
   void *abuf = buf;
-  tEncodeSMqConsumerObj(&abuf, pConsumer);
+  if(tEncodeSMqConsumerObj(&abuf, pConsumer) < 0){
+    goto CM_ENCODE_OVER;
+  }
 
   int32_t dataPos = 0;
   SDB_SET_INT32(pRaw, dataPos, tlen, CM_ENCODE_OVER);
@@ -838,8 +730,7 @@ static bool existInCurrentTopicList(const SMqConsumerObj *pConsumer, const char
   int32_t size = taosArrayGetSize(pConsumer->currentTopics);
   for (int32_t i = 0; i < size; i++) {
     char *topic = taosArrayGetP(pConsumer->currentTopics, i);
-
+    if (topic && strcmp(topic, pTopic) == 0) {
-    if (strcmp(topic, pTopic) == 0) {
       existing = true;
       break;
     }
@@ -865,32 +756,45 @@ static int32_t mndConsumerActionUpdate(SSdb *pSdb, SMqConsumerObj *pOldConsumer,
   } else if (pNewConsumer->updateType == CONSUMER_UPDATE_REC) {
     int32_t sz = taosArrayGetSize(pOldConsumer->assignedTopics);
     for (int32_t i = 0; i < sz; i++) {
-      char *topic = taosStrdup(taosArrayGetP(pOldConsumer->assignedTopics, i));
+      void * tmp = taosArrayGetP(pOldConsumer->assignedTopics, i);
-      taosArrayPush(pOldConsumer->rebNewTopics, &topic);
+      if (tmp == NULL){
+        return TSDB_CODE_TMQ_INVALID_MSG;
+      }
+      char *topic = taosStrdup(tmp);
+      if (taosArrayPush(pOldConsumer->rebNewTopics, &topic) == NULL) {
+        taosMemoryFree(topic);
+        return TSDB_CODE_TMQ_INVALID_MSG;
+      }
     }
     pOldConsumer->status = MQ_CONSUMER_STATUS_REBALANCE;
     mInfo("consumer:0x%" PRIx64 " recover update", pOldConsumer->consumerId);
   } else if (pNewConsumer->updateType == CONSUMER_UPDATE_REB) {
-    atomic_add_fetch_32(&pOldConsumer->epoch, 1);
+    (void)atomic_add_fetch_32(&pOldConsumer->epoch, 1);
-
     pOldConsumer->rebalanceTime = taosGetTimestampMs();
     mInfo("[rebalance] consumer:0x%" PRIx64 " rebalance update, only rebalance time", pOldConsumer->consumerId);
   } else if (pNewConsumer->updateType == CONSUMER_ADD_REB) {
-    char *pNewTopic = taosStrdup(taosArrayGetP(pNewConsumer->rebNewTopics, 0));
+    void *tmp = taosArrayGetP(pNewConsumer->rebNewTopics, 0);
+    if (tmp == NULL){
+      return TSDB_CODE_TMQ_INVALID_MSG;
+    }
+    char *pNewTopic = taosStrdup(tmp);
     removeFromTopicList(pOldConsumer->rebNewTopics, pNewTopic, pOldConsumer->consumerId, "new");
     bool existing = existInCurrentTopicList(pOldConsumer, pNewTopic);
     if (existing) {
       mError("[rebalance] consumer:0x%" PRIx64 " add new topic:%s should not in currentTopics", pOldConsumer->consumerId, pNewTopic);
       taosMemoryFree(pNewTopic);
     } else {
-      taosArrayPush(pOldConsumer->currentTopics, &pNewTopic);
+      if (taosArrayPush(pOldConsumer->currentTopics, &pNewTopic) == NULL) {
+        taosMemoryFree(pNewTopic);
+        return TSDB_CODE_TMQ_INVALID_MSG;
+      }
       taosArraySort(pOldConsumer->currentTopics, taosArrayCompareString);
     }
 
     int32_t status = pOldConsumer->status;
     updateConsumerStatus(pOldConsumer);
     pOldConsumer->rebalanceTime = taosGetTimestampMs();
-    atomic_add_fetch_32(&pOldConsumer->epoch, 1);
+    (void)atomic_add_fetch_32(&pOldConsumer->epoch, 1);
 
     mInfo("[rebalance] consumer:0x%" PRIx64 " rebalance update add, state (%d)%s -> (%d)%s, new epoch:%d, reb-time:%" PRId64
           ", current topics:%d, newTopics:%d, removeTopics:%d",
@@ -901,13 +805,16 @@ static int32_t mndConsumerActionUpdate(SSdb *pSdb, SMqConsumerObj *pOldConsumer,
 
   } else if (pNewConsumer->updateType == CONSUMER_REMOVE_REB) {
     char *topic = taosArrayGetP(pNewConsumer->rebRemovedTopics, 0);
+    if (topic == NULL){
+      return TSDB_CODE_TMQ_INVALID_MSG;
+    }
     removeFromTopicList(pOldConsumer->rebRemovedTopics, topic, pOldConsumer->consumerId, "remove");
     removeFromTopicList(pOldConsumer->currentTopics, topic, pOldConsumer->consumerId, "current");
 
     int32_t status = pOldConsumer->status;
     updateConsumerStatus(pOldConsumer);
     pOldConsumer->rebalanceTime = taosGetTimestampMs();
-    atomic_add_fetch_32(&pOldConsumer->epoch, 1);
+    (void)atomic_add_fetch_32(&pOldConsumer->epoch, 1);
 
     mInfo("[rebalance]consumer:0x%" PRIx64 " rebalance update remove, state (%d)%s -> (%d)%s, new epoch:%d, reb-time:%" PRId64
           ", current topics:%d, newTopics:%d, removeTopics:%d",
@@ -921,13 +828,13 @@ static int32_t mndConsumerActionUpdate(SSdb *pSdb, SMqConsumerObj *pOldConsumer,
   return 0;
 }
 
-SMqConsumerObj *mndAcquireConsumer(SMnode *pMnode, int64_t consumerId) {
+int32_t mndAcquireConsumer(SMnode *pMnode, int64_t consumerId, SMqConsumerObj** pConsumer) {
   SSdb           *pSdb = pMnode->pSdb;
-  SMqConsumerObj *pConsumer = sdbAcquire(pSdb, SDB_CONSUMER, &consumerId);
+  *pConsumer = sdbAcquire(pSdb, SDB_CONSUMER, &consumerId);
-  if (pConsumer == NULL) {
+  if (*pConsumer == NULL) {
-    terrno = TSDB_CODE_MND_CONSUMER_NOT_EXIST;
+    return TSDB_CODE_MND_CONSUMER_NOT_EXIST;
   }
-  return pConsumer;
+  return 0;
 }
 
 void mndReleaseConsumer(SMnode *pMnode, SMqConsumerObj *pConsumer) {
@@ -940,6 +847,7 @@ static int32_t mndRetrieveConsumer(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *
   SSdb           *pSdb = pMnode->pSdb;
   int32_t         numOfRows = 0;
   SMqConsumerObj *pConsumer = NULL;
+  int32_t         code = 0;
 
   while (numOfRows < rowsCapacity) {
     pShow->pIter = sdbFetch(pSdb, SDB_CONSUMER, pShow->pIter, (void **)&pConsumer);
@@ -964,34 +872,37 @@ static int32_t mndRetrieveConsumer(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *
     }
 
     if (numOfRows + topicSz > rowsCapacity) {
-      blockDataEnsureCapacity(pBlock, numOfRows + topicSz);
+      MND_TMQ_RETURN_CHECK(blockDataEnsureCapacity(pBlock, numOfRows + topicSz));
     }
 
     for (int32_t i = 0; i < topicSz; i++) {
-      SColumnInfoData *pColInfo;
+      SColumnInfoData *pColInfo = NULL;
       int32_t          cols = 0;
 
       // consumer id
       char consumerIdHex[32] = {0};
-      sprintf(varDataVal(consumerIdHex), "0x%" PRIx64, pConsumer->consumerId);
+      (void)sprintf(varDataVal(consumerIdHex), "0x%" PRIx64, pConsumer->consumerId);
       varDataSetLen(consumerIdHex, strlen(varDataVal(consumerIdHex)));
 
       pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataSetVal(pColInfo, numOfRows, (const char *)consumerIdHex, false);
+      MND_TMQ_NULL_CHECK(pColInfo);
+      MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)consumerIdHex, false));
 
       // consumer group
       char cgroup[TSDB_CGROUP_LEN + VARSTR_HEADER_SIZE] = {0};
       STR_TO_VARSTR(cgroup, pConsumer->cgroup);
 
       pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataSetVal(pColInfo, numOfRows, (const char *)cgroup, false);
+      MND_TMQ_NULL_CHECK(pColInfo);
+      MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)cgroup, false));
 
       // client id
       char clientId[256 + VARSTR_HEADER_SIZE] = {0};
       STR_TO_VARSTR(clientId, pConsumer->clientId);
 
       pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataSetVal(pColInfo, numOfRows, (const char *)clientId, false);
+      MND_TMQ_NULL_CHECK(pColInfo);
+      MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)clientId, false));
 
       // status
       char        status[20 + VARSTR_HEADER_SIZE] = {0};
@@ -999,46 +910,48 @@ static int32_t mndRetrieveConsumer(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *
       STR_TO_VARSTR(status, pStatusName);
 
       pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataSetVal(pColInfo, numOfRows, (const char *)status, false);
+      MND_TMQ_NULL_CHECK(pColInfo);
+      MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)status, false));
 
       // one subscribed topic
       pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+      MND_TMQ_NULL_CHECK(pColInfo);
       if (hasTopic) {
         char        topic[TSDB_TOPIC_FNAME_LEN + VARSTR_HEADER_SIZE] = {0};
-        const char *topicName = mndTopicGetShowName(taosArrayGetP(pConsumer->assignedTopics, i));
+        mndTopicGetShowName(taosArrayGetP(pConsumer->assignedTopics, i), topic + VARSTR_HEADER_SIZE);
-        STR_TO_VARSTR(topic, topicName);
+        *(VarDataLenT *)(topic) = strlen(topic + VARSTR_HEADER_SIZE);
-        colDataSetVal(pColInfo, numOfRows, (const char *)topic, false);
+        MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)topic, false));
       } else {
-        colDataSetVal(pColInfo, numOfRows, NULL, true);
+        MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, NULL, true));
       }
 
-      // end point
-      /*pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);*/
-      /*colDataSetVal(pColInfo, numOfRows, (const char *)&pConsumer->ep, true);*/
-
       // up time
       pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataSetVal(pColInfo, numOfRows, (const char *)&pConsumer->createTime, false);
+      MND_TMQ_NULL_CHECK(pColInfo);
+      MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)&pConsumer->createTime, false));
 
       // subscribe time
       pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataSetVal(pColInfo, numOfRows, (const char *)&pConsumer->subscribeTime, false);
+      MND_TMQ_NULL_CHECK(pColInfo);
+      MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)&pConsumer->subscribeTime, false));
 
       // rebalance time
       pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataSetVal(pColInfo, numOfRows, (const char *)&pConsumer->rebalanceTime, pConsumer->rebalanceTime == 0);
+      MND_TMQ_NULL_CHECK(pColInfo);
+      MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)&pConsumer->rebalanceTime, pConsumer->rebalanceTime == 0));
 
       char         buf[TSDB_OFFSET_LEN] = {0};
       STqOffsetVal pVal = {.type = pConsumer->resetOffsetCfg};
-      tFormatOffset(buf, TSDB_OFFSET_LEN, &pVal);
+      MND_TMQ_RETURN_CHECK(tFormatOffset(buf, TSDB_OFFSET_LEN, &pVal));
 
       char parasStr[64 + TSDB_OFFSET_LEN + VARSTR_HEADER_SIZE] = {0};
-      sprintf(varDataVal(parasStr), "tbname:%d,commit:%d,interval:%dms,reset:%s", pConsumer->withTbName,
+      (void)sprintf(varDataVal(parasStr), "tbname:%d,commit:%d,interval:%dms,reset:%s", pConsumer->withTbName,
               pConsumer->autoCommit, pConsumer->autoCommitInterval, buf);
       varDataSetLen(parasStr, strlen(varDataVal(parasStr)));
 
       pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataSetVal(pColInfo, numOfRows, (const char *)parasStr, false);
+      MND_TMQ_NULL_CHECK(pColInfo);
+      MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)parasStr, false));
 
       numOfRows++;
     }
@@ -1051,6 +964,9 @@ static int32_t mndRetrieveConsumer(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *
 
   pShow->numOfRows += numOfRows;
   return numOfRows;
+
+END:
+  return code;
 }
 
 static void mndCancelGetNextConsumer(SMnode *pMnode, void *pIter) {

source/dnode/mnode/impl/src/mndDef.c

@@ -12,173 +12,179 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 #define _DEFAULT_SOURCE
 #include "mndDef.h"
 #include "mndConsumer.h"
+#include "taoserror.h"
 
 static void *freeStreamTasks(SArray *pTaskLevel);
 
 int32_t tEncodeSStreamObj(SEncoder *pEncoder, const SStreamObj *pObj) {
-  if (tStartEncode(pEncoder) < 0) return -1;
+  TAOS_CHECK_RETURN(tStartEncode(pEncoder));
-  if (tEncodeCStr(pEncoder, pObj->name) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeCStr(pEncoder, pObj->name));
 
-  if (tEncodeI64(pEncoder, pObj->createTime) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pObj->createTime));
-  if (tEncodeI64(pEncoder, pObj->updateTime) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pObj->updateTime));
-  if (tEncodeI32(pEncoder, pObj->version) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI32(pEncoder, pObj->version));
-  if (tEncodeI32(pEncoder, pObj->totalLevel) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI32(pEncoder, pObj->totalLevel));
-  if (tEncodeI64(pEncoder, pObj->smaId) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pObj->smaId));
 
-  if (tEncodeI64(pEncoder, pObj->uid) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pObj->uid));
-  if (tEncodeI8(pEncoder, pObj->status) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI8(pEncoder, pObj->status));
 
-  if (tEncodeI8(pEncoder, pObj->conf.igExpired) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI8(pEncoder, pObj->conf.igExpired));
-  if (tEncodeI8(pEncoder, pObj->conf.trigger) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI8(pEncoder, pObj->conf.trigger));
-  if (tEncodeI8(pEncoder, pObj->conf.fillHistory) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI8(pEncoder, pObj->conf.fillHistory));
-  if (tEncodeI64(pEncoder, pObj->conf.triggerParam) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pObj->conf.triggerParam));
-  if (tEncodeI64(pEncoder, pObj->conf.watermark) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pObj->conf.watermark));
 
-  if (tEncodeI64(pEncoder, pObj->sourceDbUid) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pObj->sourceDbUid));
-  if (tEncodeI64(pEncoder, pObj->targetDbUid) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pObj->targetDbUid));
-  if (tEncodeCStr(pEncoder, pObj->sourceDb) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeCStr(pEncoder, pObj->sourceDb));
-  if (tEncodeCStr(pEncoder, pObj->targetDb) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeCStr(pEncoder, pObj->targetDb));
-  if (tEncodeCStr(pEncoder, pObj->targetSTbName) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeCStr(pEncoder, pObj->targetSTbName));
-  if (tEncodeI64(pEncoder, pObj->targetStbUid) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pObj->targetStbUid));
-  if (tEncodeI32(pEncoder, pObj->fixedSinkVgId) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI32(pEncoder, pObj->fixedSinkVgId));
 
   if (pObj->sql != NULL) {
-    if (tEncodeCStr(pEncoder, pObj->sql) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeCStr(pEncoder, pObj->sql));
   } else {
-    if (tEncodeCStr(pEncoder, "") < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeCStr(pEncoder, ""));
   }
 
   if (pObj->ast != NULL) {
-    if (tEncodeCStr(pEncoder, pObj->ast) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeCStr(pEncoder, pObj->ast));
   } else {
-    if (tEncodeCStr(pEncoder, "") < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeCStr(pEncoder, ""));
   }
 
   if (pObj->physicalPlan != NULL) {
-    if (tEncodeCStr(pEncoder, pObj->physicalPlan) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeCStr(pEncoder, pObj->physicalPlan));
   } else {
-    if (tEncodeCStr(pEncoder, "") < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeCStr(pEncoder, ""));
   }
 
   int32_t sz = taosArrayGetSize(pObj->tasks);
-  if (tEncodeI32(pEncoder, sz) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI32(pEncoder, sz));
   for (int32_t i = 0; i < sz; i++) {
     SArray *pArray = taosArrayGetP(pObj->tasks, i);
     int32_t innerSz = taosArrayGetSize(pArray);
-    if (tEncodeI32(pEncoder, innerSz) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeI32(pEncoder, innerSz));
     for (int32_t j = 0; j < innerSz; j++) {
       SStreamTask *pTask = taosArrayGetP(pArray, j);
       if (pTask->ver < SSTREAM_TASK_SUBTABLE_CHANGED_VER){
         pTask->ver = SSTREAM_TASK_VER;
       }
-      if (tEncodeStreamTask(pEncoder, pTask) < 0) return -1;
+      TAOS_CHECK_RETURN(tEncodeStreamTask(pEncoder, pTask));
     }
   }
 
-  if (tEncodeSSchemaWrapper(pEncoder, &pObj->outputSchema) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeSSchemaWrapper(pEncoder, &pObj->outputSchema));
 
   // 3.0.20 ver =2
-  if (tEncodeI64(pEncoder, pObj->checkpointFreq) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pObj->checkpointFreq));
-  if (tEncodeI8(pEncoder, pObj->igCheckUpdate) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI8(pEncoder, pObj->igCheckUpdate));
 
   // 3.0.50 ver = 3
-  if (tEncodeI64(pEncoder, pObj->checkpointId) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pObj->checkpointId));
-  if (tEncodeI8(pEncoder, pObj->subTableWithoutMd5) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI8(pEncoder, pObj->subTableWithoutMd5));
 
-  if (tEncodeCStrWithLen(pEncoder, pObj->reserve, sizeof(pObj->reserve) - 1) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeCStrWithLen(pEncoder, pObj->reserve, sizeof(pObj->reserve) - 1));
 
   tEndEncode(pEncoder);
   return pEncoder->pos;
 }
 
 int32_t tDecodeSStreamObj(SDecoder *pDecoder, SStreamObj *pObj, int32_t sver) {
-  if (tStartDecode(pDecoder) < 0) return -1;
+  int32_t code = 0;
-  if (tDecodeCStrTo(pDecoder, pObj->name) < 0) return -1;
+  TAOS_CHECK_RETURN(tStartDecode(pDecoder));
+  TAOS_CHECK_RETURN(tDecodeCStrTo(pDecoder, pObj->name));
 
-  if (tDecodeI64(pDecoder, &pObj->createTime) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pObj->createTime));
-  if (tDecodeI64(pDecoder, &pObj->updateTime) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pObj->updateTime));
-  if (tDecodeI32(pDecoder, &pObj->version) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI32(pDecoder, &pObj->version));
-  if (tDecodeI32(pDecoder, &pObj->totalLevel) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI32(pDecoder, &pObj->totalLevel));
-  if (tDecodeI64(pDecoder, &pObj->smaId) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pObj->smaId));
 
-  if (tDecodeI64(pDecoder, &pObj->uid) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pObj->uid));
-  if (tDecodeI8(pDecoder, &pObj->status) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI8(pDecoder, &pObj->status));
 
-  if (tDecodeI8(pDecoder, &pObj->conf.igExpired) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI8(pDecoder, &pObj->conf.igExpired));
-  if (tDecodeI8(pDecoder, &pObj->conf.trigger) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI8(pDecoder, &pObj->conf.trigger));
-  if (tDecodeI8(pDecoder, &pObj->conf.fillHistory) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI8(pDecoder, &pObj->conf.fillHistory));
-  if (tDecodeI64(pDecoder, &pObj->conf.triggerParam) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pObj->conf.triggerParam));
-  if (tDecodeI64(pDecoder, &pObj->conf.watermark) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pObj->conf.watermark));
 
-  if (tDecodeI64(pDecoder, &pObj->sourceDbUid) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pObj->sourceDbUid));
-  if (tDecodeI64(pDecoder, &pObj->targetDbUid) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pObj->targetDbUid));
-  if (tDecodeCStrTo(pDecoder, pObj->sourceDb) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeCStrTo(pDecoder, pObj->sourceDb));
-  if (tDecodeCStrTo(pDecoder, pObj->targetDb) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeCStrTo(pDecoder, pObj->targetDb));
-  if (tDecodeCStrTo(pDecoder, pObj->targetSTbName) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeCStrTo(pDecoder, pObj->targetSTbName));
-  if (tDecodeI64(pDecoder, &pObj->targetStbUid) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pObj->targetStbUid));
-  if (tDecodeI32(pDecoder, &pObj->fixedSinkVgId) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI32(pDecoder, &pObj->fixedSinkVgId));
 
-  if (tDecodeCStrAlloc(pDecoder, &pObj->sql) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeCStrAlloc(pDecoder, &pObj->sql));
-  if (tDecodeCStrAlloc(pDecoder, &pObj->ast) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeCStrAlloc(pDecoder, &pObj->ast));
-  if (tDecodeCStrAlloc(pDecoder, &pObj->physicalPlan) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeCStrAlloc(pDecoder, &pObj->physicalPlan));
 
   if (pObj->tasks != NULL) {
     pObj->tasks = freeStreamTasks(pObj->tasks);
   }
 
   int32_t sz;
-  if (tDecodeI32(pDecoder, &sz) < 0) {
+  TAOS_CHECK_RETURN(tDecodeI32(pDecoder, &sz));
-    return -1;
-  }
 
   if (sz != 0) {
     pObj->tasks = taosArrayInit(sz, sizeof(void *));
+    if (pObj->tasks == NULL) {
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      TAOS_RETURN(code);
+    }
 
     for (int32_t i = 0; i < sz; i++) {
       int32_t innerSz;
-      if (tDecodeI32(pDecoder, &innerSz) < 0) return -1;
+      TAOS_CHECK_RETURN(tDecodeI32(pDecoder, &innerSz));
       SArray *pArray = taosArrayInit(innerSz, sizeof(void *));
+      if (pArray != NULL) {
         for (int32_t j = 0; j < innerSz; j++) {
           SStreamTask *pTask = taosMemoryCalloc(1, sizeof(SStreamTask));
           if (pTask == NULL) {
             taosArrayDestroy(pArray);
-          return -1;
+            code = TSDB_CODE_OUT_OF_MEMORY;
+            TAOS_RETURN(code);
           }
-        if (tDecodeStreamTask(pDecoder, pTask) < 0) {
+          if ((code = tDecodeStreamTask(pDecoder, pTask)) < 0) {
             taosMemoryFree(pTask);
             taosArrayDestroy(pArray);
-          return -1;
+            TAOS_RETURN(code);
           }
           taosArrayPush(pArray, &pTask);
         }
+      }
       taosArrayPush(pObj->tasks, &pArray);
     }
   }
 
-  if (tDecodeSSchemaWrapper(pDecoder, &pObj->outputSchema) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeSSchemaWrapper(pDecoder, &pObj->outputSchema));
 
   // 3.0.20
   if (sver >= 2) {
-    if (tDecodeI64(pDecoder, &pObj->checkpointFreq) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pObj->checkpointFreq));
     if (!tDecodeIsEnd(pDecoder)) {
-      if (tDecodeI8(pDecoder, &pObj->igCheckUpdate) < 0) return -1;
+      TAOS_CHECK_RETURN(tDecodeI8(pDecoder, &pObj->igCheckUpdate));
     }
   }
   if (sver >= 3) {
-    if (tDecodeI64(pDecoder, &pObj->checkpointId) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pObj->checkpointId));
   }
 
   if (sver >= 5) {
-    if (tDecodeI8(pDecoder, &pObj->subTableWithoutMd5) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeI8(pDecoder, &pObj->subTableWithoutMd5));
   }
-  if (tDecodeCStrTo(pDecoder, pObj->reserve) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeCStrTo(pDecoder, pObj->reserve));
 
   tEndDecode(pDecoder);
-  return 0;
+  TAOS_RETURN(code);
 }
 
 void *freeStreamTasks(SArray *pTaskLevel) {
@@ -220,7 +226,10 @@ void tFreeStreamObj(SStreamObj *pStream) {
 
 SMqVgEp *tCloneSMqVgEp(const SMqVgEp *pVgEp) {
   SMqVgEp *pVgEpNew = taosMemoryMalloc(sizeof(SMqVgEp));
-  if (pVgEpNew == NULL) return NULL;
+  if (pVgEpNew == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return NULL;
+  }
   pVgEpNew->vgId = pVgEp->vgId;
   //  pVgEpNew->qmsg = taosStrdup(pVgEp->qmsg);
   pVgEpNew->epSet = pVgEp->epSet;
@@ -255,15 +264,17 @@ void *tDecodeSMqVgEp(const void *buf, SMqVgEp *pVgEp, int8_t sver) {
 
 static void *topicNameDup(void *p) { return taosStrdup((char *)p); }
 
-SMqConsumerObj *tNewSMqConsumerObj(int64_t consumerId, char *cgroup, int8_t updateType, char *topic, SCMSubscribeReq *subscribe) {
+int32_t tNewSMqConsumerObj(int64_t consumerId, char *cgroup, int8_t updateType,
+                                   char *topic, SCMSubscribeReq *subscribe, SMqConsumerObj** ppConsumer) {
+  int32_t code = 0;
   SMqConsumerObj *pConsumer = taosMemoryCalloc(1, sizeof(SMqConsumerObj));
   if (pConsumer == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    code = TSDB_CODE_OUT_OF_MEMORY;
-    return NULL;
+    goto END;
   }
 
   pConsumer->consumerId = consumerId;
-  memcpy(pConsumer->cgroup, cgroup, TSDB_CGROUP_LEN);
+  (void)memcpy(pConsumer->cgroup, cgroup, TSDB_CGROUP_LEN);
 
   pConsumer->epoch = 0;
   pConsumer->status = MQ_CONSUMER_STATUS_REBALANCE;
@@ -276,20 +287,26 @@ SMqConsumerObj *tNewSMqConsumerObj(int64_t consumerId, char *cgroup, int8_t upda
   if (updateType == CONSUMER_ADD_REB){
     pConsumer->rebNewTopics = taosArrayInit(0, sizeof(void *));
     if(pConsumer->rebNewTopics == NULL){
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      code = TSDB_CODE_OUT_OF_MEMORY;
       goto END;
     }
 
     char* topicTmp = taosStrdup(topic);
-    taosArrayPush(pConsumer->rebNewTopics, &topicTmp);
+    if (taosArrayPush(pConsumer->rebNewTopics, &topicTmp) == NULL) {
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      goto END;
+    }
   }else if (updateType == CONSUMER_REMOVE_REB) {
     pConsumer->rebRemovedTopics = taosArrayInit(0, sizeof(void *));
     if(pConsumer->rebRemovedTopics == NULL){
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      code = TSDB_CODE_OUT_OF_MEMORY;
       goto END;
     }
     char* topicTmp = taosStrdup(topic);
-    taosArrayPush(pConsumer->rebRemovedTopics, &topicTmp);
+    if (taosArrayPush(pConsumer->rebRemovedTopics, &topicTmp) == NULL) {
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      goto END;
+    }
   }else if (updateType == CONSUMER_INSERT_SUB){
     tstrncpy(pConsumer->clientId, subscribe->clientId, tListLen(pConsumer->clientId));
     pConsumer->withTbName = subscribe->withTbName;
@@ -297,10 +314,9 @@ SMqConsumerObj *tNewSMqConsumerObj(int64_t consumerId, char *cgroup, int8_t upda
     pConsumer->autoCommitInterval = subscribe->autoCommitInterval;
     pConsumer->resetOffsetCfg = subscribe->resetOffsetCfg;
 
-
     pConsumer->rebNewTopics = taosArrayDup(subscribe->topicNames, topicNameDup);
     if (pConsumer->rebNewTopics == NULL){
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      code = TSDB_CODE_OUT_OF_MEMORY;
       goto END;
     }
     pConsumer->assignedTopics = subscribe->topicNames;
@@ -310,11 +326,12 @@ SMqConsumerObj *tNewSMqConsumerObj(int64_t consumerId, char *cgroup, int8_t upda
     subscribe->topicNames = NULL;
   }
 
-  return pConsumer;
+  *ppConsumer = pConsumer;
+  return 0;
 
 END:
   tDeleteSMqConsumerObj(pConsumer);
-  return NULL;
+  return code;
 }
 
 void tClearSMqConsumerObj(SMqConsumerObj *pConsumer) {
@@ -530,27 +547,36 @@ void *tDecodeSMqConsumerEp(const void *buf, SMqConsumerEp *pConsumerEp, int8_t s
   return (void *)buf;
 }
 
-SMqSubscribeObj *tNewSubscribeObj(const char *key) {
+int32_t tNewSubscribeObj(const char *key, SMqSubscribeObj **ppSub) {
+  int32_t code = 0;
   SMqSubscribeObj *pSubObj = taosMemoryCalloc(1, sizeof(SMqSubscribeObj));
-  if (pSubObj == NULL) {
+  MND_TMQ_NULL_CHECK(pSubObj);
-    return NULL;
-  }
 
-  memcpy(pSubObj->key, key, TSDB_SUBSCRIBE_KEY_LEN);
+  (void)memcpy(pSubObj->key, key, TSDB_SUBSCRIBE_KEY_LEN);
   taosInitRWLatch(&pSubObj->lock);
   pSubObj->vgNum = 0;
   pSubObj->consumerHash = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_ENTRY_LOCK);
-
+  MND_TMQ_NULL_CHECK(pSubObj->consumerHash);
-  // TODO set hash free fp
-  /*taosHashSetFreeFp(pSubObj->consumerHash, tDeleteSMqConsumerEp);*/
   pSubObj->unassignedVgs = taosArrayInit(0, POINTER_BYTES);
-  return pSubObj;
+  MND_TMQ_NULL_CHECK(pSubObj->unassignedVgs);
+  if (ppSub){
+    *ppSub = pSubObj;
+  }
+  return code;
+
+END:
+  taosMemoryFree(pSubObj);
+  return code;
 }
 
-SMqSubscribeObj *tCloneSubscribeObj(const SMqSubscribeObj *pSub) {
+int32_t tCloneSubscribeObj(const SMqSubscribeObj *pSub, SMqSubscribeObj **ppSub) {
+  int32_t code = 0;
   SMqSubscribeObj *pSubNew = taosMemoryMalloc(sizeof(SMqSubscribeObj));
-  if (pSubNew == NULL) return NULL;
+  if (pSubNew == NULL) {
-  memcpy(pSubNew->key, pSub->key, TSDB_SUBSCRIBE_KEY_LEN);
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    goto END;
+  }
+  (void)memcpy(pSubNew->key, pSub->key, TSDB_SUBSCRIBE_KEY_LEN);
   taosInitRWLatch(&pSubNew->lock);
 
   pSubNew->dbUid = pSub->dbUid;
@@ -560,8 +586,7 @@ SMqSubscribeObj *tCloneSubscribeObj(const SMqSubscribeObj *pSub) {
 
   pSubNew->vgNum = pSub->vgNum;
   pSubNew->consumerHash = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_ENTRY_LOCK);
-  // TODO set hash free fp
+
-  /*taosHashSetFreeFp(pSubNew->consumerHash, tDeleteSMqConsumerEp);*/
   void          *pIter = NULL;
   SMqConsumerEp *pConsumerEp = NULL;
   while (1) {
@@ -576,9 +601,13 @@ SMqSubscribeObj *tCloneSubscribeObj(const SMqSubscribeObj *pSub) {
   }
   pSubNew->unassignedVgs = taosArrayDup(pSub->unassignedVgs, (__array_item_dup_fn_t)tCloneSMqVgEp);
   pSubNew->offsetRows = taosArrayDup(pSub->offsetRows, NULL);
-  memcpy(pSubNew->dbName, pSub->dbName, TSDB_DB_FNAME_LEN);
+  (void)memcpy(pSubNew->dbName, pSub->dbName, TSDB_DB_FNAME_LEN);
   pSubNew->qmsg = taosStrdup(pSub->qmsg);
-  return pSubNew;
+  if (ppSub) {
+    *ppSub = pSubNew;
+  }
+END:
+  return code;
 }
 
 void tDeleteSubscribeObj(SMqSubscribeObj *pSub) {

source/dnode/mnode/impl/src/mndDnode.c

@@ -165,15 +165,24 @@ static int32_t mndCreateDefaultDnode(SMnode *pMnode) {
   }
 
   pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_CONFLICT_GLOBAL, NULL, "create-dnode");
-  if (pTrans == NULL) goto _OVER;
+  if (pTrans == NULL) {
+    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+    if (terrno != 0) code = terrno;
+    goto _OVER;
+  }
   mInfo("trans:%d, used to create dnode:%s on first deploy", pTrans->id, dnodeObj.ep);
 
   pRaw = mndDnodeActionEncode(&dnodeObj);
-  if (pRaw == NULL || mndTransAppendCommitlog(pTrans, pRaw) != 0) goto _OVER;
+  if (pRaw == NULL) {
+    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+    if (terrno != 0) code = terrno;
+    goto _OVER;
+  }
+  TAOS_CHECK_GOTO(mndTransAppendCommitlog(pTrans, pRaw), NULL, _OVER);
   (void)sdbSetRawStatus(pRaw, SDB_STATUS_READY);
   pRaw = NULL;
 
-  if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;
+  TAOS_CHECK_GOTO(mndTransPrepare(pMnode, pTrans), NULL, _OVER);
   code = 0;
   mndUpdateIpWhiteForAllUser(pMnode, TSDB_DEFAULT_USER, dnodeObj.fqdn, IP_WHITE_ADD, 1);
 
@@ -563,10 +572,7 @@ static int32_t mndProcessStatisReq(SRpcMsg *pReq) {
   SStatisReq statisReq = {0};
   int32_t    code = -1;
 
-  if (tDeserializeSStatisReq(pReq->pCont, pReq->contLen, &statisReq) != 0) {
+  TAOS_CHECK_RETURN(tDeserializeSStatisReq(pReq->pCont, pReq->contLen, &statisReq));
-    terrno = TSDB_CODE_INVALID_MSG;
-    return code;
-  }
 
   if (tsMonitorLogProtocol) {
     mInfo("process statis req,\n %s", statisReq.pCont);
@@ -586,23 +592,28 @@ static int32_t mndUpdateDnodeObj(SMnode *pMnode, SDnodeObj *pDnode) {
   int32_t code = 0;
   STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_CONFLICT_NOTHING, NULL, "update-dnode-obj");
   if (pTrans == NULL) {
-    code = terrno;
+    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+    if (terrno != 0) code = terrno;
     goto _exit;
   }
 
   pDnode->updateTime = taosGetTimestampMs();
 
   SSdbRaw *pCommitRaw = mndDnodeActionEncode(pDnode);
-  if (pCommitRaw == NULL || mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) {
+  if (pCommitRaw == NULL) {
-    mError("trans:%d, failed to append commit log since %s", pTrans->id, terrstr());
+    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+    if (terrno != 0) code = terrno;
+    goto _exit;
+  }
+  if ((code = mndTransAppendCommitlog(pTrans, pCommitRaw)) != 0) {
+    mError("trans:%d, failed to append commit log since %s", pTrans->id, tstrerror(code));
     code = terrno;
     goto _exit;
   }
   (void)sdbSetRawStatus(pCommitRaw, SDB_STATUS_READY);
 
-  if (mndTransPrepare(pMnode, pTrans) != 0) {
+  if ((code = mndTransPrepare(pMnode, pTrans)) != 0) {
-    mError("trans:%d, failed to prepare since %s", pTrans->id, terrstr());
+    mError("trans:%d, failed to prepare since %s", pTrans->id, tstrerror(code));
-    code = terrno;
     goto _exit;
   }
 
@@ -617,10 +628,7 @@ static int32_t mndProcessStatusReq(SRpcMsg *pReq) {
   SDnodeObj *pDnode = NULL;
   int32_t    code = -1;
 
-  if (tDeserializeSStatusReq(pReq->pCont, pReq->contLen, &statusReq) != 0) {
+  TAOS_CHECK_GOTO(tDeserializeSStatusReq(pReq->pCont, pReq->contLen, &statusReq), NULL, _OVER);
-    terrno = TSDB_CODE_INVALID_MSG;
-    goto _OVER;
-  }
 
   int64_t clusterid = mndGetClusterId(pMnode);
   if (statusReq.clusterId != 0 && statusReq.clusterId != clusterid) {
@@ -634,6 +642,8 @@ static int32_t mndProcessStatusReq(SRpcMsg *pReq) {
     pDnode = mndAcquireDnodeByEp(pMnode, statusReq.dnodeEp);
     if (pDnode == NULL) {
       mInfo("dnode:%s, not created yet", statusReq.dnodeEp);
+      code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+      if (terrno != 0) code = terrno;
       goto _OVER;
     }
   } else {
@@ -871,16 +881,25 @@ static int32_t mndCreateDnode(SMnode *pMnode, SRpcMsg *pReq, SCreateDnodeReq *pC
   snprintf(dnodeObj.ep, TSDB_EP_LEN - 1, "%s:%u", pCreate->fqdn, pCreate->port);
 
   pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_CONFLICT_GLOBAL, pReq, "create-dnode");
-  if (pTrans == NULL) goto _OVER;
+  if (pTrans == NULL) {
+    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+    if (terrno != 0) code = terrno;
+    goto _OVER;
+  }
   mInfo("trans:%d, used to create dnode:%s", pTrans->id, dnodeObj.ep);
-  if (mndTransCheckConflict(pMnode, pTrans) != 0) goto _OVER;
+  TAOS_CHECK_GOTO(mndTransCheckConflict(pMnode, pTrans), NULL, _OVER);
 
   pRaw = mndDnodeActionEncode(&dnodeObj);
-  if (pRaw == NULL || mndTransAppendCommitlog(pTrans, pRaw) != 0) goto _OVER;
+  if (pRaw == NULL) {
+    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+    if (terrno != 0) code = terrno;
+    goto _OVER;
+  }
+  TAOS_CHECK_GOTO(mndTransAppendCommitlog(pTrans, pRaw), NULL, _OVER);
   (void)sdbSetRawStatus(pRaw, SDB_STATUS_READY);
   pRaw = NULL;
 
-  if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;
+  TAOS_CHECK_GOTO(mndTransPrepare(pMnode, pTrans), NULL, _OVER);
   code = 0;
 
   mndUpdateIpWhiteForAllUser(pMnode, TSDB_DEFAULT_USER, dnodeObj.fqdn, IP_WHITE_ADD, 1);
@@ -901,7 +920,7 @@ static int32_t mndProcessDnodeListReq(SRpcMsg *pReq) {
   rsp.dnodeList = taosArrayInit(5, sizeof(SEpSet));
   if (NULL == rsp.dnodeList) {
     mError("failed to alloc epSet while process dnode list req");
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    code = TSDB_CODE_OUT_OF_MEMORY;
     goto _OVER;
   }
 
@@ -922,7 +941,7 @@ static int32_t mndProcessDnodeListReq(SRpcMsg *pReq) {
   int32_t rspLen = tSerializeSDnodeListRsp(NULL, 0, &rsp);
   void   *pRsp = rpcMallocCont(rspLen);
   if (pRsp == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    code = TSDB_CODE_OUT_OF_MEMORY;
     goto _OVER;
   }
 
@@ -935,12 +954,12 @@ static int32_t mndProcessDnodeListReq(SRpcMsg *pReq) {
 _OVER:
 
   if (code != 0) {
-    mError("failed to get dnode list since %s", terrstr());
+    mError("failed to get dnode list since %s", tstrerror(code));
   }
 
   tFreeSDnodeListRsp(&rsp);
 
-  return code;
+  TAOS_RETURN(code);
 }
 
 static void getSlowLogScopeString(int32_t scope, char* result){
@@ -980,7 +999,7 @@ static int32_t mndProcessShowVariablesReq(SRpcMsg *pReq) {
   rsp.variables = taosArrayInit(16, sizeof(SVariablesInfo));
   if (NULL == rsp.variables) {
     mError("failed to alloc SVariablesInfo array while process show variables req");
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    code = TSDB_CODE_OUT_OF_MEMORY;
     goto _OVER;
   }
 
@@ -1036,7 +1055,7 @@ static int32_t mndProcessShowVariablesReq(SRpcMsg *pReq) {
   int32_t rspLen = tSerializeSShowVariablesRsp(NULL, 0, &rsp);
   void   *pRsp = rpcMallocCont(rspLen);
   if (pRsp == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    code = TSDB_CODE_OUT_OF_MEMORY;
     goto _OVER;
   }
 
@@ -1049,11 +1068,11 @@ static int32_t mndProcessShowVariablesReq(SRpcMsg *pReq) {
 _OVER:
 
   if (code != 0) {
-    mError("failed to get show variables info since %s", terrstr());
+    mError("failed to get show variables info since %s", tstrerror(code));
   }
 
   tFreeSShowVariablesRsp(&rsp);
-  return code;
+  TAOS_RETURN(code);
 }
 
 static int32_t mndProcessCreateDnodeReq(SRpcMsg *pReq) {
@@ -1062,23 +1081,17 @@ static int32_t mndProcessCreateDnodeReq(SRpcMsg *pReq) {
   SDnodeObj      *pDnode = NULL;
   SCreateDnodeReq createReq = {0};
 
-  if ((terrno = grantCheck(TSDB_GRANT_DNODE)) != 0 || (terrno = grantCheck(TSDB_GRANT_CPU_CORES)) != 0) {
+  if ((code = grantCheck(TSDB_GRANT_DNODE)) != 0 || (code = grantCheck(TSDB_GRANT_CPU_CORES)) != 0) {
-    code = terrno;
     goto _OVER;
   }
 
-  if (tDeserializeSCreateDnodeReq(pReq->pCont, pReq->contLen, &createReq) != 0) {
+  TAOS_CHECK_GOTO(tDeserializeSCreateDnodeReq(pReq->pCont, pReq->contLen, &createReq), NULL, _OVER);
-    terrno = TSDB_CODE_INVALID_MSG;
-    goto _OVER;
-  }
 
   mInfo("dnode:%s:%d, start to create", createReq.fqdn, createReq.port);
-  if (mndCheckOperPrivilege(pMnode, pReq->info.conn.user, MND_OPER_CREATE_DNODE) != 0) {
+  TAOS_CHECK_GOTO(mndCheckOperPrivilege(pMnode, pReq->info.conn.user, MND_OPER_CREATE_DNODE), NULL, _OVER);
-    goto _OVER;
-  }
 
   if (createReq.fqdn[0] == 0 || createReq.port <= 0 || createReq.port > UINT16_MAX) {
-    terrno = TSDB_CODE_MND_INVALID_DNODE_EP;
+    code = TSDB_CODE_MND_INVALID_DNODE_EP;
     goto _OVER;
   }
 
@@ -1086,7 +1099,7 @@ static int32_t mndProcessCreateDnodeReq(SRpcMsg *pReq) {
   snprintf(ep, TSDB_EP_LEN, "%s:%d", createReq.fqdn, createReq.port);
   pDnode = mndAcquireDnodeByEp(pMnode, ep);
   if (pDnode != NULL) {
-    terrno = TSDB_CODE_MND_DNODE_ALREADY_EXIST;
+    code = TSDB_CODE_MND_DNODE_ALREADY_EXIST;
     goto _OVER;
   }
 
@@ -1103,12 +1116,12 @@ static int32_t mndProcessCreateDnodeReq(SRpcMsg *pReq) {
 
 _OVER:
   if (code != 0 && code != TSDB_CODE_ACTION_IN_PROGRESS) {
-    mError("dnode:%s:%d, failed to create since %s", createReq.fqdn, createReq.port, terrstr());
+    mError("dnode:%s:%d, failed to create since %s", createReq.fqdn, createReq.port, tstrerror(code));
   }
 
   mndReleaseDnode(pMnode, pDnode);
   tFreeSCreateDnodeReq(&createReq);
-  return code;
+  TAOS_RETURN(code);
 }
 
 extern int32_t mndProcessRestoreDnodeReqImpl(SRpcMsg *pReq);
@@ -1126,44 +1139,56 @@ static int32_t mndDropDnode(SMnode *pMnode, SRpcMsg *pReq, SDnodeObj *pDnode, SM
   STrans  *pTrans = NULL;
 
   pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_CONFLICT_GLOBAL, pReq, "drop-dnode");
-  if (pTrans == NULL) goto _OVER;
+  if (pTrans == NULL) {
+    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+    if (terrno != 0) code = terrno;
+    goto _OVER;
+  }
   mndTransSetSerial(pTrans);
   mInfo("trans:%d, used to drop dnode:%d, force:%d", pTrans->id, pDnode->id, force);
-  if (mndTransCheckConflict(pMnode, pTrans) != 0) goto _OVER;
+  TAOS_CHECK_GOTO(mndTransCheckConflict(pMnode, pTrans), NULL, _OVER);
 
   pRaw = mndDnodeActionEncode(pDnode);
-  if (pRaw == NULL) goto _OVER;
+  if (pRaw == NULL) {
-  if (mndTransAppendRedolog(pTrans, pRaw) != 0) goto _OVER;
+    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+    if (terrno != 0) code = terrno;
+    goto _OVER;
+  }
+  TAOS_CHECK_GOTO(mndTransAppendRedolog(pTrans, pRaw), NULL, _OVER);
   (void)sdbSetRawStatus(pRaw, SDB_STATUS_DROPPING);
   pRaw = NULL;
 
   pRaw = mndDnodeActionEncode(pDnode);
-  if (pRaw == NULL) goto _OVER;
+  if (pRaw == NULL) {
-  if (mndTransAppendCommitlog(pTrans, pRaw) != 0) goto _OVER;
+    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+    if (terrno != 0) code = terrno;
+    goto _OVER;
+  }
+  TAOS_CHECK_GOTO(mndTransAppendCommitlog(pTrans, pRaw), NULL, _OVER);
   (void)sdbSetRawStatus(pRaw, SDB_STATUS_DROPPED);
   pRaw = NULL;
 
   if (pMObj != NULL) {
     mInfo("trans:%d, mnode on dnode:%d will be dropped", pTrans->id, pDnode->id);
-    if (mndSetDropMnodeInfoToTrans(pMnode, pTrans, pMObj, force) != 0) goto _OVER;
+    TAOS_CHECK_GOTO(mndSetDropMnodeInfoToTrans(pMnode, pTrans, pMObj, force), NULL, _OVER);
   }
 
   if (pQObj != NULL) {
     mInfo("trans:%d, qnode on dnode:%d will be dropped", pTrans->id, pDnode->id);
-    if (mndSetDropQnodeInfoToTrans(pMnode, pTrans, pQObj, force) != 0) goto _OVER;
+    TAOS_CHECK_GOTO(mndSetDropQnodeInfoToTrans(pMnode, pTrans, pQObj, force), NULL, _OVER);
   }
 
   if (pSObj != NULL) {
     mInfo("trans:%d, snode on dnode:%d will be dropped", pTrans->id, pDnode->id);
-    if (mndSetDropSnodeInfoToTrans(pMnode, pTrans, pSObj, force) != 0) goto _OVER;
+    TAOS_CHECK_GOTO(mndSetDropSnodeInfoToTrans(pMnode, pTrans, pSObj, force), NULL, _OVER);
   }
 
   if (numOfVnodes > 0) {
     mInfo("trans:%d, %d vnodes on dnode:%d will be dropped", pTrans->id, numOfVnodes, pDnode->id);
-    if (mndSetMoveVgroupsInfoToTrans(pMnode, pTrans, pDnode->id, force, unsafe) != 0) goto _OVER;
+    TAOS_CHECK_GOTO(mndSetMoveVgroupsInfoToTrans(pMnode, pTrans, pDnode->id, force, unsafe), NULL, _OVER);
   }
 
-  if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;
+  TAOS_CHECK_GOTO(mndTransPrepare(pMnode, pTrans), NULL, _OVER);
 
   mndUpdateIpWhiteForAllUser(pMnode, TSDB_DEFAULT_USER, pDnode->fqdn, IP_WHITE_DROP, 1);
   code = 0;
@@ -1171,7 +1196,7 @@ static int32_t mndDropDnode(SMnode *pMnode, SRpcMsg *pReq, SDnodeObj *pDnode, SM
 _OVER:
   mndTransDrop(pTrans);
   sdbFreeRaw(pRaw);
-  return code;
+  TAOS_RETURN(code);
 }
 
 static bool mndIsEmptyDnode(SMnode *pMnode, int32_t dnodeId) {
@@ -1209,16 +1234,11 @@ static int32_t mndProcessDropDnodeReq(SRpcMsg *pReq) {
   SSnodeObj    *pSObj = NULL;
   SDropDnodeReq dropReq = {0};
 
-  if (tDeserializeSDropDnodeReq(pReq->pCont, pReq->contLen, &dropReq) != 0) {
+  TAOS_CHECK_GOTO(tDeserializeSDropDnodeReq(pReq->pCont, pReq->contLen, &dropReq), NULL, _OVER);
-    terrno = TSDB_CODE_INVALID_MSG;
-    goto _OVER;
-  }
 
   mInfo("dnode:%d, start to drop, ep:%s:%d, force:%s, unsafe:%s", dropReq.dnodeId, dropReq.fqdn, dropReq.port,
         dropReq.force ? "true" : "false", dropReq.unsafe ? "true" : "false");
-  if (mndCheckOperPrivilege(pMnode, pReq->info.conn.user, MND_OPER_DROP_MNODE) != 0) {
+  TAOS_CHECK_GOTO(mndCheckOperPrivilege(pMnode, pReq->info.conn.user, MND_OPER_DROP_MNODE), NULL, _OVER);
-    goto _OVER;
-  }
 
   bool force = dropReq.force;
   if (dropReq.unsafe) {
@@ -1232,7 +1252,7 @@ static int32_t mndProcessDropDnodeReq(SRpcMsg *pReq) {
     snprintf(ep, sizeof(ep), dropReq.fqdn, dropReq.port);
     pDnode = mndAcquireDnodeByEp(pMnode, ep);
     if (pDnode == NULL) {
-      terrno = err;
+      code = err;
       goto _OVER;
     }
   }
@@ -1242,11 +1262,11 @@ static int32_t mndProcessDropDnodeReq(SRpcMsg *pReq) {
   pMObj = mndAcquireMnode(pMnode, dropReq.dnodeId);
   if (pMObj != NULL) {
     if (sdbGetSize(pMnode->pSdb, SDB_MNODE) <= 1) {
-      terrno = TSDB_CODE_MND_TOO_FEW_MNODES;
+      code = TSDB_CODE_MND_TOO_FEW_MNODES;
       goto _OVER;
     }
     if (pMnode->selfDnodeId == dropReq.dnodeId) {
-      terrno = TSDB_CODE_MND_CANT_DROP_LEADER;
+      code = TSDB_CODE_MND_CANT_DROP_LEADER;
       goto _OVER;
     }
   }
@@ -1255,16 +1275,16 @@ static int32_t mndProcessDropDnodeReq(SRpcMsg *pReq) {
   bool    isonline = mndIsDnodeOnline(pDnode, taosGetTimestampMs());
 
   if (isonline && force) {
-    terrno = TSDB_CODE_DNODE_ONLY_USE_WHEN_OFFLINE;
+    code = TSDB_CODE_DNODE_ONLY_USE_WHEN_OFFLINE;
-    mError("dnode:%d, failed to drop since %s, vnodes:%d mnode:%d qnode:%d snode:%d", pDnode->id, terrstr(),
+    mError("dnode:%d, failed to drop since %s, vnodes:%d mnode:%d qnode:%d snode:%d", pDnode->id, tstrerror(code),
            numOfVnodes, pMObj != NULL, pQObj != NULL, pSObj != NULL);
     goto _OVER;
   }
 
   bool isEmpty = mndIsEmptyDnode(pMnode, pDnode->id);
   if (!isonline && !force && !isEmpty) {
-    terrno = TSDB_CODE_DNODE_OFFLINE;
+    code = TSDB_CODE_DNODE_OFFLINE;
-    mError("dnode:%d, failed to drop since %s, vnodes:%d mnode:%d qnode:%d snode:%d", pDnode->id, terrstr(),
+    mError("dnode:%d, failed to drop since %s, vnodes:%d mnode:%d qnode:%d snode:%d", pDnode->id, tstrerror(code),
            numOfVnodes, pMObj != NULL, pQObj != NULL, pSObj != NULL);
     goto _OVER;
   }
@@ -1279,7 +1299,7 @@ static int32_t mndProcessDropDnodeReq(SRpcMsg *pReq) {
 
 _OVER:
   if (code != 0 && code != TSDB_CODE_ACTION_IN_PROGRESS) {
-    mError("dnode:%d, failed to drop since %s", dropReq.dnodeId, terrstr());
+    mError("dnode:%d, failed to drop since %s", dropReq.dnodeId, tstrerror(code));
   }
 
   mndReleaseDnode(pMnode, pDnode);
@@ -1287,11 +1307,11 @@ _OVER:
   mndReleaseQnode(pMnode, pQObj);
   mndReleaseSnode(pMnode, pSObj);
   tFreeSDropDnodeReq(&dropReq);
-  return code;
+  TAOS_RETURN(code);
 }
 
 static int32_t mndMCfg2DCfg(SMCfgDnodeReq *pMCfgReq, SDCfgDnodeReq *pDCfgReq) {
-  terrno = 0;
+  int32_t code = 0;
   char *p = pMCfgReq->config;
   while (*p) {
     if (*p == ' ') {
@@ -1314,12 +1334,12 @@ static int32_t mndMCfg2DCfg(SMCfgDnodeReq *pMCfgReq, SDCfgDnodeReq *pDCfgReq) {
     strcpy(pDCfgReq->value, pMCfgReq->value);
   }
 
-  return 0;
+  TAOS_RETURN(code);
 
 _err:
   mError("dnode:%d, failed to config since invalid conf:%s", pMCfgReq->dnodeId, pMCfgReq->config);
-  terrno = TSDB_CODE_INVALID_CFG;
+  code = TSDB_CODE_INVALID_CFG;
-  return -1;
+  TAOS_RETURN(code);
 }
 
 static int32_t mndSendCfgDnodeReq(SMnode *pMnode, int32_t dnodeId, SDCfgDnodeReq *pDcfgReq) {
@@ -1349,23 +1369,21 @@ static int32_t mndSendCfgDnodeReq(SMnode *pMnode, int32_t dnodeId, SDCfgDnodeReq
   }
 
   if (code == -1) {
-    terrno = TSDB_CODE_MND_DNODE_NOT_EXIST;
+    code = TSDB_CODE_MND_DNODE_NOT_EXIST;
   }
-  return code;
+  TAOS_RETURN(code);
 }
 
 static int32_t mndProcessConfigDnodeReq(SRpcMsg *pReq) {
+  int32_t       code = 0;
   SMnode       *pMnode = pReq->info.node;
   SMCfgDnodeReq cfgReq = {0};
-  if (tDeserializeSMCfgDnodeReq(pReq->pCont, pReq->contLen, &cfgReq) != 0) {
+  TAOS_CHECK_RETURN(tDeserializeSMCfgDnodeReq(pReq->pCont, pReq->contLen, &cfgReq));
-    terrno = TSDB_CODE_INVALID_MSG;
-    return -1;
-  }
   int8_t updateIpWhiteList = 0;
   mInfo("dnode:%d, start to config, option:%s, value:%s", cfgReq.dnodeId, cfgReq.config, cfgReq.value);
-  if (mndCheckOperPrivilege(pMnode, pReq->info.conn.user, MND_OPER_CONFIG_DNODE) != 0) {
+  if ((code = mndCheckOperPrivilege(pMnode, pReq->info.conn.user, MND_OPER_CONFIG_DNODE)) != 0) {
     tFreeSMCfgDnodeReq(&cfgReq);
-    return -1;
+    TAOS_RETURN(code);
   }
 
   SDCfgDnodeReq dcfgReq = {0};
@@ -1381,26 +1399,26 @@ static int32_t mndProcessConfigDnodeReq(SRpcMsg *pReq) {
     if (flag > 1024 * 1024 || (flag > -1 && flag < 1024) || flag < -1) {
       mError("dnode:%d, failed to config s3blocksize since value:%d. Valid range: -1 or [1024, 1024 * 1024]",
              cfgReq.dnodeId, flag);
-      terrno = TSDB_CODE_INVALID_CFG;
+      code = TSDB_CODE_INVALID_CFG;
       tFreeSMCfgDnodeReq(&cfgReq);
-      return -1;
+      TAOS_RETURN(code);
     }
 
     strcpy(dcfgReq.config, "s3blocksize");
     snprintf(dcfgReq.value, TSDB_DNODE_VALUE_LEN, "%d", flag);
 #endif
   } else {
-    if (mndMCfg2DCfg(&cfgReq, &dcfgReq)) goto _err_out;
+    TAOS_CHECK_GOTO (mndMCfg2DCfg(&cfgReq, &dcfgReq), NULL, _err_out);
     if (strlen(dcfgReq.config) > TSDB_DNODE_CONFIG_LEN) {
       mError("dnode:%d, failed to config since config is too long", cfgReq.dnodeId);
-      terrno = TSDB_CODE_INVALID_CFG;
+      code = TSDB_CODE_INVALID_CFG;
       goto _err_out;
     }
     if (strncasecmp(dcfgReq.config, "enableWhiteList", strlen("enableWhiteList")) == 0) {
       updateIpWhiteList = 1;
     }
 
-    if (cfgCheckRangeForDynUpdate(taosGetCfg(), dcfgReq.config, dcfgReq.value, true) != 0) goto _err_out;
+    TAOS_CHECK_GOTO(cfgCheckRangeForDynUpdate(taosGetCfg(), dcfgReq.config, dcfgReq.value, true), NULL, _err_out);
   }
 
   {  // audit
@@ -1412,15 +1430,15 @@ static int32_t mndProcessConfigDnodeReq(SRpcMsg *pReq) {
 
   tFreeSMCfgDnodeReq(&cfgReq);
 
-  int32_t code = mndSendCfgDnodeReq(pMnode, cfgReq.dnodeId, &dcfgReq);
+  code = mndSendCfgDnodeReq(pMnode, cfgReq.dnodeId, &dcfgReq);
 
   // dont care suss or succ;
   if (updateIpWhiteList) mndRefreshUserIpWhiteList(pMnode);
-  return code;
+  TAOS_RETURN(code);
 
 _err_out:
   tFreeSMCfgDnodeReq(&cfgReq);
-  return -1;
+  TAOS_RETURN(code);
 }
 
 static int32_t mndProcessConfigDnodeRsp(SRpcMsg *pRsp) {
@@ -1503,17 +1521,16 @@ _exit:
 }
 
 static int32_t mndProcessCreateEncryptKeyReq(SRpcMsg *pReq) {
+  int32_t code = 0;
+
 #ifdef TD_ENTERPRISE
   SMnode       *pMnode = pReq->info.node;
   SMCfgDnodeReq cfgReq = {0};
-  if (tDeserializeSMCfgDnodeReq(pReq->pCont, pReq->contLen, &cfgReq) != 0) {
+  TAOS_CHECK_RETURN(tDeserializeSMCfgDnodeReq(pReq->pCont, pReq->contLen, &cfgReq));
-    terrno = TSDB_CODE_INVALID_MSG;
-    return -1;
-  }
 
-  if (mndCheckOperPrivilege(pMnode, pReq->info.conn.user, MND_OPER_CONFIG_DNODE) != 0) {
+  if ((code = mndCheckOperPrivilege(pMnode, pReq->info.conn.user, MND_OPER_CONFIG_DNODE)) != 0) {
     tFreeSMCfgDnodeReq(&cfgReq);
-    return -1;
+    TAOS_RETURN(code);
   }
   const STraceId *trace = &pReq->info.traceId;
   SDCfgDnodeReq   dcfgReq = {0};
@@ -1523,13 +1540,13 @@ static int32_t mndProcessCreateEncryptKeyReq(SRpcMsg *pReq) {
     tFreeSMCfgDnodeReq(&cfgReq);
     return mndProcessCreateEncryptKeyReqImpl(pReq, cfgReq.dnodeId, &dcfgReq);
   } else {
-    terrno = TSDB_CODE_PAR_INTERNAL_ERROR;
+    code = TSDB_CODE_PAR_INTERNAL_ERROR;
     tFreeSMCfgDnodeReq(&cfgReq);
-    return -1;
+    TAOS_RETURN(code);
   }
 
 #else
-  return 0;
+  TAOS_RETURN(code);
 #endif
 }
 
@@ -1710,7 +1727,7 @@ static void mndCancelGetNextDnode(SMnode *pMnode, void *pIter) {
 
 // get int32_t value from 'SMCfgDnodeReq'
 static int32_t mndMCfgGetValInt32(SMCfgDnodeReq *pMCfgReq, int32_t optLen, int32_t *pOutValue) {
-  terrno = 0;
+  int32_t code = 0;
   if (' ' != pMCfgReq->config[optLen] && 0 != pMCfgReq->config[optLen]) {
     goto _err;
   }
@@ -1725,12 +1742,12 @@ static int32_t mndMCfgGetValInt32(SMCfgDnodeReq *pMCfgReq, int32_t optLen, int32
     *pOutValue = atoi(pMCfgReq->value);
   }
 
-  return 0;
+  TAOS_RETURN(code);
 
 _err:
   mError("dnode:%d, failed to config since invalid conf:%s", pMCfgReq->dnodeId, pMCfgReq->config);
-  terrno = TSDB_CODE_INVALID_CFG;
+  code = TSDB_CODE_INVALID_CFG;
-  return -1;
+  TAOS_RETURN(code);
 }
 
 SArray *mndGetAllDnodeFqdns(SMnode *pMnode) {

source/dnode/mnode/impl/src/mndDump.c

@@ -29,12 +29,14 @@ void reportStartup(const char *name, const char *desc) {}
 void sendRsp(SRpcMsg *pMsg) { rpcFreeCont(pMsg->pCont); }
 
 int32_t sendReq(const SEpSet *pEpSet, SRpcMsg *pMsg) {
-  terrno = TSDB_CODE_INVALID_PTR;
+  int32_t code = 0;
-  return -1;
+  code = TSDB_CODE_INVALID_PTR;
+  TAOS_RETURN(code);
 }
 int32_t sendSyncReq(const SEpSet *pEpSet, SRpcMsg *pMsg) {
-  terrno = TSDB_CODE_INVALID_PTR;
+  int32_t code = 0;
-  return -1;
+  code = TSDB_CODE_INVALID_PTR;
+  TAOS_RETURN(code);
 }
 
 char *i642str(int64_t val) {

source/dnode/mnode/impl/src/mndFunc.c

@@ -223,6 +223,7 @@ static int32_t mndFuncActionUpdate(SSdb *pSdb, SFuncObj *pOld, SFuncObj *pNew) {
 }
 
 static SFuncObj *mndAcquireFunc(SMnode *pMnode, char *funcName) {
+  terrno = 0;
   SSdb     *pSdb = pMnode->pSdb;
   SFuncObj *pFunc = sdbAcquire(pSdb, SDB_FUNC, funcName);
   if (pFunc == NULL && terrno == TSDB_CODE_SDB_OBJ_NOT_THERE) {
@@ -240,7 +241,7 @@ static int32_t mndCreateFunc(SMnode *pMnode, SRpcMsg *pReq, SCreateFuncReq *pCre
   int32_t code = -1;
   STrans *pTrans = NULL;
 
-  if ((terrno = grantCheck(TSDB_GRANT_USER)) < 0) {
+  if ((code = grantCheck(TSDB_GRANT_USER)) < 0) {
     return code;
   }
 
@@ -260,7 +261,7 @@ static int32_t mndCreateFunc(SMnode *pMnode, SRpcMsg *pReq, SCreateFuncReq *pCre
   func.codeSize = pCreate->codeLen;
   func.pCode = taosMemoryMalloc(func.codeSize);
   if (func.pCode == NULL || func.pCode == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    code = TSDB_CODE_OUT_OF_MEMORY;
     goto _OVER;
   }
 
@@ -270,7 +271,11 @@ static int32_t mndCreateFunc(SMnode *pMnode, SRpcMsg *pReq, SCreateFuncReq *pCre
   memcpy(func.pCode, pCreate->pCode, func.codeSize);
 
   pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_CONFLICT_NOTHING, pReq, "create-func");
-  if (pTrans == NULL) goto _OVER;
+  if (pTrans == NULL) {
+    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+    if (terrno != 0) code = terrno;
+    goto _OVER;
+  }
   mInfo("trans:%d, used to create func:%s", pTrans->id, pCreate->name);
 
   SFuncObj *oldFunc = mndAcquireFunc(pMnode, pCreate->name);
@@ -279,31 +284,61 @@ static int32_t mndCreateFunc(SMnode *pMnode, SRpcMsg *pReq, SCreateFuncReq *pCre
     func.createdTime = oldFunc->createdTime;
 
     SSdbRaw *pRedoRaw = mndFuncActionEncode(oldFunc);
-    if (pRedoRaw == NULL || mndTransAppendRedolog(pTrans, pRedoRaw) != 0) goto _OVER;
+    if (pRedoRaw == NULL) {
-    if (sdbSetRawStatus(pRedoRaw, SDB_STATUS_READY) != 0) goto _OVER;
+      code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+      if (terrno != 0) code = terrno;
+      goto _OVER;
+    }
+    TAOS_CHECK_GOTO(mndTransAppendRedolog(pTrans, pRedoRaw), NULL, _OVER);
+    TAOS_CHECK_GOTO(sdbSetRawStatus(pRedoRaw, SDB_STATUS_READY), NULL, _OVER);
 
     SSdbRaw *pUndoRaw = mndFuncActionEncode(oldFunc);
-    if (pUndoRaw == NULL || mndTransAppendUndolog(pTrans, pUndoRaw) != 0) goto _OVER;
+    if (pUndoRaw == NULL) {
-    if (sdbSetRawStatus(pUndoRaw, SDB_STATUS_READY) != 0) goto _OVER;
+      code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+      if (terrno != 0) code = terrno;
+      goto _OVER;
+    }
+    TAOS_CHECK_GOTO(mndTransAppendUndolog(pTrans, pUndoRaw), NULL, _OVER);
+    TAOS_CHECK_GOTO(sdbSetRawStatus(pUndoRaw, SDB_STATUS_READY), NULL, _OVER);
 
     SSdbRaw *pCommitRaw = mndFuncActionEncode(&func);
-    if (pCommitRaw == NULL || mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) goto _OVER;
+    if (pCommitRaw == NULL) {
-    if (sdbSetRawStatus(pCommitRaw, SDB_STATUS_READY) != 0) goto _OVER;
+      code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+      if (terrno != 0) code = terrno;
+      goto _OVER;
+    }
+    TAOS_CHECK_GOTO(mndTransAppendCommitlog(pTrans, pCommitRaw), NULL, _OVER);
+    TAOS_CHECK_GOTO(sdbSetRawStatus(pCommitRaw, SDB_STATUS_READY), NULL, _OVER);
   } else {
     SSdbRaw *pRedoRaw = mndFuncActionEncode(&func);
-    if (pRedoRaw == NULL || mndTransAppendRedolog(pTrans, pRedoRaw) != 0) goto _OVER;
+    if (pRedoRaw == NULL) {
-    if (sdbSetRawStatus(pRedoRaw, SDB_STATUS_CREATING) != 0) goto _OVER;
+      code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+      if (terrno != 0) code = terrno;
+      goto _OVER;
+    }
+    TAOS_CHECK_GOTO(mndTransAppendRedolog(pTrans, pRedoRaw), NULL, _OVER);
+    TAOS_CHECK_GOTO(sdbSetRawStatus(pRedoRaw, SDB_STATUS_CREATING), NULL, _OVER);
 
     SSdbRaw *pUndoRaw = mndFuncActionEncode(&func);
-    if (pUndoRaw == NULL || mndTransAppendUndolog(pTrans, pUndoRaw) != 0) goto _OVER;
+    if (pUndoRaw == NULL) {
-    if (sdbSetRawStatus(pUndoRaw, SDB_STATUS_DROPPED) != 0) goto _OVER;
+      code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+      if (terrno != 0) code = terrno;
+      goto _OVER;
+    }
+    TAOS_CHECK_GOTO(mndTransAppendUndolog(pTrans, pUndoRaw), NULL, _OVER);
+    TAOS_CHECK_GOTO(sdbSetRawStatus(pUndoRaw, SDB_STATUS_DROPPED), NULL, _OVER);
 
     SSdbRaw *pCommitRaw = mndFuncActionEncode(&func);
-    if (pCommitRaw == NULL || mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) goto _OVER;
+    if (pCommitRaw == NULL) {
-    if (sdbSetRawStatus(pCommitRaw, SDB_STATUS_READY) != 0) goto _OVER;
+      code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+      if (terrno != 0) code = terrno;
+      goto _OVER;
+    }
+    TAOS_CHECK_GOTO(mndTransAppendCommitlog(pTrans, pCommitRaw), NULL, _OVER);
+    TAOS_CHECK_GOTO(sdbSetRawStatus(pCommitRaw, SDB_STATUS_READY), NULL, _OVER);
   }
 
-  if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;
+  TAOS_CHECK_GOTO(mndTransPrepare(pMnode, pTrans), NULL, _OVER);
 
   code = 0;
 
@@ -315,32 +350,48 @@ _OVER:
   taosMemoryFree(func.pCode);
   taosMemoryFree(func.pComment);
   mndTransDrop(pTrans);
-  return code;
+  TAOS_RETURN(code);
 }
 
 static int32_t mndDropFunc(SMnode *pMnode, SRpcMsg *pReq, SFuncObj *pFunc) {
   int32_t code = -1;
   STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_CONFLICT_NOTHING, pReq, "drop-func");
-  if (pTrans == NULL) goto _OVER;
+  if (pTrans == NULL) {
+    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+    if (terrno != 0) code = terrno;
+    goto _OVER;
+  }
 
   mInfo("trans:%d, used to drop user:%s", pTrans->id, pFunc->name);
 
   SSdbRaw *pRedoRaw = mndFuncActionEncode(pFunc);
-  if (pRedoRaw == NULL) goto _OVER;
+  if (pRedoRaw == NULL) {
-  if (mndTransAppendRedolog(pTrans, pRedoRaw) != 0) goto _OVER;
+    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+    if (terrno != 0) code = terrno;
+    goto _OVER;
+  }
+  TAOS_CHECK_GOTO(mndTransAppendRedolog(pTrans, pRedoRaw), NULL, _OVER);
   (void)sdbSetRawStatus(pRedoRaw, SDB_STATUS_DROPPING);
 
   SSdbRaw *pUndoRaw = mndFuncActionEncode(pFunc);
-  if (pUndoRaw == NULL) goto _OVER;
+  if (pUndoRaw == NULL) {
-  if (mndTransAppendUndolog(pTrans, pUndoRaw) != 0) goto _OVER;
+    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+    if (terrno != 0) code = terrno;
+    goto _OVER;
+  }
+  TAOS_CHECK_GOTO(mndTransAppendUndolog(pTrans, pUndoRaw), NULL, _OVER);
   (void)sdbSetRawStatus(pUndoRaw, SDB_STATUS_READY);
 
   SSdbRaw *pCommitRaw = mndFuncActionEncode(pFunc);
-  if (pCommitRaw == NULL) goto _OVER;
+  if (pCommitRaw == NULL) {
-  if (mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) goto _OVER;
+    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
+    if (terrno != 0) code = terrno;
+    goto _OVER;
+  }
+  TAOS_CHECK_GOTO(mndTransAppendCommitlog(pTrans, pCommitRaw), NULL, _OVER);
   (void)sdbSetRawStatus(pCommitRaw, SDB_STATUS_DROPPED);
 
-  if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;
+  TAOS_CHECK_GOTO(mndTransPrepare(pMnode, pTrans), NULL, _OVER);
 
   code = 0;
 
@@ -355,18 +406,14 @@ static int32_t mndProcessCreateFuncReq(SRpcMsg *pReq) {
   SFuncObj      *pFunc = NULL;
   SCreateFuncReq createReq = {0};
 
-  if (tDeserializeSCreateFuncReq(pReq->pCont, pReq->contLen, &createReq) != 0) {
+  TAOS_CHECK_GOTO(tDeserializeSCreateFuncReq(pReq->pCont, pReq->contLen, &createReq), NULL, _OVER);
-    terrno = TSDB_CODE_INVALID_MSG;
+
-    goto _OVER;
-  }
 #ifdef WINDOWS
-  terrno = TSDB_CODE_MND_INVALID_PLATFORM;
+  code = TSDB_CODE_MND_INVALID_PLATFORM;
   goto _OVER;
 #endif
   mInfo("func:%s, start to create, size:%d", createReq.name, createReq.codeLen);
-  if (mndCheckOperPrivilege(pMnode, pReq->info.conn.user, MND_OPER_CREATE_FUNC) != 0) {
+  TAOS_CHECK_GOTO(mndCheckOperPrivilege(pMnode, pReq->info.conn.user, MND_OPER_CREATE_FUNC), NULL, _OVER);
-    goto _OVER;
-  }
 
   pFunc = mndAcquireFunc(pMnode, createReq.name);
   if (pFunc != NULL) {
@@ -378,7 +425,7 @@ static int32_t mndProcessCreateFuncReq(SRpcMsg *pReq) {
       mInfo("func:%s, replace function is set", createReq.name);
       code = 0;
     } else {
-      terrno = TSDB_CODE_MND_FUNC_ALREADY_EXIST;
+      code = TSDB_CODE_MND_FUNC_ALREADY_EXIST;
       goto _OVER;
     }
   } else if (terrno == TSDB_CODE_MND_FUNC_ALREADY_EXIST) {
@@ -386,22 +433,22 @@ static int32_t mndProcessCreateFuncReq(SRpcMsg *pReq) {
   }
 
   if (createReq.name[0] == 0) {
-    terrno = TSDB_CODE_MND_INVALID_FUNC_NAME;
+    code = TSDB_CODE_MND_INVALID_FUNC_NAME;
     goto _OVER;
   }
 
   if (createReq.pCode == NULL) {
-    terrno = TSDB_CODE_MND_INVALID_FUNC_CODE;
+    code = TSDB_CODE_MND_INVALID_FUNC_CODE;
     goto _OVER;
   }
 
   if (createReq.codeLen <= 1) {
-    terrno = TSDB_CODE_MND_INVALID_FUNC_CODE;
+    code = TSDB_CODE_MND_INVALID_FUNC_CODE;
     goto _OVER;
   }
 
   if (createReq.bufSize < 0 || createReq.bufSize > TSDB_FUNC_BUF_SIZE) {
-    terrno = TSDB_CODE_MND_INVALID_FUNC_BUFSIZE;
+    code = TSDB_CODE_MND_INVALID_FUNC_BUFSIZE;
     goto _OVER;
   }
 
@@ -410,12 +457,12 @@ static int32_t mndProcessCreateFuncReq(SRpcMsg *pReq) {
 
 _OVER:
   if (code != 0 && code != TSDB_CODE_ACTION_IN_PROGRESS) {
-    mError("func:%s, failed to create since %s", createReq.name, terrstr());
+    mError("func:%s, failed to create since %s", createReq.name, tstrerror(code));
   }
 
   mndReleaseFunc(pMnode, pFunc);
   tFreeSCreateFuncReq(&createReq);
-  return code;
+  TAOS_RETURN(code);
 }
 
 static int32_t mndProcessDropFuncReq(SRpcMsg *pReq) {
@@ -424,18 +471,13 @@ static int32_t mndProcessDropFuncReq(SRpcMsg *pReq) {
   SFuncObj    *pFunc = NULL;
   SDropFuncReq dropReq = {0};
 
-  if (tDeserializeSDropFuncReq(pReq->pCont, pReq->contLen, &dropReq) != 0) {
+  TAOS_CHECK_GOTO(tDeserializeSDropFuncReq(pReq->pCont, pReq->contLen, &dropReq), NULL, _OVER);
-    terrno = TSDB_CODE_INVALID_MSG;
-    goto _OVER;
-  }
 
   mInfo("func:%s, start to drop", dropReq.name);
-  if (mndCheckOperPrivilege(pMnode, pReq->info.conn.user, MND_OPER_DROP_FUNC) != 0) {
+  TAOS_CHECK_GOTO(mndCheckOperPrivilege(pMnode, pReq->info.conn.user, MND_OPER_DROP_FUNC), NULL, _OVER);
-    goto _OVER;
-  }
 
   if (dropReq.name[0] == 0) {
-    terrno = TSDB_CODE_MND_INVALID_FUNC_NAME;
+    code = TSDB_CODE_MND_INVALID_FUNC_NAME;
     goto _OVER;
   }
 
@@ -446,7 +488,7 @@ static int32_t mndProcessDropFuncReq(SRpcMsg *pReq) {
       code = 0;
       goto _OVER;
     } else {
-      terrno = TSDB_CODE_MND_FUNC_NOT_EXIST;
+      code = TSDB_CODE_MND_FUNC_NOT_EXIST;
       goto _OVER;
     }
   }
@@ -456,11 +498,11 @@ static int32_t mndProcessDropFuncReq(SRpcMsg *pReq) {
 
 _OVER:
   if (code != 0 && code != TSDB_CODE_ACTION_IN_PROGRESS) {
-    mError("func:%s, failed to drop since %s", dropReq.name, terrstr());
+    mError("func:%s, failed to drop since %s", dropReq.name, tstrerror(code));
   }
 
   mndReleaseFunc(pMnode, pFunc);
-  return code;
+  TAOS_RETURN(code);
 }
 
 static int32_t mndProcessRetrieveFuncReq(SRpcMsg *pReq) {
@@ -470,25 +512,25 @@ static int32_t mndProcessRetrieveFuncReq(SRpcMsg *pReq) {
   SRetrieveFuncRsp retrieveRsp = {0};
 
   if (tDeserializeSRetrieveFuncReq(pReq->pCont, pReq->contLen, &retrieveReq) != 0) {
-    terrno = TSDB_CODE_INVALID_MSG;
+    code = TSDB_CODE_INVALID_MSG;
     goto RETRIEVE_FUNC_OVER;
   }
 
   if (retrieveReq.numOfFuncs <= 0 || retrieveReq.numOfFuncs > TSDB_FUNC_MAX_RETRIEVE) {
-    terrno = TSDB_CODE_MND_INVALID_FUNC_RETRIEVE;
+    code = TSDB_CODE_MND_INVALID_FUNC_RETRIEVE;
     goto RETRIEVE_FUNC_OVER;
   }
 
   retrieveRsp.numOfFuncs = retrieveReq.numOfFuncs;
   retrieveRsp.pFuncInfos = taosArrayInit(retrieveReq.numOfFuncs, sizeof(SFuncInfo));
   if (retrieveRsp.pFuncInfos == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    code = TSDB_CODE_OUT_OF_MEMORY;
     goto RETRIEVE_FUNC_OVER;
   }
 
   retrieveRsp.pFuncExtraInfos = taosArrayInit(retrieveReq.numOfFuncs, sizeof(SFuncExtraInfo));
   if (retrieveRsp.pFuncExtraInfos == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    code = TSDB_CODE_OUT_OF_MEMORY;
     goto RETRIEVE_FUNC_OVER;
   }
 
@@ -497,6 +539,7 @@ static int32_t mndProcessRetrieveFuncReq(SRpcMsg *pReq) {
 
     SFuncObj *pFunc = mndAcquireFunc(pMnode, funcName);
     if (pFunc == NULL) {
+      if (terrno != 0) code = terrno;
       goto RETRIEVE_FUNC_OVER;
     }
 
@@ -541,7 +584,7 @@ static int32_t mndProcessRetrieveFuncReq(SRpcMsg *pReq) {
   int32_t contLen = tSerializeSRetrieveFuncRsp(NULL, 0, &retrieveRsp);
   void   *pRsp = rpcMallocCont(contLen);
   if (pRsp == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    code = TSDB_CODE_OUT_OF_MEMORY;
     goto RETRIEVE_FUNC_OVER;
   }
 
@@ -556,7 +599,7 @@ RETRIEVE_FUNC_OVER:
   tFreeSRetrieveFuncReq(&retrieveReq);
   tFreeSRetrieveFuncRsp(&retrieveRsp);
 
-  return code;
+  TAOS_RETURN(code);
 }
 
 static void *mnodeGenTypeStr(char *buf, int32_t buflen, uint8_t type, int32_t len) {

source/dnode/mnode/impl/src/mndMain.c

@@ -457,7 +457,7 @@ static int32_t mndCreateDir(SMnode *pMnode, const char *path) {
   }
 
   if (taosMkDir(pMnode->path) != 0) {
-    code = TAOS_SYSTEM_ERROR(errno);
+    code = terrno;
     TAOS_RETURN(code);
   }
 

source/dnode/mnode/impl/src/mndScheduler.c

@@ -771,21 +771,22 @@ int32_t mndSchedInitSubEp(SMnode* pMnode, const SMqTopicObj* pTopic, SMqSubscrib
   if (pTopic->subType == TOPIC_SUB_TYPE__COLUMN) {
     pPlan = qStringToQueryPlan(pTopic->physicalPlan);
     if (pPlan == NULL) {
-      code = TSDB_CODE_QRY_INVALID_INPUT;
+      return TSDB_CODE_QRY_INVALID_INPUT;
-      TAOS_RETURN(code);
     }
   } else if (pTopic->subType == TOPIC_SUB_TYPE__TABLE && pTopic->ast != NULL) {
     SNode* pAst = NULL;
-    if ((code = nodesStringToNode(pTopic->ast, &pAst)) != 0) {
+    code = nodesStringToNode(pTopic->ast, &pAst);
+    if (code != 0) {
       mError("topic:%s, failed to create since %s", pTopic->name, terrstr());
-      TAOS_RETURN(code);
+      return code;
     }
 
     SPlanContext cxt = {.pAstRoot = pAst, .topicQuery = true};
-    if ((code = qCreateQueryPlan(&cxt, &pPlan, NULL)) != 0) {
+    code = qCreateQueryPlan(&cxt, &pPlan, NULL);
+    if (code != 0) {
       mError("failed to create topic:%s since %s", pTopic->name, terrstr());
       nodesDestroyNode(pAst);
-      TAOS_RETURN(code);
+      return code;
     }
     nodesDestroyNode(pAst);
   }
@@ -793,18 +794,19 @@ int32_t mndSchedInitSubEp(SMnode* pMnode, const SMqTopicObj* pTopic, SMqSubscrib
   if (pPlan) {
     int32_t levelNum = LIST_LENGTH(pPlan->pSubplans);
     if (levelNum != 1) {
-      qDestroyQueryPlan(pPlan);
       code = TSDB_CODE_MND_INVALID_TOPIC_QUERY;
-      TAOS_RETURN(code);
+      goto END;
     }
 
     SNodeListNode* pNodeListNode = (SNodeListNode*)nodesListGetNode(pPlan->pSubplans, 0);
-
+    if (pNodeListNode == NULL){
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      goto END;
+    }
     int32_t opNum = LIST_LENGTH(pNodeListNode->pNodeList);
     if (opNum != 1) {
-      qDestroyQueryPlan(pPlan);
       code = TSDB_CODE_MND_INVALID_TOPIC_QUERY;
-      TAOS_RETURN(code);
+      goto END;
     }
 
     pSubplan = (SSubplan*)nodesListGetNode(pNodeListNode->pNodeList, 0);
@@ -825,12 +827,18 @@ int32_t mndSchedInitSubEp(SMnode* pMnode, const SMqTopicObj* pTopic, SMqSubscrib
     pSub->vgNum++;
 
     SMqVgEp* pVgEp = taosMemoryMalloc(sizeof(SMqVgEp));
+    if (pVgEp == NULL){
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      goto END;
+    }
     pVgEp->epSet = mndGetVgroupEpset(pMnode, pVgroup);
     pVgEp->vgId = pVgroup->vgId;
-    taosArrayPush(pSub->unassignedVgs, &pVgEp);
+    if (taosArrayPush(pSub->unassignedVgs, &pVgEp) == NULL){
-
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      taosMemoryFree(pVgEp);
+      goto END;
+    }
     mInfo("init subscription %s for topic:%s assign vgId:%d", pSub->key, pTopic->name, pVgEp->vgId);
-
     sdbRelease(pSdb, pVgroup);
   }
 
@@ -838,14 +846,14 @@ int32_t mndSchedInitSubEp(SMnode* pMnode, const SMqTopicObj* pTopic, SMqSubscrib
     int32_t msgLen;
 
     if (qSubPlanToString(pSubplan, &pSub->qmsg, &msgLen) < 0) {
-      qDestroyQueryPlan(pPlan);
       code = TSDB_CODE_QRY_INVALID_INPUT;
-      TAOS_RETURN(code);
+      goto END;
     }
   } else {
     pSub->qmsg = taosStrdup("");
   }
 
+END:
   qDestroyQueryPlan(pPlan);
-  TAOS_RETURN(code);
+  return code;
 }

source/dnode/mnode/impl/src/mndTopic.c

@@ -44,8 +44,6 @@ static int32_t mndProcessDropTopicReq(SRpcMsg *pReq);
 static int32_t mndRetrieveTopic(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rows);
 static void    mndCancelGetNextTopic(SMnode *pMnode, void *pIter);
 
-static int32_t mndSetDropTopicCommitLogs(SMnode *pMnode, STrans *pTrans, SMqTopicObj *pTopic);
-
 int32_t mndInitTopic(SMnode *pMnode) {
   SSdbTable table = {
       .sdbType = SDB_TOPIC,
@@ -70,9 +68,16 @@ int32_t mndInitTopic(SMnode *pMnode) {
 
 void mndCleanupTopic(SMnode *pMnode) {}
 
-const char *mndTopicGetShowName(const char topic[TSDB_TOPIC_FNAME_LEN]) {
+void mndTopicGetShowName(const char* fullTopic, char* topic) {
-  //
+  if (fullTopic == NULL) {
-  return strchr(topic, '.') + 1;
+    return;
+  }
+  char* tmp = strchr(fullTopic, '.');
+  if (tmp == NULL) {
+    tstrncpy(topic, fullTopic, TSDB_TOPIC_FNAME_LEN);
+  }else {
+    tstrncpy(topic, tmp+1, TSDB_TOPIC_FNAME_LEN);
+  }
 }
 
 SSdbRaw *mndTopicActionEncode(SMqTopicObj *pTopic) {
@@ -129,7 +134,9 @@ SSdbRaw *mndTopicActionEncode(SMqTopicObj *pTopic) {
       goto TOPIC_ENCODE_OVER;
     }
     void *aswBuf = swBuf;
-    taosEncodeSSchemaWrapper(&aswBuf, &pTopic->schema);
+    if(taosEncodeSSchemaWrapper(&aswBuf, &pTopic->schema) < 0){
+      goto TOPIC_ENCODE_OVER;
+    }
     SDB_SET_BINARY(pRaw, dataPos, swBuf, schemaLen, TOPIC_ENCODE_OVER);
   }
 
@@ -259,7 +266,7 @@ SSdbRow *mndTopicActionDecode(SSdbRaw *pRaw) {
     }
     int16_t colId;
     SDB_GET_INT16(pRaw, dataPos, &colId, TOPIC_DECODE_OVER);
-    taosArrayPush(pTopic->ntbColIds, &colId);
+    (void)taosArrayPush(pTopic->ntbColIds, &colId);
   }
 
   SDB_GET_INT64(pRaw, dataPos, &pTopic->ctbStbUid, TOPIC_DECODE_OVER);
@@ -289,25 +296,25 @@ static int32_t mndTopicActionDelete(SSdb *pSdb, SMqTopicObj *pTopic) {
   taosMemoryFreeClear(pTopic->ast);
   taosMemoryFreeClear(pTopic->physicalPlan);
   if (pTopic->schema.nCols) taosMemoryFreeClear(pTopic->schema.pSchema);
-  taosArrayDestroy(pTopic->ntbColIds);
+  (void)taosArrayDestroy(pTopic->ntbColIds);
   return 0;
 }
 
 static int32_t mndTopicActionUpdate(SSdb *pSdb, SMqTopicObj *pOldTopic, SMqTopicObj *pNewTopic) {
   mTrace("topic:%s perform update action", pOldTopic->name);
-  atomic_exchange_64(&pOldTopic->updateTime, pNewTopic->updateTime);
+  (void)atomic_exchange_64(&pOldTopic->updateTime, pNewTopic->updateTime);
-  atomic_exchange_32(&pOldTopic->version, pNewTopic->version);
+  (void)atomic_exchange_32(&pOldTopic->version, pNewTopic->version);
 
   return 0;
 }
 
-SMqTopicObj *mndAcquireTopic(SMnode *pMnode, const char *topicName) {
+int32_t mndAcquireTopic(SMnode *pMnode, const char *topicName, SMqTopicObj **pTopic) {
   SSdb        *pSdb = pMnode->pSdb;
-  SMqTopicObj *pTopic = sdbAcquire(pSdb, SDB_TOPIC, topicName);
+  *pTopic = sdbAcquire(pSdb, SDB_TOPIC, topicName);
-  if (pTopic == NULL && terrno == TSDB_CODE_SDB_OBJ_NOT_THERE) {
+  if (*pTopic == NULL) {
-    terrno = TSDB_CODE_MND_TOPIC_NOT_EXIST;
+    return TSDB_CODE_MND_TOPIC_NOT_EXIST;
   }
-  return pTopic;
+  return TDB_CODE_SUCCESS;
 }
 
 void mndReleaseTopic(SMnode *pMnode, SMqTopicObj *pTopic) {
@@ -316,25 +323,23 @@ void mndReleaseTopic(SMnode *pMnode, SMqTopicObj *pTopic) {
 }
 
 static int32_t mndCheckCreateTopicReq(SCMCreateTopicReq *pCreate) {
-  terrno = TSDB_CODE_MND_INVALID_TOPIC;
+  if (pCreate->sql == NULL) return TSDB_CODE_MND_INVALID_TOPIC;
-
-  if (pCreate->sql == NULL) return -1;
 
   if (pCreate->subType == TOPIC_SUB_TYPE__COLUMN) {
-    if (pCreate->ast == NULL || pCreate->ast[0] == 0) return -1;
+    if (pCreate->ast == NULL || pCreate->ast[0] == 0) return TSDB_CODE_MND_INVALID_TOPIC;
   } else if (pCreate->subType == TOPIC_SUB_TYPE__TABLE) {
-    if (pCreate->subStbName[0] == 0) return -1;
+    if (pCreate->subStbName[0] == 0) return TSDB_CODE_MND_INVALID_TOPIC;
   } else if (pCreate->subType == TOPIC_SUB_TYPE__DB) {
-    if (pCreate->subDbName[0] == 0) return -1;
+    if (pCreate->subDbName[0] == 0) return TSDB_CODE_MND_INVALID_TOPIC;
   }
 
-  terrno = TSDB_CODE_SUCCESS;
   return 0;
 }
 
 static int32_t extractTopicTbInfo(SNode *pAst, SMqTopicObj *pTopic) {
   SNodeList *pNodeList = NULL;
-  nodesCollectColumns((SSelectStmt *)pAst, SQL_CLAUSE_FROM, NULL, COLLECT_COL_TYPE_ALL, &pNodeList);
+  int32_t   code = 0;
+  MND_TMQ_RETURN_CHECK(nodesCollectColumns((SSelectStmt *)pAst, SQL_CLAUSE_FROM, NULL, COLLECT_COL_TYPE_ALL, &pNodeList));
   int64_t suid = ((SRealTableNode *)((SSelectStmt *)pAst)->pFromTable)->pMeta->suid;
   int8_t  tableType = ((SRealTableNode *)((SSelectStmt *)pAst)->pFromTable)->pMeta->tableType;
   if (tableType == TSDB_CHILD_TABLE) {
@@ -345,17 +350,19 @@ static int32_t extractTopicTbInfo(SNode *pAst, SMqTopicObj *pTopic) {
       SColumnNode *pCol = (SColumnNode *)pNode;
       if (pCol->tableType == TSDB_NORMAL_TABLE) {
         pTopic->ntbUid = pCol->tableId;
-        taosArrayPush(pTopic->ntbColIds, &pCol->colId);
+        MND_TMQ_NULL_CHECK(taosArrayPush(pTopic->ntbColIds, &pCol->colId));
       }
     }
   }
   nodesDestroyList(pNodeList);
-  return 0;
+
+END:
+  return code;
 }
 
 static int32_t sendCheckInfoToVnode(STrans *pTrans, SMnode *pMnode, SMqTopicObj *topicObj){
-  STqCheckInfo info;
+  STqCheckInfo info = {0};
-  memcpy(info.topic, topicObj->name, TSDB_TOPIC_FNAME_LEN);
+  (void)memcpy(info.topic, topicObj->name, TSDB_TOPIC_FNAME_LEN);
   info.ntbUid = topicObj->ntbUid;
   info.colIdList = topicObj->ntbColIds;
   // broadcast forbid alter info
@@ -378,16 +385,17 @@ static int32_t sendCheckInfoToVnode(STrans *pTrans, SMnode *pMnode, SMqTopicObj
     int32_t len;
     tEncodeSize(tEncodeSTqCheckInfo, &info, len, code);
     if (code != 0) {
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      code = TSDB_CODE_OUT_OF_MEMORY;
       goto END;
     }
     buf = taosMemoryCalloc(1, sizeof(SMsgHead) + len);
+    MND_TMQ_NULL_CHECK(buf);
     void    *abuf = POINTER_SHIFT(buf, sizeof(SMsgHead));
-    SEncoder encoder;
+    SEncoder encoder = {0};
     tEncoderInit(&encoder, abuf, len);
     code = tEncodeSTqCheckInfo(&encoder, &info);
     if (code < 0) {
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      tEncoderClear(&encoder);
       goto END;
     }
     tEncoderClear(&encoder);
@@ -398,10 +406,7 @@ static int32_t sendCheckInfoToVnode(STrans *pTrans, SMnode *pMnode, SMqTopicObj
     action.pCont = buf;
     action.contLen = sizeof(SMsgHead) + len;
     action.msgType = TDMT_VND_TMQ_ADD_CHECKINFO;
-    code = mndTransAppendRedoAction(pTrans, &action);
+    MND_TMQ_RETURN_CHECK(mndTransAppendRedoAction(pTrans, &action));
-    if (code != 0) {
-      goto END;
-    }
     sdbRelease(pSdb, pVgroup);
     buf = NULL;
   }
@@ -417,33 +422,22 @@ static int32_t mndCreateTopic(SMnode *pMnode, SRpcMsg *pReq, SCMCreateTopicReq *
                               const char *userName) {
   mInfo("start to create topic:%s", pCreate->name);
   STrans *pTrans = NULL;
-  int32_t code = -1;
+  int32_t code = 0;
   SNode  *pAst = NULL;
   SQueryPlan *pPlan = NULL;
   SMqTopicObj topicObj = {0};
 
   pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_CONFLICT_DB, pReq, "create-topic");
-  if (pTrans == NULL) {
+  MND_TMQ_NULL_CHECK(pTrans);
-    mError("topic:%s, failed to create since %s", pCreate->name, terrstr());
-    code = -1;
-    goto _OUT;
-  }
-
   mndTransSetDbName(pTrans, pDb->name, NULL);
-  code = mndTransCheckConflict(pMnode, pTrans);
+  MND_TMQ_RETURN_CHECK(mndTransCheckConflict(pMnode, pTrans));
-  if (code != 0) {
-    goto _OUT;
-  }
   mInfo("trans:%d to create topic:%s", pTrans->id, pCreate->name);
 
   tstrncpy(topicObj.name, pCreate->name, TSDB_TOPIC_FNAME_LEN);
   tstrncpy(topicObj.db, pDb->name, TSDB_DB_FNAME_LEN);
   tstrncpy(topicObj.createUser, userName, TSDB_USER_LEN);
 
-  code = mndCheckTopicPrivilege(pMnode, pReq->info.conn.user, MND_OPER_CREATE_TOPIC, &topicObj);
+  MND_TMQ_RETURN_CHECK(mndCheckTopicPrivilege(pMnode, pReq->info.conn.user, MND_OPER_CREATE_TOPIC, &topicObj));
-  if (code != 0) {
-    goto _OUT;
-  }
 
   topicObj.createTime = taosGetTimestampMs();
   topicObj.updateTime = topicObj.createTime;
@@ -458,56 +452,25 @@ static int32_t mndCreateTopic(SMnode *pMnode, SRpcMsg *pReq, SCMCreateTopicReq *
   if (pCreate->subType == TOPIC_SUB_TYPE__COLUMN) {
     topicObj.ast = taosStrdup(pCreate->ast);
     topicObj.astLen = strlen(pCreate->ast) + 1;
-
     qDebugL("topic:%s ast %s", topicObj.name, topicObj.ast);
-
+    MND_TMQ_RETURN_CHECK(nodesStringToNode(pCreate->ast, &pAst));
-    code = nodesStringToNode(pCreate->ast, &pAst);
-    if (code != 0) {
-      mError("topic:%s, failed to create since %s", pCreate->name, terrstr());
-      goto _OUT;
-    }
-
     SPlanContext cxt = {.pAstRoot = pAst, .topicQuery = true};
-    code = qCreateQueryPlan(&cxt, &pPlan, NULL);
+    MND_TMQ_RETURN_CHECK(qCreateQueryPlan(&cxt, &pPlan, NULL));
-    if (code != 0) {
-      mError("failed to create topic:%s since %s", pCreate->name, terrstr());
-      goto _OUT;
-    }
 
     topicObj.ntbColIds = taosArrayInit(0, sizeof(int16_t));
-    if (topicObj.ntbColIds == NULL) {
+    MND_TMQ_NULL_CHECK(topicObj.ntbColIds);
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
+    MND_TMQ_RETURN_CHECK(extractTopicTbInfo(pAst, &topicObj));
-      code = terrno;
-      goto _OUT;
-    }
-
-    extractTopicTbInfo(pAst, &topicObj);
-
     if (topicObj.ntbUid == 0) {
-      taosArrayDestroy(topicObj.ntbColIds);
+      (void)taosArrayDestroy(topicObj.ntbColIds);
       topicObj.ntbColIds = NULL;
     }
 
-    code = qExtractResultSchema(pAst, &topicObj.schema.nCols, &topicObj.schema.pSchema);
+    MND_TMQ_RETURN_CHECK(qExtractResultSchema(pAst, &topicObj.schema.nCols, &topicObj.schema.pSchema));
-    if (code != 0) {
+    MND_TMQ_RETURN_CHECK(nodesNodeToString((SNode *)pPlan, false, &topicObj.physicalPlan, NULL));
-      mError("topic:%s, failed to create since %s", pCreate->name, terrstr());
-      goto _OUT;
-    }
-
-    code = nodesNodeToString((SNode *)pPlan, false, &topicObj.physicalPlan, NULL);
-    if (code != 0) {
-      mError("topic:%s, failed to create since %s", pCreate->name, terrstr());
-      goto _OUT;
-    }
   } else if (pCreate->subType == TOPIC_SUB_TYPE__TABLE) {
     SStbObj *pStb = mndAcquireStb(pMnode, pCreate->subStbName);
-    if (pStb == NULL) {
+    MND_TMQ_NULL_CHECK(pStb);
-      terrno = TSDB_CODE_MND_STB_NOT_EXIST;
+    tstrncpy(topicObj.stbName, pCreate->subStbName, TSDB_TABLE_FNAME_LEN);
-      code = terrno;
-      goto _OUT;
-    }
-
-    strcpy(topicObj.stbName, pCreate->subStbName);
     topicObj.stbUid = pStb->uid;
     mndReleaseStb(pMnode, pStb);
     if(pCreate->ast != NULL){
@@ -518,34 +481,25 @@ static int32_t mndCreateTopic(SMnode *pMnode, SRpcMsg *pReq, SCMCreateTopicReq *
   }
 
   SSdbRaw *pCommitRaw = mndTopicActionEncode(&topicObj);
-  if (pCommitRaw == NULL || mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) {
+  MND_TMQ_NULL_CHECK(pCommitRaw);
-    mError("trans:%d, failed to append commit log since %s", pTrans->id, terrstr());
+  code = mndTransAppendCommitlog(pTrans, pCommitRaw);
-    code = -1;
+  if(code != 0) {
-    goto _OUT;
+    sdbFreeRaw(pCommitRaw);
+    goto END;
   }
 
-  (void)sdbSetRawStatus(pCommitRaw, SDB_STATUS_READY);
+  MND_TMQ_RETURN_CHECK(sdbSetRawStatus(pCommitRaw, SDB_STATUS_READY));
-
   if (topicObj.ntbUid != 0) {
-    code = sendCheckInfoToVnode(pTrans, pMnode, &topicObj);
+    MND_TMQ_RETURN_CHECK(sendCheckInfoToVnode(pTrans, pMnode, &topicObj));
-    if (code != 0){
-      goto _OUT;
   }
-  }
+  MND_TMQ_RETURN_CHECK(mndTransPrepare(pMnode, pTrans));
-
-  if (mndTransPrepare(pMnode, pTrans) != 0) {
-    mError("trans:%d, failed to prepare since %s", pTrans->id, terrstr());
-    code = -1;
-    goto _OUT;
-  }
-
   code = TSDB_CODE_ACTION_IN_PROGRESS;
 
-_OUT:
+END:
   taosMemoryFreeClear(topicObj.physicalPlan);
   taosMemoryFreeClear(topicObj.sql);
   taosMemoryFreeClear(topicObj.ast);
-  taosArrayDestroy(topicObj.ntbColIds);
+  (void)taosArrayDestroy(topicObj.ntbColIds);
   if (topicObj.schema.nCols) {
     taosMemoryFreeClear(topicObj.schema.pSchema);
   }
@@ -557,75 +511,64 @@ _OUT:
 
 static int32_t mndProcessCreateTopicReq(SRpcMsg *pReq) {
   SMnode           *pMnode = pReq->info.node;
-  int32_t           code = -1;
+  int32_t           code = TDB_CODE_SUCCESS;
   SMqTopicObj      *pTopic = NULL;
   SDbObj           *pDb = NULL;
   SCMCreateTopicReq createTopicReq = {0};
 
   if (tDeserializeSCMCreateTopicReq(pReq->pCont, pReq->contLen, &createTopicReq) != 0) {
-    terrno = TSDB_CODE_INVALID_MSG;
+    code = TSDB_CODE_INVALID_MSG;
-    goto _OVER;
+    goto END;
   }
 
   mInfo("topic:%s start to create, sql:%s", createTopicReq.name, createTopicReq.sql);
 
-  if (mndCheckCreateTopicReq(&createTopicReq) != 0) {
+  MND_TMQ_RETURN_CHECK(mndCheckCreateTopicReq(&createTopicReq));
-    mError("topic:%s failed to create since %s", createTopicReq.name, terrstr());
-    goto _OVER;
-  }
 
-  pTopic = mndAcquireTopic(pMnode, createTopicReq.name);
+  code = mndAcquireTopic(pMnode, createTopicReq.name, &pTopic);
-  if (pTopic != NULL) {
+  if (code == TDB_CODE_SUCCESS) {
     if (createTopicReq.igExists) {
       mInfo("topic:%s already exist, ignore exist is set", createTopicReq.name);
-      code = 0;
+      goto END;
-      goto _OVER;
     } else {
-      terrno = TSDB_CODE_MND_TOPIC_ALREADY_EXIST;
+      code = TSDB_CODE_MND_TOPIC_ALREADY_EXIST;
-      goto _OVER;
+      goto END;
     }
-  } else if (terrno != TSDB_CODE_MND_TOPIC_NOT_EXIST) {
+  } else if (code != TSDB_CODE_MND_TOPIC_NOT_EXIST) {
-    goto _OVER;
+    goto END;
   }
 
   pDb = mndAcquireDb(pMnode, createTopicReq.subDbName);
-  if (pDb == NULL) {
+  MND_TMQ_NULL_CHECK(pDb);
-    terrno = TSDB_CODE_MND_DB_NOT_SELECTED;
-    goto _OVER;
-  }
 
   if (pDb->cfg.walRetentionPeriod == 0) {
-    terrno = TSDB_CODE_MND_DB_RETENTION_PERIOD_ZERO;
+    code = TSDB_CODE_MND_DB_RETENTION_PERIOD_ZERO;
     mError("db:%s, not allowed to create topic when WAL_RETENTION_PERIOD is zero", pDb->name);
-    goto _OVER;
+    goto END;
   }
 
   if (sdbGetSize(pMnode->pSdb, SDB_TOPIC) >= tmqMaxTopicNum){
-    terrno = TSDB_CODE_TMQ_TOPIC_OUT_OF_RANGE;
+    code = TSDB_CODE_TMQ_TOPIC_OUT_OF_RANGE;
     mError("topic num out of range");
-    goto _OVER;
+    goto END;
-  }
-
-  if ((terrno = grantCheck(TSDB_GRANT_SUBSCRIPTION)) < 0) {
-    goto _OVER;
   }
 
+  MND_TMQ_RETURN_CHECK(grantCheck(TSDB_GRANT_SUBSCRIPTION));
   code = mndCreateTopic(pMnode, pReq, &createTopicReq, pDb, pReq->info.conn.user);
   if (code == 0) {
     code = TSDB_CODE_ACTION_IN_PROGRESS;
   }
 
+  {
     SName dbname = {0};
-  tNameFromString(&dbname, createTopicReq.subDbName, T_NAME_ACCT | T_NAME_DB);
+    (void)tNameFromString(&dbname, createTopicReq.subDbName, T_NAME_ACCT | T_NAME_DB);              // ignore error
-
     SName topicName = {0};
-  tNameFromString(&topicName, createTopicReq.name, T_NAME_ACCT | T_NAME_DB | T_NAME_TABLE);
+    (void)tNameFromString(&topicName, createTopicReq.name, T_NAME_ACCT | T_NAME_DB | T_NAME_TABLE); // ignore error
-  //reuse this function for topic
-
     auditRecord(pReq, pMnode->clusterId, "createTopic", dbname.dbname, topicName.dbname,
                 createTopicReq.sql, strlen(createTopicReq.sql));
+  }
 
-_OVER:
+END:
   if (code != 0 && code != TSDB_CODE_ACTION_IN_PROGRESS) {
     mError("failed to create topic:%s since %s", createTopicReq.name, terrstr());
   }
@@ -638,22 +581,20 @@ _OVER:
 }
 
 static int32_t mndDropTopic(SMnode *pMnode, STrans *pTrans, SRpcMsg *pReq, SMqTopicObj *pTopic) {
-  int32_t code = -1;
+  int32_t code = 0;
-  if (mndUserRemoveTopic(pMnode, pTrans, pTopic->name) != 0) {
+  SSdbRaw *pCommitRaw = NULL;
-    goto _OVER;
+  MND_TMQ_RETURN_CHECK(mndUserRemoveTopic(pMnode, pTrans, pTopic->name));
+  pCommitRaw = mndTopicActionEncode(pTopic);
+  MND_TMQ_NULL_CHECK(pCommitRaw);
+  code = mndTransAppendCommitlog(pTrans, pCommitRaw);
+  if(code != 0) {
+    sdbFreeRaw(pCommitRaw);
+    goto END;
   }
+  MND_TMQ_RETURN_CHECK(sdbSetRawStatus(pCommitRaw, SDB_STATUS_DROPPED));
+  MND_TMQ_RETURN_CHECK(mndTransPrepare(pMnode, pTrans));
 
-  SSdbRaw *pCommitRaw = mndTopicActionEncode(pTopic);
+END:
-  if (pCommitRaw == NULL || mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) goto _OVER;
-  (void)sdbSetRawStatus(pCommitRaw, SDB_STATUS_DROPPED);
-
-  if (mndTransPrepare(pMnode, pTrans) != 0) {
-    goto _OVER;
-  }
-
-  code = 0;
-
-_OVER:
   return code;
 }
 
@@ -661,7 +602,7 @@ static bool checkTopic(SArray *topics, char *topicName){
   int32_t sz = taosArrayGetSize(topics);
   for (int32_t i = 0; i < sz; i++) {
     char *name = taosArrayGetP(topics, i);
-    if (strcmp(name, topicName) == 0) {
+    if (name && strcmp(name, topicName) == 0) {
       return true;
     }
   }
@@ -682,29 +623,26 @@ static int32_t mndDropConsumerByTopic(SMnode *pMnode, STrans *pTrans, char *topi
     bool found = checkTopic(pConsumer->assignedTopics, topicName);
     if (found){
       if (pConsumer->status == MQ_CONSUMER_STATUS_LOST) {
-        code = mndSetConsumerDropLogs(pTrans, pConsumer);
+        MND_TMQ_RETURN_CHECK(mndSetConsumerDropLogs(pTrans, pConsumer));
-        if (code != 0) {
-          goto end;
-        }
         sdbRelease(pSdb, pConsumer);
         continue;
       }
       mError("topic:%s, failed to drop since subscribed by consumer:0x%" PRIx64 ", in consumer group %s",
              topicName, pConsumer->consumerId, pConsumer->cgroup);
       code = TSDB_CODE_MND_TOPIC_SUBSCRIBED;
-      goto end;
+      goto END;
     }
 
     if (checkTopic(pConsumer->rebNewTopics, topicName) || checkTopic(pConsumer->rebRemovedTopics, topicName))  {
       code = TSDB_CODE_MND_TOPIC_SUBSCRIBED;
       mError("topic:%s, failed to drop since subscribed by consumer:%" PRId64 ", in consumer group %s (reb new)",
              topicName, pConsumer->consumerId, pConsumer->cgroup);
-      goto end;
+      goto END;
     }
     sdbRelease(pSdb, pConsumer);
   }
 
-end:
+END:
   sdbRelease(pSdb, pConsumer);
   sdbCancelFetch(pSdb, pIter);
   return code;
@@ -726,13 +664,10 @@ static int32_t mndDropCheckInfoByTopic(SMnode *pMnode, STrans *pTrans, SMqTopicO
     }
 
     buf = taosMemoryCalloc(1, sizeof(SMsgHead) + TSDB_TOPIC_FNAME_LEN);
-    if (buf == NULL){
+    MND_TMQ_NULL_CHECK(buf);
-      code = TSDB_CODE_OUT_OF_MEMORY;
-      goto end;
-    }
     void *abuf = POINTER_SHIFT(buf, sizeof(SMsgHead));
     ((SMsgHead *)buf)->vgId = htonl(pVgroup->vgId);
-    memcpy(abuf, pTopic->name, TSDB_TOPIC_FNAME_LEN);
+    (void)memcpy(abuf, pTopic->name, TSDB_TOPIC_FNAME_LEN);
 
     STransAction action = {0};
     action.epSet = mndGetVgroupEpset(pMnode, pVgroup);
@@ -742,12 +677,12 @@ static int32_t mndDropCheckInfoByTopic(SMnode *pMnode, STrans *pTrans, SMqTopicO
     code = mndTransAppendRedoAction(pTrans, &action);
     if (code != 0) {
       taosMemoryFree(buf);
-      goto end;
+      goto END;
     }
     sdbRelease(pSdb, pVgroup);
   }
 
-end:
+END:
   sdbRelease(pSdb, pVgroup);
   sdbCancelFetch(pSdb, pIter);
   return code;
@@ -761,70 +696,40 @@ static int32_t mndProcessDropTopicReq(SRpcMsg *pReq) {
   STrans      *pTrans = NULL;
 
   if (tDeserializeSMDropTopicReq(pReq->pCont, pReq->contLen, &dropReq) != 0) {
-    terrno = TSDB_CODE_INVALID_MSG;
+    return TSDB_CODE_INVALID_MSG;
-    return -1;
   }
 
-  pTopic = mndAcquireTopic(pMnode, dropReq.name);
+  code = mndAcquireTopic(pMnode, dropReq.name, &pTopic);
-  if (pTopic == NULL) {
+  if (code != 0) {
     if (dropReq.igNotExists) {
       mInfo("topic:%s, not exist, ignore not exist is set", dropReq.name);
       tFreeSMDropTopicReq(&dropReq);
       return 0;
     } else {
-      terrno = TSDB_CODE_MND_TOPIC_NOT_EXIST;
       mError("topic:%s, failed to drop since %s", dropReq.name, terrstr());
       tFreeSMDropTopicReq(&dropReq);
-      return -1;
+      return code;
     }
   }
 
   pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_CONFLICT_DB, pReq, "drop-topic");
-  if (pTrans == NULL) {
+  MND_TMQ_NULL_CHECK(pTrans);
-    mError("topic:%s, failed to drop since %s", pTopic->name, terrstr());
-    code = -1;
-    goto end;
-  }
 
   mndTransSetDbName(pTrans, pTopic->db, NULL);
-  code = mndTransCheckConflict(pMnode, pTrans);
+  MND_TMQ_RETURN_CHECK(mndTransCheckConflict(pMnode, pTrans));
-  if (code != 0) {
-    goto end;
-  }
-
   mInfo("trans:%d, used to drop topic:%s", pTrans->id, pTopic->name);
-
+  MND_TMQ_RETURN_CHECK(mndCheckTopicPrivilege(pMnode, pReq->info.conn.user, MND_OPER_DROP_TOPIC, pTopic));
-  code = mndCheckTopicPrivilege(pMnode, pReq->info.conn.user, MND_OPER_DROP_TOPIC, pTopic);
+  MND_TMQ_RETURN_CHECK(mndCheckDbPrivilegeByName(pMnode, pReq->info.conn.user, MND_OPER_READ_DB, pTopic->db));
-  if (code != 0) {
+  MND_TMQ_RETURN_CHECK(mndDropConsumerByTopic(pMnode, pTrans, dropReq.name));
-    goto end;
+  MND_TMQ_RETURN_CHECK(mndDropSubByTopic(pMnode, pTrans, dropReq.name));
-  }
-
-  code = mndCheckDbPrivilegeByName(pMnode, pReq->info.conn.user, MND_OPER_READ_DB, pTopic->db);
-  if (code != 0) {
-    goto end;
-  }
-
-  code = mndDropConsumerByTopic(pMnode, pTrans, dropReq.name);
-  if (code != 0) {
-    goto end;
-  }
-
-  code = mndDropSubByTopic(pMnode, pTrans, dropReq.name);
-  if (code < 0) {
-    mError("topic:%s, failed to drop since %s", pTopic->name, terrstr());
-    goto end;
-  }
 
   if (pTopic->ntbUid != 0) {
-    code = mndDropCheckInfoByTopic(pMnode, pTrans, pTopic);
+    MND_TMQ_RETURN_CHECK(mndDropCheckInfoByTopic(pMnode, pTrans, pTopic));
-    if (code != 0) {
-      goto end;
-    }
   }
 
   code = mndDropTopic(pMnode, pTrans, pReq, pTopic);
 
-end:
+END:
   mndReleaseTopic(pMnode, pTopic);
   mndTransDrop(pTrans);
   if (code != 0) {
@@ -834,8 +739,7 @@ end:
   }
 
   SName name = {0};
-  tNameFromString(&name, dropReq.name, T_NAME_ACCT | T_NAME_DB | T_NAME_TABLE);
+  (void)tNameFromString(&name, dropReq.name, T_NAME_ACCT | T_NAME_DB | T_NAME_TABLE);   // ignore error
-
   auditRecord(pReq, pMnode->clusterId, "dropTopic", name.dbname, name.tname, dropReq.sql, dropReq.sqlLen);
 
   tFreeSMDropTopicReq(&dropReq);
@@ -849,8 +753,7 @@ int32_t mndGetNumOfTopics(SMnode *pMnode, char *dbName, int32_t *pNumOfTopics) {
   SSdb   *pSdb = pMnode->pSdb;
   SDbObj *pDb = mndAcquireDb(pMnode, dbName);
   if (pDb == NULL) {
-    terrno = TSDB_CODE_MND_DB_NOT_SELECTED;
+    return TSDB_CODE_MND_DB_NOT_SELECTED;
-    return -1;
   }
 
   int32_t numOfTopics = 0;
@@ -876,17 +779,23 @@ int32_t mndGetNumOfTopics(SMnode *pMnode, char *dbName, int32_t *pNumOfTopics) {
 
 static void schemaToJson(SSchema *schema, int32_t nCols, char *schemaJson){
   char*   string = NULL;
+  int32_t code = 0;
   cJSON* columns = cJSON_CreateArray();
-  if (columns == NULL) {
+  MND_TMQ_NULL_CHECK(columns);
-    return;
-  }
   for (int i = 0; i < nCols; i++) {
     cJSON*   column = cJSON_CreateObject();
+    MND_TMQ_NULL_CHECK(column);
     SSchema* s = schema + i;
     cJSON*   cname = cJSON_CreateString(s->name);
-    cJSON_AddItemToObject(column, "name", cname);
+    MND_TMQ_NULL_CHECK(cname);
+    if (!cJSON_AddItemToObject(column, "name", cname)) {
+      return;
+    }
     cJSON* ctype = cJSON_CreateString(tDataTypes[s->type].name);
-    cJSON_AddItemToObject(column, "type", ctype);
+    MND_TMQ_NULL_CHECK(ctype);
+    if (!cJSON_AddItemToObject(column, "type", ctype)) {
+      return;
+    }
     int32_t length = 0;
     if (s->type == TSDB_DATA_TYPE_BINARY || s->type == TSDB_DATA_TYPE_VARBINARY ||
         s->type == TSDB_DATA_TYPE_GEOMETRY) {
@@ -897,8 +806,13 @@ static void schemaToJson(SSchema *schema, int32_t nCols, char *schemaJson){
       length = s->bytes;
     }
     cJSON*  cbytes = cJSON_CreateNumber(length);
-    cJSON_AddItemToObject(column, "length", cbytes);
+    MND_TMQ_NULL_CHECK(cbytes);
-    cJSON_AddItemToArray(columns, column);
+    if (!cJSON_AddItemToObject(column, "length", cbytes)){
+      return;
+    }
+    if (!cJSON_AddItemToArray(columns, column)){
+      return;
+    }
   }
   string = cJSON_PrintUnformatted(columns);
   cJSON_Delete(columns);
@@ -910,6 +824,9 @@ static void schemaToJson(SSchema *schema, int32_t nCols, char *schemaJson){
     mError("mndRetrieveTopic build schema error json:%p, json len:%zu", string, len);
   }
   taosMemoryFree(string);
+
+END:
+  return;
 }
 
 static int32_t mndRetrieveTopic(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rowsCapacity) {
@@ -917,13 +834,16 @@ static int32_t mndRetrieveTopic(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
   SSdb        *pSdb = pMnode->pSdb;
   int32_t      numOfRows = 0;
   SMqTopicObj *pTopic = NULL;
+  int32_t      code = 0;
+  char        *sql  = NULL;
+  char        *schemaJson  = NULL;
 
   while (numOfRows < rowsCapacity) {
     pShow->pIter = sdbFetch(pSdb, SDB_TOPIC, pShow->pIter, (void **)&pTopic);
     if (pShow->pIter == NULL) break;
 
-    SColumnInfoData *pColInfo;
+    SColumnInfoData *pColInfo= NULL;
-    SName            n;
+    SName            n = {0};
     int32_t          cols = 0;
 
     char        topicName[TSDB_TOPIC_NAME_LEN + VARSTR_HEADER_SIZE + 5] = {0};
@@ -931,28 +851,34 @@ static int32_t mndRetrieveTopic(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
     STR_TO_VARSTR(topicName, pName);
 
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-    colDataSetVal(pColInfo, numOfRows, (const char *)topicName, false);
+    MND_TMQ_NULL_CHECK(pColInfo);
+    MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)topicName, false));
 
     char dbName[TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
-    tNameFromString(&n, pTopic->db, T_NAME_ACCT | T_NAME_DB);
+    MND_TMQ_RETURN_CHECK(tNameFromString(&n, pTopic->db, T_NAME_ACCT | T_NAME_DB));
-    tNameGetDbName(&n, varDataVal(dbName));
+    MND_TMQ_RETURN_CHECK(tNameGetDbName(&n, varDataVal(dbName)));
     varDataSetLen(dbName, strlen(varDataVal(dbName)));
 
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-    colDataSetVal(pColInfo, numOfRows, (const char *)dbName, false);
+    MND_TMQ_NULL_CHECK(pColInfo);
+    MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)dbName, false));
 
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-    colDataSetVal(pColInfo, numOfRows, (const char *)&pTopic->createTime, false);
+    MND_TMQ_NULL_CHECK(pColInfo);
+    MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)&pTopic->createTime, false));
 
-    char *sql = taosMemoryMalloc(strlen(pTopic->sql) + VARSTR_HEADER_SIZE);
+    sql = taosMemoryMalloc(strlen(pTopic->sql) + VARSTR_HEADER_SIZE);
+    MND_TMQ_NULL_CHECK(sql);
     STR_TO_VARSTR(sql, pTopic->sql);
 
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-    colDataSetVal(pColInfo, numOfRows, (const char *)sql, false);
+    MND_TMQ_NULL_CHECK(pColInfo);
+    MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)sql, false));
 
-    taosMemoryFree(sql);
+    taosMemoryFreeClear(sql);
 
-    char *schemaJson = taosMemoryMalloc(TSDB_SHOW_SCHEMA_JSON_LEN + VARSTR_HEADER_SIZE);
+    schemaJson = taosMemoryMalloc(TSDB_SHOW_SCHEMA_JSON_LEN + VARSTR_HEADER_SIZE);
+    MND_TMQ_NULL_CHECK(schemaJson);
     if(pTopic->subType == TOPIC_SUB_TYPE__COLUMN){
       schemaToJson(pTopic->schema.pSchema, pTopic->schema.nCols, schemaJson);
     }else if(pTopic->subType == TOPIC_SUB_TYPE__TABLE){
@@ -969,8 +895,9 @@ static int32_t mndRetrieveTopic(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
     }
 
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-    colDataSetVal(pColInfo, numOfRows, (const char *)schemaJson, false);
+    MND_TMQ_NULL_CHECK(pColInfo);
-    taosMemoryFree(schemaJson);
+    MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)schemaJson, false));
+    taosMemoryFreeClear(schemaJson);
 
     char mete[4 + VARSTR_HEADER_SIZE] = {0};
     if(pTopic->withMeta){
@@ -980,7 +907,8 @@ static int32_t mndRetrieveTopic(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
     }
 
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-    colDataSetVal(pColInfo, numOfRows, (const char *)mete, false);
+    MND_TMQ_NULL_CHECK(pColInfo);
+    MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)mete, false));
 
     char type[8 + VARSTR_HEADER_SIZE] = {0};
     if(pTopic->subType == TOPIC_SUB_TYPE__COLUMN){
@@ -992,7 +920,8 @@ static int32_t mndRetrieveTopic(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
     }
 
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-    colDataSetVal(pColInfo, numOfRows, (const char *)type, false);
+    MND_TMQ_NULL_CHECK(pColInfo);
+    MND_TMQ_RETURN_CHECK(colDataSetVal(pColInfo, numOfRows, (const char *)type, false));
 
     numOfRows++;
     sdbRelease(pSdb, pTopic);
@@ -1000,24 +929,11 @@ static int32_t mndRetrieveTopic(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
 
   pShow->numOfRows += numOfRows;
   return numOfRows;
-}
 
-int32_t mndSetTopicCommitLogs(SMnode *pMnode, STrans *pTrans, SMqTopicObj *pTopic) {
+END:
-  SSdbRaw *pCommitRaw = mndTopicActionEncode(pTopic);
+  taosMemoryFreeClear(schemaJson);
-  if (pCommitRaw == NULL) return -1;
+  taosMemoryFreeClear(sql);
-  if (mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) return -1;
+  return code;
-  if (sdbSetRawStatus(pCommitRaw, SDB_STATUS_READY) != 0) return -1;
-
-  return 0;
-}
-
-static int32_t mndSetDropTopicCommitLogs(SMnode *pMnode, STrans *pTrans, SMqTopicObj *pTopic) {
-  SSdbRaw *pCommitRaw = mndTopicActionEncode(pTopic);
-  if (pCommitRaw == NULL) return -1;
-  if (mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) return -1;
-  if (sdbSetRawStatus(pCommitRaw, SDB_STATUS_DROPPED) != 0) return -1;
-
-  return 0;
 }
 
 static void mndCancelGetNextTopic(SMnode *pMnode, void *pIter) {
@@ -1047,33 +963,3 @@ bool mndTopicExistsForDb(SMnode *pMnode, SDbObj *pDb) {
 
   return false;
 }
-
-#if 0
-int32_t mndDropTopicByDB(SMnode *pMnode, STrans *pTrans, SDbObj *pDb) {
-  int32_t code = 0;
-  SSdb   *pSdb = pMnode->pSdb;
-
-  void        *pIter = NULL;
-  SMqTopicObj *pTopic = NULL;
-  while (1) {
-    pIter = sdbFetch(pSdb, SDB_TOPIC, pIter, (void **)&pTopic);
-    if (pIter == NULL) break;
-
-    if (pTopic->dbUid != pDb->uid) {
-      sdbRelease(pSdb, pTopic);
-      continue;
-    }
-
-    if (mndSetDropTopicCommitLogs(pMnode, pTrans, pTopic) < 0) {
-      sdbRelease(pSdb, pTopic);
-      sdbCancelFetch(pSdb, pIter);
-      code = -1;
-      break;
-    }
-
-    sdbRelease(pSdb, pTopic);
-  }
-
-  return code;
-}
-#endif

source/dnode/mnode/impl/src/mndUser.c

@@ -1357,7 +1357,7 @@ SHashObj *mndDupUseDbHash(SHashObj *pOld) {
 }
 
 int32_t mndUserDupObj(SUserObj *pUser, SUserObj *pNew) {
-  memcpy(pNew, pUser, sizeof(SUserObj));
+  (void)memcpy(pNew, pUser, sizeof(SUserObj));
   pNew->authVersion++;
   pNew->updateTime = taosGetTimestampMs();
 
@@ -1377,7 +1377,7 @@ int32_t mndUserDupObj(SUserObj *pUser, SUserObj *pNew) {
   taosRUnLockLatch(&pUser->lock);
 
   if (pNew->readDbs == NULL || pNew->writeDbs == NULL || pNew->topics == NULL) {
-    return -1;
+    return TSDB_CODE_INVALID_PARA;
   }
   return 0;
 }
@@ -1983,10 +1983,11 @@ static int32_t mndProcessAlterUserPrivilegesReq(SAlterUserReq *pAlterReq, SMnode
 
   if (ALTER_USER_ADD_SUBSCRIBE_TOPIC_PRIV(pAlterReq->alterType, pAlterReq->privileges)) {
     int32_t      len = strlen(pAlterReq->objname) + 1;
-    SMqTopicObj *pTopic = mndAcquireTopic(pMnode, pAlterReq->objname);
+    SMqTopicObj *pTopic = NULL;
-    if (pTopic == NULL) {
+    int32_t code = mndAcquireTopic(pMnode, pAlterReq->objname, &pTopic);
+    if (code != 0) {
       mndReleaseTopic(pMnode, pTopic);
-      return -1;
+      return code;
     }
     taosHashPut(pNewUser->topics, pTopic->name, len, pTopic->name, TSDB_TOPIC_FNAME_LEN);
     mndReleaseTopic(pMnode, pTopic);
@@ -1994,10 +1995,11 @@ static int32_t mndProcessAlterUserPrivilegesReq(SAlterUserReq *pAlterReq, SMnode
 
   if (ALTER_USER_DEL_SUBSCRIBE_TOPIC_PRIV(pAlterReq->alterType, pAlterReq->privileges)) {
     int32_t      len = strlen(pAlterReq->objname) + 1;
-    SMqTopicObj *pTopic = mndAcquireTopic(pMnode, pAlterReq->objname);
+    SMqTopicObj *pTopic = NULL;
-    if (pTopic == NULL) {
+    int32_t code = mndAcquireTopic(pMnode, pAlterReq->objname, &pTopic);
+    if (code != 0) {
       mndReleaseTopic(pMnode, pTopic);
-      return -1;
+      return code;
     }
     taosHashRemove(pNewUser->topics, pAlterReq->objname, len);
     mndReleaseTopic(pMnode, pTopic);

source/dnode/mnode/impl/src/mndVgroup.c

@@ -2725,15 +2725,6 @@ int32_t mndSplitVgroup(SMnode *pMnode, SRpcMsg *pReq, SDbObj *pDb, SVgObj *pVgro
   SDbObj  dbObj = {0};
   SArray *pArray = mndBuildDnodesArray(pMnode, 0);
 
-  //  int32_t numOfTopics = 0;
-  //  if (mndGetNumOfTopics(pMnode, pDb->name, &numOfTopics) != 0) {
-  //    goto _OVER;
-  //  }
-  //  if (numOfTopics > 0) {
-  //    terrno = TSDB_CODE_MND_TOPIC_MUST_BE_DELETED;
-  //    goto _OVER;
-  //  }
-
   int32_t numOfStreams = 0;
   if (mndGetNumOfStreams(pMnode, pDb->name, &numOfStreams) != 0) {
     goto _OVER;

source/dnode/qnode/src/qnode.c

@@ -19,21 +19,22 @@
 #include "query.h"
 #include "qworker.h"
 
-SQnode *qndOpen(const SQnodeOpt *pOption) {
+int32_t qndOpen(const SQnodeOpt *pOption, SQnode **pQnode) {
-  SQnode *pQnode = taosMemoryCalloc(1, sizeof(SQnode));
+  *pQnode = taosMemoryCalloc(1, sizeof(SQnode));
-  if (NULL == pQnode) {
+  if (NULL == *pQnode) {
     qError("calloc SQnode failed");
-    return NULL;
+    return TSDB_CODE_OUT_OF_MEMORY;
   }
-  pQnode->qndId = QNODE_HANDLE;
+  (*pQnode)->qndId = QNODE_HANDLE;
 
-  if (qWorkerInit(NODE_TYPE_QNODE, pQnode->qndId, (void **)&pQnode->pQuery, &pOption->msgCb)) {
+  int32_t code = qWorkerInit(NODE_TYPE_QNODE, (*pQnode)->qndId, (void **)&(*pQnode)->pQuery, &pOption->msgCb);
+  if (TSDB_CODE_SUCCESS != code) {
     taosMemoryFreeClear(pQnode);
-    return NULL;
+    return code;
   }
 
-  pQnode->msgCb = pOption->msgCb;
+  (*pQnode)->msgCb = pOption->msgCb;
-  return pQnode;
+  return TSDB_CODE_SUCCESS;
 }
 
 void qndClose(SQnode *pQnode) {

source/dnode/vnode/CMakeLists.txt

@@ -22,7 +22,6 @@ set(
 
     # meta
     "src/meta/metaOpen.c"
-    "src/meta/metaIdx.c"
     "src/meta/metaTable.c"
     "src/meta/metaSma.c"
     "src/meta/metaQuery.c"

source/dnode/vnode/src/inc/tsdb.h

@@ -226,7 +226,7 @@ void    tMapDataGetItemByIdx(SMapData *pMapData, int32_t idx, void *pItem, int32
 int32_t tMapDataSearch(SMapData *pMapData, void *pSearchItem, int32_t (*tGetItemFn)(uint8_t *, void *),
                        int32_t (*tItemCmprFn)(const void *, const void *), void *pItem);
 int32_t tPutMapData(uint8_t *p, SMapData *pMapData);
-int32_t tGetMapData(uint8_t *p, SMapData *pMapData);
+int32_t tGetMapData(uint8_t *p, SMapData *pMapData, int32_t *decodedSize);
 int32_t tMapDataToArray(SMapData *pMapData, int32_t itemSize, int32_t (*tGetItemFn)(uint8_t *, void *),
                         SArray **ppArray);
 // other
@@ -706,7 +706,6 @@ typedef TARRAY2(STsdbFSetPartition *) STsdbFSetPartList;
 
 STsdbFSetPartList *tsdbFSetPartListCreate();
 void               tsdbFSetPartListDestroy(STsdbFSetPartList **ppList);
-int32_t            tSerializeTsdbFSetPartList(void *buf, int32_t bufLen, STsdbFSetPartList *pList);
 int32_t            tDeserializeTsdbFSetPartList(void *buf, int32_t bufLen, STsdbFSetPartList *pList);
 int32_t            tsdbFSetPartListToRangeDiff(STsdbFSetPartList *pList, TFileSetRangeArray **ppRanges);
 

source/dnode/vnode/src/inc/vnodeInt.h

@@ -318,7 +318,7 @@ void*   tdUidStoreFree(STbUidStore* pStore);
 
 // SMetaSnapReader ========================================
 int32_t metaSnapReaderOpen(SMeta* pMeta, int64_t sver, int64_t ever, SMetaSnapReader** ppReader);
-int32_t metaSnapReaderClose(SMetaSnapReader** ppReader);
+void    metaSnapReaderClose(SMetaSnapReader** ppReader);
 int32_t metaSnapRead(SMetaSnapReader* pReader, uint8_t** ppData);
 // SMetaSnapWriter ========================================
 int32_t metaSnapWriterOpen(SMeta* pMeta, int64_t sver, int64_t ever, SMetaSnapWriter** ppWriter);

source/dnode/vnode/src/meta/metaCache.c

@@ -118,90 +118,80 @@ static void freeCacheEntryFp(void* param) {
 
 int32_t metaCacheOpen(SMeta* pMeta) {
   int32_t code = 0;
-  SMetaCache* pCache = NULL;
+  int32_t lino;
 
-  pCache = (SMetaCache*)taosMemoryMalloc(sizeof(SMetaCache));
+  pMeta->pCache = (SMetaCache*)taosMemoryCalloc(1, sizeof(SMetaCache));
-  if (pCache == NULL) {
+  if (pMeta->pCache == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    TSDB_CHECK_CODE(code = TSDB_CODE_OUT_OF_MEMORY, lino, _exit);
-    goto _err;
   }
 
   // open entry cache
-  pCache->sEntryCache.nEntry = 0;
+  pMeta->pCache->sEntryCache.nEntry = 0;
-  pCache->sEntryCache.nBucket = META_CACHE_BASE_BUCKET;
+  pMeta->pCache->sEntryCache.nBucket = META_CACHE_BASE_BUCKET;
-  pCache->sEntryCache.aBucket =
+  pMeta->pCache->sEntryCache.aBucket =
-      (SMetaCacheEntry**)taosMemoryCalloc(pCache->sEntryCache.nBucket, sizeof(SMetaCacheEntry*));
+      (SMetaCacheEntry**)taosMemoryCalloc(pMeta->pCache->sEntryCache.nBucket, sizeof(SMetaCacheEntry*));
-  if (pCache->sEntryCache.aBucket == NULL) {
+  if (pMeta->pCache->sEntryCache.aBucket == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    TSDB_CHECK_CODE(code = TSDB_CODE_OUT_OF_MEMORY, lino, _exit);
-    goto _err;
   }
 
   // open stats cache
-  pCache->sStbStatsCache.nEntry = 0;
+  pMeta->pCache->sStbStatsCache.nEntry = 0;
-  pCache->sStbStatsCache.nBucket = META_CACHE_STATS_BUCKET;
+  pMeta->pCache->sStbStatsCache.nBucket = META_CACHE_STATS_BUCKET;
-  pCache->sStbStatsCache.aBucket =
+  pMeta->pCache->sStbStatsCache.aBucket =
-      (SMetaStbStatsEntry**)taosMemoryCalloc(pCache->sStbStatsCache.nBucket, sizeof(SMetaStbStatsEntry*));
+      (SMetaStbStatsEntry**)taosMemoryCalloc(pMeta->pCache->sStbStatsCache.nBucket, sizeof(SMetaStbStatsEntry*));
-  if (pCache->sStbStatsCache.aBucket == NULL) {
+  if (pMeta->pCache->sStbStatsCache.aBucket == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    TSDB_CHECK_CODE(code = TSDB_CODE_OUT_OF_MEMORY, lino, _exit);
-    goto _err2;
   }
 
-  pCache->sTagFilterResCache.pUidResCache = taosLRUCacheInit(5 * 1024 * 1024, -1, 0.5);
+  pMeta->pCache->sTagFilterResCache.pUidResCache = taosLRUCacheInit(5 * 1024 * 1024, -1, 0.5);
-  if (pCache->sTagFilterResCache.pUidResCache == NULL) {
+  if (pMeta->pCache->sTagFilterResCache.pUidResCache == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    TSDB_CHECK_CODE(code = terrno, lino, _exit);
-    goto _err2;
   }
 
-  pCache->sTagFilterResCache.accTimes = 0;
+  pMeta->pCache->sTagFilterResCache.accTimes = 0;
-  pCache->sTagFilterResCache.pTableEntry =
+  pMeta->pCache->sTagFilterResCache.pTableEntry =
       taosHashInit(1024, taosGetDefaultHashFunction(TSDB_DATA_TYPE_VARCHAR), false, HASH_NO_LOCK);
-  if (pCache->sTagFilterResCache.pTableEntry == NULL) {
+  if (pMeta->pCache->sTagFilterResCache.pTableEntry == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    TSDB_CHECK_CODE(code = terrno, lino, _exit);
-    goto _err2;
   }
 
-  taosHashSetFreeFp(pCache->sTagFilterResCache.pTableEntry, freeCacheEntryFp);
+  taosHashSetFreeFp(pMeta->pCache->sTagFilterResCache.pTableEntry, freeCacheEntryFp);
-  taosThreadMutexInit(&pCache->sTagFilterResCache.lock, NULL);
+  taosThreadMutexInit(&pMeta->pCache->sTagFilterResCache.lock, NULL);
 
-  pCache->STbGroupResCache.pResCache = taosLRUCacheInit(5 * 1024 * 1024, -1, 0.5);
+  pMeta->pCache->STbGroupResCache.pResCache = taosLRUCacheInit(5 * 1024 * 1024, -1, 0.5);
-  if (pCache->STbGroupResCache.pResCache == NULL) {
+  if (pMeta->pCache->STbGroupResCache.pResCache == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    TSDB_CHECK_CODE(code = terrno, lino, _exit);
-    goto _err2;
   }
 
-  pCache->STbGroupResCache.accTimes = 0;
+  pMeta->pCache->STbGroupResCache.accTimes = 0;
-  pCache->STbGroupResCache.pTableEntry =
+  pMeta->pCache->STbGroupResCache.pTableEntry =
       taosHashInit(1024, taosGetDefaultHashFunction(TSDB_DATA_TYPE_VARCHAR), false, HASH_NO_LOCK);
-  if (pCache->STbGroupResCache.pTableEntry == NULL) {
+  if (pMeta->pCache->STbGroupResCache.pTableEntry == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    TSDB_CHECK_CODE(code = terrno, lino, _exit);
-    goto _err2;
   }
 
-  taosHashSetFreeFp(pCache->STbGroupResCache.pTableEntry, freeCacheEntryFp);
+  taosHashSetFreeFp(pMeta->pCache->STbGroupResCache.pTableEntry, freeCacheEntryFp);
-  taosThreadMutexInit(&pCache->STbGroupResCache.lock, NULL);
+  taosThreadMutexInit(&pMeta->pCache->STbGroupResCache.lock, NULL);
 
-  pCache->STbFilterCache.pStb = taosHashInit(0, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
+  pMeta->pCache->STbFilterCache.pStb =
-  if (pCache->STbFilterCache.pStb == NULL) {
+      taosHashInit(0, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
-    code = TSDB_CODE_OUT_OF_MEMORY;
+  if (pMeta->pCache->STbFilterCache.pStb == NULL) {
-    goto _err2;
+    TSDB_CHECK_CODE(code = terrno, lino, _exit);
   }
 
-  pCache->STbFilterCache.pStbName =
+  pMeta->pCache->STbFilterCache.pStbName =
       taosHashInit(0, taosGetDefaultHashFunction(TSDB_DATA_TYPE_VARCHAR), false, HASH_NO_LOCK);
-  if (pCache->STbFilterCache.pStbName == NULL) {
+  if (pMeta->pCache->STbFilterCache.pStbName == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    TSDB_CHECK_CODE(code = terrno, lino, _exit);
-    goto _err2;
   }
 
-  pMeta->pCache = pCache;
+_exit:
-  return code;
+  if (code) {
-
+    metaError("vgId:%d, %s failed at %s:%d since %s", TD_VID(pMeta->pVnode), __func__, __FILE__, lino, tstrerror(code));
-_err2:
+    metaCacheClose(pMeta);
-  entryCacheClose(pMeta);
+  } else {
-
+    metaDebug("vgId:%d, %s success", TD_VID(pMeta->pVnode), __func__);
-_err:
+  }
-  taosMemoryFree(pCache);
-  metaError("vgId:%d, meta open cache failed since %s", TD_VID(pMeta->pVnode), tstrerror(code));
   return code;
 }
 
@@ -289,8 +279,7 @@ int32_t metaCacheUpsert(SMeta* pMeta, SMetaInfo* pInfo) {
     }
   } else {  // insert
     if (pCache->sEntryCache.nEntry >= pCache->sEntryCache.nBucket) {
-      code = metaRehashCache(pCache, 1);
+      TAOS_UNUSED(metaRehashCache(pCache, 1));
-      if (code) goto _exit;
 
       iBucket = TABS(pInfo->uid) % pCache->sEntryCache.nBucket;
     }
@@ -328,8 +317,7 @@ int32_t metaCacheDrop(SMeta* pMeta, int64_t uid) {
     pCache->sEntryCache.nEntry--;
     if (pCache->sEntryCache.nEntry < pCache->sEntryCache.nBucket / 4 &&
         pCache->sEntryCache.nBucket > META_CACHE_BASE_BUCKET) {
-      code = metaRehashCache(pCache, 0);
+      TAOS_UNUSED(metaRehashCache(pCache, 0));
-      if (code) goto _exit;
     }
   } else {
     code = TSDB_CODE_NOT_FOUND;
@@ -351,7 +339,9 @@ int32_t metaCacheGet(SMeta* pMeta, int64_t uid, SMetaInfo* pInfo) {
   }
 
   if (pEntry) {
+    if (pInfo) {
       *pInfo = pEntry->info;
+    }
   } else {
     code = TSDB_CODE_NOT_FOUND;
   }
@@ -415,9 +405,7 @@ int32_t metaStatsCacheUpsert(SMeta* pMeta, SMetaStbStats* pInfo) {
     (*ppEntry)->info.ctbNum = pInfo->ctbNum;
   } else {  // insert
     if (pCache->sStbStatsCache.nEntry >= pCache->sStbStatsCache.nBucket) {
-      code = metaRehashStatsCache(pCache, 1);
+      TAOS_UNUSED(metaRehashStatsCache(pCache, 1));
-      if (code) goto _exit;
-
       iBucket = TABS(pInfo->uid) % pCache->sStbStatsCache.nBucket;
     }
 
@@ -454,8 +442,7 @@ int32_t metaStatsCacheDrop(SMeta* pMeta, int64_t uid) {
     pCache->sStbStatsCache.nEntry--;
     if (pCache->sStbStatsCache.nEntry < pCache->sStbStatsCache.nBucket / 4 &&
         pCache->sStbStatsCache.nBucket > META_CACHE_STATS_BUCKET) {
-      code = metaRehashStatsCache(pCache, 0);
+      TAOS_UNUSED(metaRehashStatsCache(pCache, 0));
-      if (code) goto _exit;
     }
   } else {
     code = TSDB_CODE_NOT_FOUND;
@@ -477,7 +464,9 @@ int32_t metaStatsCacheGet(SMeta* pMeta, int64_t uid, SMetaStbStats* pInfo) {
   }
 
   if (pEntry) {
+    if (pInfo) {
       *pInfo = pEntry->info;
+    }
   } else {
     code = TSDB_CODE_NOT_FOUND;
   }
@@ -502,7 +491,9 @@ static int checkAllEntriesInCache(const STagFilterResEntry* pEntry, SArray* pInv
     // check whether it is existed in LRU cache, and remove it from linked list if not.
     LRUHandle* pRes = taosLRUCacheLookup(pCache, buf, len);
     if (pRes == NULL) {  // remove the item in the linked list
-      taosArrayPush(pInvalidRes, &pNode);
+      if (taosArrayPush(pInvalidRes, &pNode) == NULL) {
+        return TSDB_CODE_OUT_OF_MEMORY;
+      }
     } else {
       taosLRUCacheRelease(pCache, pRes, false);
     }
@@ -626,7 +617,7 @@ static int32_t addNewEntry(SHashObj* pTableEntry, const void* pKey, int32_t keyL
 
   p->hitTimes = 0;
   tdListInit(&p->list, keyLen);
-  taosHashPut(pTableEntry, &suid, sizeof(uint64_t), &p, POINTER_BYTES);
+  TAOS_CHECK_RETURN(taosHashPut(pTableEntry, &suid, sizeof(uint64_t), &p, POINTER_BYTES));
   tdListAppend(&p->list, pKey);
   return 0;
 }
@@ -956,9 +947,7 @@ int32_t metaInitTbFilterCache(SMeta* pMeta) {
   }
   if (tbNum && pTbArr) {
     for (int32_t i = 0; i < tbNum; ++i) {
-      if (metaPutTbToFilterCache(pMeta, pTbArr[i], 1) != 0) {
+      TAOS_CHECK_RETURN(metaPutTbToFilterCache(pMeta, pTbArr[i], 1));
-        return terrno ? terrno : -1;
-      }
     }
   }
 #else

source/dnode/vnode/src/meta/metaCommit.c

@@ -21,7 +21,10 @@ static FORCE_INLINE void *metaMalloc(void *pPool, size_t size) {
 static FORCE_INLINE void metaFree(void *pPool, void *p) { vnodeBufPoolFree((SVBufPool *)pPool, p); }
 
 // begin a meta txn
-int metaBegin(SMeta *pMeta, int8_t heap) {
+int32_t metaBegin(SMeta *pMeta, int8_t heap) {
+  int32_t code = 0;
+  int32_t lino;
+
   void *(*xMalloc)(void *, size_t) = NULL;
   void (*xFree)(void *, void *) = NULL;
   void *xArg = NULL;
@@ -36,12 +39,19 @@ int metaBegin(SMeta *pMeta, int8_t heap) {
     xArg = pMeta->pVnode->inUse;
   }
 
-  if (tdbBegin(pMeta->pEnv, &pMeta->txn, xMalloc, xFree, xArg, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED) < 0) {
+  code = tdbBegin(pMeta->pEnv, &pMeta->txn, xMalloc, xFree, xArg, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED);
-    return -1;
+  TSDB_CHECK_CODE(code, lino, _exit);
+
+  code = tdbCommit(pMeta->pEnv, pMeta->txn);
+  TSDB_CHECK_CODE(code, lino, _exit);
+
+_exit:
+  if (code) {
+    metaError("vgId:%d %s failed at %s:%d since %s", TD_VID(pMeta->pVnode), __func__, __FILE__, __LINE__,
+              tstrerror(terrno));
+  } else {
+    metaDebug("vgId:%d %s success", TD_VID(pMeta->pVnode), __func__);
   }
-
-  tdbCommit(pMeta->pEnv, pMeta->txn);
-
   return 0;
 }
 
@@ -49,20 +59,36 @@ int metaBegin(SMeta *pMeta, int8_t heap) {
 TXN *metaGetTxn(SMeta *pMeta) { return pMeta->txn; }
 int  metaCommit(SMeta *pMeta, TXN *txn) { return tdbCommit(pMeta->pEnv, txn); }
 int  metaFinishCommit(SMeta *pMeta, TXN *txn) { return tdbPostCommit(pMeta->pEnv, txn); }
+
 int metaPrepareAsyncCommit(SMeta *pMeta) {
   // return tdbPrepareAsyncCommit(pMeta->pEnv, pMeta->txn);
   int     code = 0;
+  int32_t lino;
+
   metaWLock(pMeta);
-  code = ttlMgrFlush(pMeta->pTtlMgr, pMeta->txn);
+  TAOS_UNUSED(ttlMgrFlush(pMeta->pTtlMgr, pMeta->txn));
   metaULock(pMeta);
+
   code = tdbCommit(pMeta->pEnv, pMeta->txn);
+  TSDB_CHECK_CODE(code, lino, _exit);
   pMeta->changed = false;
+
+_exit:
+  if (code) {
+    metaError("vgId:%d %s failed at %s:%d since %s", TD_VID(pMeta->pVnode), __func__, __FILE__, __LINE__,
+              tstrerror(terrno));
+  } else {
+    metaDebug("vgId:%d %s success", TD_VID(pMeta->pVnode), __func__);
+  }
   return code;
 }
 
 // abort the meta txn
 int metaAbort(SMeta *pMeta) {
-  if (!pMeta->txn) return 0;
+  if (!pMeta->txn) {
+    return 0;
+  }
+
   int code = tdbAbort(pMeta->pEnv, pMeta->txn);
   if (code) {
     metaError("vgId:%d, failed to abort meta since %s", TD_VID(pMeta->pVnode), tstrerror(terrno));

source/dnode/vnode/src/meta/metaEntry.c

@@ -17,159 +17,166 @@
 
 int meteEncodeColCmprEntry(SEncoder *pCoder, const SMetaEntry *pME) {
   const SColCmprWrapper *pw = &pME->colCmpr;
-  if (tEncodeI32v(pCoder, pw->nCols) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI32v(pCoder, pw->nCols));
-  if (tEncodeI32v(pCoder, pw->version) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI32v(pCoder, pw->version));
   uDebug("encode cols:%d", pw->nCols);
 
   for (int32_t i = 0; i < pw->nCols; i++) {
     SColCmpr *p = &pw->pColCmpr[i];
-    if (tEncodeI16v(pCoder, p->id) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeI16v(pCoder, p->id));
-    if (tEncodeU32(pCoder, p->alg) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeU32(pCoder, p->alg));
   }
   return 0;
 }
 int meteDecodeColCmprEntry(SDecoder *pDecoder, SMetaEntry *pME) {
   SColCmprWrapper *pWrapper = &pME->colCmpr;
-  if (tDecodeI32v(pDecoder, &pWrapper->nCols) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI32v(pDecoder, &pWrapper->nCols));
   if (pWrapper->nCols == 0) {
     return 0;
   }
 
-  if (tDecodeI32v(pDecoder, &pWrapper->version) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI32v(pDecoder, &pWrapper->version));
   uDebug("dencode cols:%d", pWrapper->nCols);
   pWrapper->pColCmpr = (SColCmpr *)tDecoderMalloc(pDecoder, pWrapper->nCols * sizeof(SColCmpr));
-  if (pWrapper->pColCmpr == NULL) return -1;
+  if (pWrapper->pColCmpr == NULL) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
 
   for (int i = 0; i < pWrapper->nCols; i++) {
     SColCmpr *p = &pWrapper->pColCmpr[i];
-    if (tDecodeI16v(pDecoder, &p->id) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeI16v(pDecoder, &p->id));
-    if (tDecodeU32(pDecoder, &p->alg) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeU32(pDecoder, &p->alg));
   }
   return 0;
 }
-static FORCE_INLINE void metatInitDefaultSColCmprWrapper(SDecoder *pDecoder, SColCmprWrapper *pCmpr,
+static FORCE_INLINE int32_t metatInitDefaultSColCmprWrapper(SDecoder *pDecoder, SColCmprWrapper *pCmpr,
                                                             SSchemaWrapper *pSchema) {
   pCmpr->nCols = pSchema->nCols;
-  pCmpr->pColCmpr = (SColCmpr *)tDecoderMalloc(pDecoder, pCmpr->nCols * sizeof(SColCmpr));
+  if ((pCmpr->pColCmpr = (SColCmpr *)tDecoderMalloc(pDecoder, pCmpr->nCols * sizeof(SColCmpr))) == NULL) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
+
   for (int32_t i = 0; i < pCmpr->nCols; i++) {
     SColCmpr *pColCmpr = &pCmpr->pColCmpr[i];
     SSchema  *pColSchema = &pSchema->pSchema[i];
     pColCmpr->id = pColSchema->colId;
     pColCmpr->alg = createDefaultColCmprByType(pColSchema->type);
   }
+  return 0;
 }
 
 int metaEncodeEntry(SEncoder *pCoder, const SMetaEntry *pME) {
-  if (tStartEncode(pCoder) < 0) return -1;
+  TAOS_CHECK_RETURN(tStartEncode(pCoder));
+  TAOS_CHECK_RETURN(tEncodeI64(pCoder, pME->version));
+  TAOS_CHECK_RETURN(tEncodeI8(pCoder, pME->type));
+  TAOS_CHECK_RETURN(tEncodeI64(pCoder, pME->uid));
 
-  if (tEncodeI64(pCoder, pME->version) < 0) return -1;
+  if (pME->name == NULL) {
-  if (tEncodeI8(pCoder, pME->type) < 0) return -1;
+    return TSDB_CODE_INVALID_PARA;
-  if (tEncodeI64(pCoder, pME->uid) < 0) return -1;
+  }
-  if (pME->name == NULL || tEncodeCStr(pCoder, pME->name) < 0) return -1;
+
+  TAOS_CHECK_RETURN(tEncodeCStr(pCoder, pME->name));
 
   if (pME->type == TSDB_SUPER_TABLE) {
-    if (tEncodeI8(pCoder, pME->flags) < 0) return -1;  // TODO: need refactor?
+    TAOS_CHECK_RETURN(tEncodeI8(pCoder, pME->flags));
-    if (tEncodeSSchemaWrapper(pCoder, &pME->stbEntry.schemaRow) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeSSchemaWrapper(pCoder, &pME->stbEntry.schemaRow));
-    if (tEncodeSSchemaWrapper(pCoder, &pME->stbEntry.schemaTag) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeSSchemaWrapper(pCoder, &pME->stbEntry.schemaTag));
     if (TABLE_IS_ROLLUP(pME->flags)) {
-      if (tEncodeSRSmaParam(pCoder, &pME->stbEntry.rsmaParam) < 0) return -1;
+      TAOS_CHECK_RETURN(tEncodeSRSmaParam(pCoder, &pME->stbEntry.rsmaParam));
     }
   } else if (pME->type == TSDB_CHILD_TABLE) {
-    if (tEncodeI64(pCoder, pME->ctbEntry.btime) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeI64(pCoder, pME->ctbEntry.btime));
-    if (tEncodeI32(pCoder, pME->ctbEntry.ttlDays) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeI32(pCoder, pME->ctbEntry.ttlDays));
-    if (tEncodeI32v(pCoder, pME->ctbEntry.commentLen) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeI32v(pCoder, pME->ctbEntry.commentLen));
     if (pME->ctbEntry.commentLen > 0) {
-      if (tEncodeCStr(pCoder, pME->ctbEntry.comment) < 0) return -1;
+      TAOS_CHECK_RETURN(tEncodeCStr(pCoder, pME->ctbEntry.comment));
     }
-    if (tEncodeI64(pCoder, pME->ctbEntry.suid) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeI64(pCoder, pME->ctbEntry.suid));
-    if (tEncodeTag(pCoder, (const STag *)pME->ctbEntry.pTags) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeTag(pCoder, (const STag *)pME->ctbEntry.pTags));
   } else if (pME->type == TSDB_NORMAL_TABLE) {
-    if (tEncodeI64(pCoder, pME->ntbEntry.btime) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeI64(pCoder, pME->ntbEntry.btime));
-    if (tEncodeI32(pCoder, pME->ntbEntry.ttlDays) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeI32(pCoder, pME->ntbEntry.ttlDays));
-    if (tEncodeI32v(pCoder, pME->ntbEntry.commentLen) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeI32v(pCoder, pME->ntbEntry.commentLen));
     if (pME->ntbEntry.commentLen > 0) {
-      if (tEncodeCStr(pCoder, pME->ntbEntry.comment) < 0) return -1;
+      TAOS_CHECK_RETURN(tEncodeCStr(pCoder, pME->ntbEntry.comment));
     }
-    if (tEncodeI32v(pCoder, pME->ntbEntry.ncid) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeI32v(pCoder, pME->ntbEntry.ncid));
-    if (tEncodeSSchemaWrapper(pCoder, &pME->ntbEntry.schemaRow) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeSSchemaWrapper(pCoder, &pME->ntbEntry.schemaRow));
   } else if (pME->type == TSDB_TSMA_TABLE) {
-    if (tEncodeTSma(pCoder, pME->smaEntry.tsma) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeTSma(pCoder, pME->smaEntry.tsma));
   } else {
     metaError("meta/entry: invalide table type: %" PRId8 " encode failed.", pME->type);
-
+    return TSDB_CODE_INVALID_PARA;
-    return -1;
   }
-  if (meteEncodeColCmprEntry(pCoder, pME) < 0) return -1;
+  TAOS_CHECK_RETURN(meteEncodeColCmprEntry(pCoder, pME));
 
   tEndEncode(pCoder);
   return 0;
 }
 
 int metaDecodeEntry(SDecoder *pCoder, SMetaEntry *pME) {
-  if (tStartDecode(pCoder) < 0) return -1;
+  TAOS_CHECK_RETURN(tStartDecode(pCoder));
-
+  TAOS_CHECK_RETURN(tDecodeI64(pCoder, &pME->version));
-  if (tDecodeI64(pCoder, &pME->version) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI8(pCoder, &pME->type));
-  if (tDecodeI8(pCoder, &pME->type) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI64(pCoder, &pME->uid));
-  if (tDecodeI64(pCoder, &pME->uid) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeCStr(pCoder, &pME->name));
-  if (tDecodeCStr(pCoder, &pME->name) < 0) return -1;
 
   if (pME->type == TSDB_SUPER_TABLE) {
-    if (tDecodeI8(pCoder, &pME->flags) < 0) return -1;  // TODO: need refactor?
+    TAOS_CHECK_RETURN(tDecodeI8(pCoder, &pME->flags));
-    if (tDecodeSSchemaWrapperEx(pCoder, &pME->stbEntry.schemaRow) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeSSchemaWrapperEx(pCoder, &pME->stbEntry.schemaRow));
-    if (tDecodeSSchemaWrapperEx(pCoder, &pME->stbEntry.schemaTag) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeSSchemaWrapperEx(pCoder, &pME->stbEntry.schemaTag));
     if (TABLE_IS_ROLLUP(pME->flags)) {
-      if (tDecodeSRSmaParam(pCoder, &pME->stbEntry.rsmaParam) < 0) return -1;
+      TAOS_CHECK_RETURN(tDecodeSRSmaParam(pCoder, &pME->stbEntry.rsmaParam));
     }
   } else if (pME->type == TSDB_CHILD_TABLE) {
-    if (tDecodeI64(pCoder, &pME->ctbEntry.btime) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeI64(pCoder, &pME->ctbEntry.btime));
-    if (tDecodeI32(pCoder, &pME->ctbEntry.ttlDays) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeI32(pCoder, &pME->ctbEntry.ttlDays));
-    if (tDecodeI32v(pCoder, &pME->ctbEntry.commentLen) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeI32v(pCoder, &pME->ctbEntry.commentLen));
     if (pME->ctbEntry.commentLen > 0) {
-      if (tDecodeCStr(pCoder, &pME->ctbEntry.comment) < 0) return -1;
+      TAOS_CHECK_RETURN(tDecodeCStr(pCoder, &pME->ctbEntry.comment));
     }
-    if (tDecodeI64(pCoder, &pME->ctbEntry.suid) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeI64(pCoder, &pME->ctbEntry.suid));
-    if (tDecodeTag(pCoder, (STag **)&pME->ctbEntry.pTags) < 0) return -1;  // (TODO)
+    TAOS_CHECK_RETURN(tDecodeTag(pCoder, (STag **)&pME->ctbEntry.pTags));
   } else if (pME->type == TSDB_NORMAL_TABLE) {
-    if (tDecodeI64(pCoder, &pME->ntbEntry.btime) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeI64(pCoder, &pME->ntbEntry.btime));
-    if (tDecodeI32(pCoder, &pME->ntbEntry.ttlDays) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeI32(pCoder, &pME->ntbEntry.ttlDays));
-    if (tDecodeI32v(pCoder, &pME->ntbEntry.commentLen) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeI32v(pCoder, &pME->ntbEntry.commentLen));
     if (pME->ntbEntry.commentLen > 0) {
-      if (tDecodeCStr(pCoder, &pME->ntbEntry.comment) < 0) return -1;
+      TAOS_CHECK_RETURN(tDecodeCStr(pCoder, &pME->ntbEntry.comment));
     }
-    if (tDecodeI32v(pCoder, &pME->ntbEntry.ncid) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeI32v(pCoder, &pME->ntbEntry.ncid));
-    if (tDecodeSSchemaWrapperEx(pCoder, &pME->ntbEntry.schemaRow) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeSSchemaWrapperEx(pCoder, &pME->ntbEntry.schemaRow));
   } else if (pME->type == TSDB_TSMA_TABLE) {
     pME->smaEntry.tsma = tDecoderMalloc(pCoder, sizeof(STSma));
     if (!pME->smaEntry.tsma) {
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      return TSDB_CODE_OUT_OF_MEMORY;
-      return -1;
     }
-    if (tDecodeTSma(pCoder, pME->smaEntry.tsma, true) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeTSma(pCoder, pME->smaEntry.tsma, true));
   } else {
     metaError("meta/entry: invalide table type: %" PRId8 " decode failed.", pME->type);
-    return -1;
+    return TSDB_CODE_INVALID_PARA;
   }
   if (pME->type == TSDB_SUPER_TABLE) {
     if (TABLE_IS_COL_COMPRESSED(pME->flags)) {
-      if (meteDecodeColCmprEntry(pCoder, pME) < 0) return -1;
+      TAOS_CHECK_RETURN(meteDecodeColCmprEntry(pCoder, pME));
 
       if (pME->colCmpr.nCols == 0) {
-        metatInitDefaultSColCmprWrapper(pCoder, &pME->colCmpr, &pME->stbEntry.schemaRow);
+        TAOS_CHECK_RETURN(metatInitDefaultSColCmprWrapper(pCoder, &pME->colCmpr, &pME->stbEntry.schemaRow));
       }
     } else {
-      metatInitDefaultSColCmprWrapper(pCoder, &pME->colCmpr, &pME->stbEntry.schemaRow);
+      TAOS_CHECK_RETURN(metatInitDefaultSColCmprWrapper(pCoder, &pME->colCmpr, &pME->stbEntry.schemaRow));
       TABLE_SET_COL_COMPRESSED(pME->flags);
     }
   } else if (pME->type == TSDB_NORMAL_TABLE) {
     if (!tDecodeIsEnd(pCoder)) {
       uDebug("set type: %d, tableName:%s", pME->type, pME->name);
-      if (meteDecodeColCmprEntry(pCoder, pME) < 0) return -1;
+      TAOS_CHECK_RETURN(meteDecodeColCmprEntry(pCoder, pME));
       if (pME->colCmpr.nCols == 0) {
-        metatInitDefaultSColCmprWrapper(pCoder, &pME->colCmpr, &pME->ntbEntry.schemaRow);
+        TAOS_CHECK_RETURN(metatInitDefaultSColCmprWrapper(pCoder, &pME->colCmpr, &pME->ntbEntry.schemaRow));
       }
     } else {
       uDebug("set default type: %d, tableName:%s", pME->type, pME->name);
-      metatInitDefaultSColCmprWrapper(pCoder, &pME->colCmpr, &pME->ntbEntry.schemaRow);
+      TAOS_CHECK_RETURN(metatInitDefaultSColCmprWrapper(pCoder, &pME->colCmpr, &pME->ntbEntry.schemaRow));
     }
     TABLE_SET_COL_COMPRESSED(pME->flags);
   }

source/dnode/vnode/src/meta/metaIdx.c

@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef USE_INVERTED_INDEX
-#include "index.h"
-#endif
-#include "meta.h"
-
-struct SMetaIdx {
-#ifdef USE_INVERTED_INDEX
-  SIndex *pIdx;
-#endif
-  /* data */
-#ifdef WINDOWS
-  size_t avoidCompilationErrors;
-#endif
-};
-
-int metaOpenIdx(SMeta *pMeta) {
-#if 0
-  char               idxDir[128];  // TODO
-  char *             err = NULL;
-  rocksdb_options_t *options = rocksdb_options_create();
-
-  // TODO
-  sprintf(idxDir, "%s/index", pMeta->path);
-
-  if (pMeta->pCache) {
-    rocksdb_options_set_row_cache(options, pMeta->pCache);
-  }
-  rocksdb_options_set_create_if_missing(options, 1);
-
-  pMeta->pIdx = rocksdb_open(options, idxDir, &err);
-  if (pMeta->pIdx == NULL) {
-    // TODO: handle error
-    rocksdb_options_destroy(options);
-    return -1;
-  }
-
-  rocksdb_options_destroy(options);
-#endif
-
-#ifdef USE_INVERTED_INDEX
-  // SIndexOpts opts;
-  // if (indexOpen(&opts, pMeta->path, &pMeta->pIdx->pIdx) != 0) {
-  //  return -1;
-  //}
-
-#endif
-  return 0;
-}
-
-#ifdef BUILD_NO_CALL
-void metaCloseIdx(SMeta *pMeta) { /* TODO */
-#if 0
-  if (pMeta->pIdx) {
-    rocksdb_close(pMeta->pIdx);
-    pMeta->pIdx = NULL;
-  }
-#endif
-
-#ifdef USE_INVERTED_INDEX
-  // SIndexOpts opts;
-  // if (indexClose(pMeta->pIdx->pIdx) != 0) {
-  //  return -1;
-  //}
-  // return 0;
-
-#endif
-}
-
-int metaSaveTableToIdx(SMeta *pMeta, const STbCfg *pTbCfg) {
-#ifdef USE_INVERTED_INDEX
-  // if (pTbCfgs->type == META_CHILD_TABLE) {
-  //  char    buf[8] = {0};
-  //  int16_t colId = (kvRowColIdx(pTbCfg->ctbCfg.pTag))[0].colId;
-  //  sprintf(buf, "%d", colId);  // colname
-
-  //  char *pTagVal = (char *)tdGetKVRowValOfCol(pTbCfg->ctbCfg.pTag, (kvRowColIdx(pTbCfg->ctbCfg.pTag))[0].colId);
-
-  //  tb_uid_t         suid = pTbCfg->ctbCfg.suid;  // super id
-  //  tb_uid_t         tuid = 0;                    // child table uid
-  //  SIndexMultiTerm *terms = indexMultiTermCreate();
-  //  SIndexTerm      *term =
-  //      indexTermCreate(suid, ADD_VALUE, TSDB_DATA_TYPE_BINARY, buf, strlen(buf), pTagVal, strlen(pTagVal), tuid);
-  //  indexMultiTermAdd(terms, term);
-
-  //  int ret = indexPut(pMeta->pIdx->pIdx, terms);
-  //  indexMultiTermDestroy(terms);
-  //  return ret;
-  //} else {
-  //  return DB_DONOTINDEX;
-  //}
-#endif
-  // TODO
-  return 0;
-}
-
-int metaRemoveTableFromIdx(SMeta *pMeta, tb_uid_t uid) {
-#ifdef USE_INVERTED_INDEX
-
-#endif
-  // TODO
-  return 0;
-}
-#endif

source/dnode/vnode/src/meta/metaOpen.c

@@ -39,13 +39,13 @@ static int32_t metaDestroyLock(SMeta *pMeta) { return taosThreadRwlockDestroy(&p
 
 static void metaCleanup(SMeta **ppMeta);
 
-int metaOpen(SVnode *pVnode, SMeta **ppMeta, int8_t rollback) {
+int32_t metaOpen(SVnode *pVnode, SMeta **ppMeta, int8_t rollback) {
   SMeta  *pMeta = NULL;
-  int    ret;
+  int32_t code = 0;
-  int    offset;
+  int32_t lino;
+  int32_t offset;
   char    path[TSDB_FILENAME_LEN] = {0};
-
+  char    indexFullPath[128] = {0};
-  *ppMeta = NULL;
 
   // create handle
   vnodeGetPrimaryDir(pVnode->path, pVnode->diskPrimary, pVnode->pTfs, path, TSDB_FILENAME_LEN);
@@ -53,8 +53,7 @@ int metaOpen(SVnode *pVnode, SMeta **ppMeta, int8_t rollback) {
   snprintf(path + offset, TSDB_FILENAME_LEN - offset - 1, "%s%s", TD_DIRSEP, VNODE_META_DIR);
 
   if ((pMeta = taosMemoryCalloc(1, sizeof(*pMeta) + strlen(path) + 1)) == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    TSDB_CHECK_CODE(code = TSDB_CODE_OUT_OF_MEMORY, lino, _exit);
-    return -1;
   }
 
   metaInitLock(pMeta);
@@ -69,163 +68,104 @@ int metaOpen(SVnode *pVnode, SMeta **ppMeta, int8_t rollback) {
   taosMkDir(pMeta->path);
 
   // open env
-  ret = tdbOpen(pMeta->path, pVnode->config.szPage, pVnode->config.szCache, &pMeta->pEnv, rollback, 
+  code = tdbOpen(pMeta->path, pVnode->config.szPage, pVnode->config.szCache, &pMeta->pEnv, rollback,
                  pVnode->config.tdbEncryptAlgorithm, pVnode->config.tdbEncryptKey);
-  if (ret < 0) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    metaError("vgId:%d, failed to open meta env since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
 
   // open pTbDb
-  ret = tdbTbOpen("table.db", sizeof(STbDbKey), -1, tbDbKeyCmpr, pMeta->pEnv, &pMeta->pTbDb, 0);
+  code = tdbTbOpen("table.db", sizeof(STbDbKey), -1, tbDbKeyCmpr, pMeta->pEnv, &pMeta->pTbDb, 0);
-  if (ret < 0) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    metaError("vgId:%d, failed to open meta table db since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
 
   // open pSkmDb
-  ret = tdbTbOpen("schema.db", sizeof(SSkmDbKey), -1, skmDbKeyCmpr, pMeta->pEnv, &pMeta->pSkmDb, 0);
+  code = tdbTbOpen("schema.db", sizeof(SSkmDbKey), -1, skmDbKeyCmpr, pMeta->pEnv, &pMeta->pSkmDb, 0);
-  if (ret < 0) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    metaError("vgId:%d, failed to open meta schema db since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
 
   // open pUidIdx
-  ret = tdbTbOpen("uid.idx", sizeof(tb_uid_t), sizeof(SUidIdxVal), uidIdxKeyCmpr, pMeta->pEnv, &pMeta->pUidIdx, 0);
+  code = tdbTbOpen("uid.idx", sizeof(tb_uid_t), sizeof(SUidIdxVal), uidIdxKeyCmpr, pMeta->pEnv, &pMeta->pUidIdx, 0);
-  if (ret < 0) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    metaError("vgId:%d, failed to open meta uid idx since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
 
   // open pNameIdx
-  ret = tdbTbOpen("name.idx", -1, sizeof(tb_uid_t), NULL, pMeta->pEnv, &pMeta->pNameIdx, 0);
+  code = tdbTbOpen("name.idx", -1, sizeof(tb_uid_t), NULL, pMeta->pEnv, &pMeta->pNameIdx, 0);
-  if (ret < 0) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    metaError("vgId:%d, failed to open meta name index since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
 
   // open pCtbIdx
-  ret = tdbTbOpen("ctb.idx", sizeof(SCtbIdxKey), -1, ctbIdxKeyCmpr, pMeta->pEnv, &pMeta->pCtbIdx, 0);
+  code = tdbTbOpen("ctb.idx", sizeof(SCtbIdxKey), -1, ctbIdxKeyCmpr, pMeta->pEnv, &pMeta->pCtbIdx, 0);
-  if (ret < 0) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    metaError("vgId:%d, failed to open meta child table index since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
 
   // open pSuidIdx
-  ret = tdbTbOpen("suid.idx", sizeof(tb_uid_t), 0, uidIdxKeyCmpr, pMeta->pEnv, &pMeta->pSuidIdx, 0);
+  code = tdbTbOpen("suid.idx", sizeof(tb_uid_t), 0, uidIdxKeyCmpr, pMeta->pEnv, &pMeta->pSuidIdx, 0);
-  if (ret < 0) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    metaError("vgId:%d, failed to open meta super table index since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
 
-  char indexFullPath[128] = {0};
   sprintf(indexFullPath, "%s/%s", pMeta->path, "invert");
-  taosMkDir(indexFullPath);
+  TAOS_UNUSED(taosMkDir(indexFullPath));
 
   SIndexOpts opts = {.cacheSize = 8 * 1024 * 1024};
-  ret = indexOpen(&opts, indexFullPath, (SIndex **)&pMeta->pTagIvtIdx);
+  code = indexOpen(&opts, indexFullPath, (SIndex **)&pMeta->pTagIvtIdx);
-  if (ret < 0) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    metaError("vgId:%d, failed to open meta tag index since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
 
-  ret = tdbTbOpen("tag.idx", -1, 0, tagIdxKeyCmpr, pMeta->pEnv, &pMeta->pTagIdx, 0);
+  code = tdbTbOpen("tag.idx", -1, 0, tagIdxKeyCmpr, pMeta->pEnv, &pMeta->pTagIdx, 0);
-  if (ret < 0) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    metaError("vgId:%d, failed to open meta tag index since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
 
   // open pTtlMgr ("ttlv1.idx")
   char logPrefix[128] = {0};
   sprintf(logPrefix, "vgId:%d", TD_VID(pVnode));
-  ret = ttlMgrOpen(&pMeta->pTtlMgr, pMeta->pEnv, 0, logPrefix, tsTtlFlushThreshold);
+  code = ttlMgrOpen(&pMeta->pTtlMgr, pMeta->pEnv, 0, logPrefix, tsTtlFlushThreshold);
-  if (ret < 0) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    metaError("vgId:%d, failed to open meta ttl index since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
 
   // open pSmaIdx
-  ret = tdbTbOpen("sma.idx", sizeof(SSmaIdxKey), 0, smaIdxKeyCmpr, pMeta->pEnv, &pMeta->pSmaIdx, 0);
+  code = tdbTbOpen("sma.idx", sizeof(SSmaIdxKey), 0, smaIdxKeyCmpr, pMeta->pEnv, &pMeta->pSmaIdx, 0);
-  if (ret < 0) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    metaError("vgId:%d, failed to open meta sma index since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
 
   // idx table create time
-  ret = tdbTbOpen("ctime.idx", sizeof(SBtimeIdxKey), 0, btimeIdxCmpr, pMeta->pEnv, &pMeta->pBtimeIdx, 0);
+  code = tdbTbOpen("ctime.idx", sizeof(SBtimeIdxKey), 0, btimeIdxCmpr, pMeta->pEnv, &pMeta->pBtimeIdx, 0);
-  if (ret < 0) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    metaError("vgId:%d, failed to open meta ctime index since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
 
   // idx num of col, normal table only
-  ret = tdbTbOpen("ncol.idx", sizeof(SNcolIdxKey), 0, ncolIdxCmpr, pMeta->pEnv, &pMeta->pNcolIdx, 0);
+  code = tdbTbOpen("ncol.idx", sizeof(SNcolIdxKey), 0, ncolIdxCmpr, pMeta->pEnv, &pMeta->pNcolIdx, 0);
-  if (ret < 0) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    metaError("vgId:%d, failed to open meta ncol index since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
 
-  ret = tdbTbOpen("stream.task.db", sizeof(int64_t), -1, taskIdxKeyCmpr, pMeta->pEnv, &pMeta->pStreamDb, 0);
+  code = tdbTbOpen("stream.task.db", sizeof(int64_t), -1, taskIdxKeyCmpr, pMeta->pEnv, &pMeta->pStreamDb, 0);
-  if (ret < 0) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    metaError("vgId:%d, failed to open meta stream task index since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
 
-  // open index
+  code = metaCacheOpen(pMeta);
-  if (metaOpenIdx(pMeta) < 0) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    metaError("vgId:%d, failed to open meta index since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
 
-  int32_t code = metaCacheOpen(pMeta);
+  code = metaInitTbFilterCache(pMeta);
+  TSDB_CHECK_CODE(code, lino, _exit);
+
+_exit:
   if (code) {
-    terrno = code;
+    metaError("vgId:%d %s failed at %s:%d since %s", TD_VID(pVnode), __func__, __FILE__, __LINE__, tstrerror(code));
-    metaError("vgId:%d, failed to open meta cache since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
-
-  if (metaInitTbFilterCache(pMeta) != 0) {
-    goto _err;
-  }
-
-  metaDebug("vgId:%d, meta is opened", TD_VID(pVnode));
-
-  *ppMeta = pMeta;
-  return 0;
-
-_err:
     metaCleanup(&pMeta);
-  return -1;
+    *ppMeta = NULL;
+  } else {
+    metaDebug("vgId:%d %s success", TD_VID(pVnode), __func__);
+    *ppMeta = pMeta;
+  }
+  return code;
 }
 
-int metaUpgrade(SVnode *pVnode, SMeta **ppMeta) {
+int32_t metaUpgrade(SVnode *pVnode, SMeta **ppMeta) {
-  int    code = TSDB_CODE_SUCCESS;
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino;
   SMeta  *pMeta = *ppMeta;
 
   if (ttlMgrNeedUpgrade(pMeta->pEnv)) {
     code = metaBegin(pMeta, META_BEGIN_HEAP_OS);
-    if (code < 0) {
+    TSDB_CHECK_CODE(code, lino, _exit);
-      metaError("vgId:%d, failed to upgrade meta, meta begin failed since %s", TD_VID(pVnode), tstrerror(terrno));
-      goto _err;
-    }
 
     code = ttlMgrUpgrade(pMeta->pTtlMgr, pMeta);
-    if (code < 0) {
+    TSDB_CHECK_CODE(code, lino, _exit);
-      metaError("vgId:%d, failed to upgrade meta ttl since %s", TD_VID(pVnode), tstrerror(terrno));
-      goto _err;
-    }
 
     code = metaCommit(pMeta, pMeta->txn);
-    if (code < 0) {
+    TSDB_CHECK_CODE(code, lino, _exit);
-      metaError("vgId:%d, failed to upgrade meta ttl, meta commit failed since %s", TD_VID(pVnode), tstrerror(terrno));
-      goto _err;
-    }
   }
 
-  return TSDB_CODE_SUCCESS;
+_exit:
-
+  if (code) {
-_err:
+    metaError("vgId:%d %s failed at %s:%d since %s", TD_VID(pVnode), __func__, __FILE__, __LINE__, tstrerror(code));
     metaCleanup(ppMeta);
+  }
   return code;
 }
 
@@ -235,33 +175,42 @@ int metaClose(SMeta **ppMeta) {
 }
 
 int metaAlterCache(SMeta *pMeta, int32_t nPage) {
+  int32_t code = 0;
   metaWLock(pMeta);
-
+  code = tdbAlter(pMeta->pEnv, nPage);
-  if (tdbAlter(pMeta->pEnv, nPage) < 0) {
   metaULock(pMeta);
-    return -1;
+
+  if (code) {
+    metaError("vgId:%d %s failed since %s", TD_VID(pMeta->pVnode), __func__, tstrerror(code));
   }
-
+  return code;
-  metaULock(pMeta);
-  return 0;
 }
 
 int32_t metaRLock(SMeta *pMeta) {
   metaTrace("meta rlock %p", &pMeta->lock);
-  int32_t ret = taosThreadRwlockRdlock(&pMeta->lock);
+  int32_t code = taosThreadRwlockRdlock(&pMeta->lock);
-  return ret;
+  if (code) {
+    return TAOS_SYSTEM_ERROR(code);
+  }
+  return 0;
 }
 
 int32_t metaWLock(SMeta *pMeta) {
   metaTrace("meta wlock %p", &pMeta->lock);
-  int32_t ret = taosThreadRwlockWrlock(&pMeta->lock);
+  int32_t code = taosThreadRwlockWrlock(&pMeta->lock);
-  return ret;
+  if (code) {
+    return TAOS_SYSTEM_ERROR(code);
+  }
+  return 0;
 }
 
 int32_t metaULock(SMeta *pMeta) {
   metaTrace("meta ulock %p", &pMeta->lock);
-  int32_t ret = taosThreadRwlockUnlock(&pMeta->lock);
+  int32_t code = taosThreadRwlockUnlock(&pMeta->lock);
-  return ret;
+  if (code) {
+    return TAOS_SYSTEM_ERROR(code);
+  }
+  return 0;
 }
 
 static void metaCleanup(SMeta **ppMeta) {

source/dnode/vnode/src/meta/metaQuery.c

@@ -1542,9 +1542,14 @@ int32_t metaGetStbStats(void *pVnode, int64_t uid, int64_t *numOfTables, int32_t
   // slow path: search TDB
   int64_t ctbNum = 0;
   int32_t colNum = 0;
-  vnodeGetCtbNum(pVnode, uid, &ctbNum);
+  code = vnodeGetCtbNum(pVnode, uid, &ctbNum);
-  vnodeGetStbColumnNum(pVnode, uid, &colNum);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = vnodeGetStbColumnNum(pVnode, uid, &colNum);
+  }
   metaULock(pVnodeObj->pMeta);
+  if (TSDB_CODE_SUCCESS != code) {
+    goto _exit;
+  }
 
   if (numOfTables) *numOfTables = ctbNum;
   if (numOfCols) *numOfCols = colNum;

source/dnode/vnode/src/meta/metaSnapshot.c

@@ -25,14 +25,14 @@ struct SMetaSnapReader {
 
 int32_t metaSnapReaderOpen(SMeta* pMeta, int64_t sver, int64_t ever, SMetaSnapReader** ppReader) {
   int32_t          code = 0;
+  int32_t          lino;
   int32_t          c = 0;
   SMetaSnapReader* pReader = NULL;
 
   // alloc
   pReader = (SMetaSnapReader*)taosMemoryCalloc(1, sizeof(*pReader));
   if (pReader == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    TSDB_CHECK_CODE(code = TSDB_CODE_OUT_OF_MEMORY, lino, _exit);
-    goto _err;
   }
   pReader->pMeta = pMeta;
   pReader->sver = sver;
@@ -40,36 +40,29 @@ int32_t metaSnapReaderOpen(SMeta* pMeta, int64_t sver, int64_t ever, SMetaSnapRe
 
   // impl
   code = tdbTbcOpen(pMeta->pTbDb, &pReader->pTbc, NULL);
-  if (code) {
+  TSDB_CHECK_CODE(code, lino, _exit);
-    taosMemoryFree(pReader);
-    goto _err;
-  }
 
   code = tdbTbcMoveTo(pReader->pTbc, &(STbDbKey){.version = sver, .uid = INT64_MIN}, sizeof(STbDbKey), &c);
+  TSDB_CHECK_CODE(code, lino, _exit);
+
+_exit:
   if (code) {
-    taosMemoryFree(pReader);
+    metaError("vgId:%d, %s failed at %s:%d since %s", TD_VID(pMeta->pVnode), __func__, __FILE__, lino, tstrerror(code));
-    goto _err;
+    metaSnapReaderClose(&pReader);
-  }
-
-  metaInfo("vgId:%d, vnode snapshot meta reader opened", TD_VID(pMeta->pVnode));
-
-  *ppReader = pReader;
-  return code;
-
-_err:
-  metaError("vgId:%d, vnode snapshot meta reader open failed since %s", TD_VID(pMeta->pVnode), tstrerror(code));
     *ppReader = NULL;
+  } else {
+    metaInfo("vgId:%d, %s success", TD_VID(pMeta->pVnode), __func__);
+    *ppReader = pReader;
+  }
   return code;
 }
 
-int32_t metaSnapReaderClose(SMetaSnapReader** ppReader) {
+void metaSnapReaderClose(SMetaSnapReader** ppReader) {
-  int32_t code = 0;
+  if (ppReader && *ppReader) {
-
     tdbTbcClose((*ppReader)->pTbc);
     taosMemoryFree(*ppReader);
     *ppReader = NULL;
-
+  }
-  return code;
 }
 
 int32_t metaSnapRead(SMetaSnapReader* pReader, uint8_t** ppData) {
@@ -106,7 +99,7 @@ int32_t metaSnapRead(SMetaSnapReader* pReader, uint8_t** ppData) {
     *ppData = taosMemoryMalloc(sizeof(SSnapDataHdr) + nData);
     if (*ppData == NULL) {
       code = TSDB_CODE_OUT_OF_MEMORY;
-      goto _err;
+      goto _exit;
     }
 
     SSnapDataHdr* pHdr = (SSnapDataHdr*)(*ppData);
@@ -122,10 +115,10 @@ int32_t metaSnapRead(SMetaSnapReader* pReader, uint8_t** ppData) {
   }
 
 _exit:
-  return code;
+  if (code) {
-
+    metaError("vgId:%d, vnode snapshot meta read data failed since %s", TD_VID(pReader->pMeta->pVnode),
-_err:
+              tstrerror(code));
-  metaError("vgId:%d, vnode snapshot meta read data failed since %s", TD_VID(pReader->pMeta->pVnode), tstrerror(code));
+  }
   return code;
 }
 
@@ -138,26 +131,30 @@ struct SMetaSnapWriter {
 
 int32_t metaSnapWriterOpen(SMeta* pMeta, int64_t sver, int64_t ever, SMetaSnapWriter** ppWriter) {
   int32_t          code = 0;
+  int32_t          lino;
   SMetaSnapWriter* pWriter;
 
   // alloc
   pWriter = (SMetaSnapWriter*)taosMemoryCalloc(1, sizeof(*pWriter));
   if (pWriter == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    TSDB_CHECK_CODE(code = TSDB_CODE_OUT_OF_MEMORY, lino, _exit);
-    goto _err;
   }
   pWriter->pMeta = pMeta;
   pWriter->sver = sver;
   pWriter->ever = ever;
 
-  metaBegin(pMeta, META_BEGIN_HEAP_NIL);
+  code = metaBegin(pMeta, META_BEGIN_HEAP_NIL);
+  TSDB_CHECK_CODE(code, lino, _exit);
 
-  *ppWriter = pWriter;
+_exit:
-  return code;
+  if (code) {
-
+    metaError("vgId:%d, %s failed at %s:%d since %s", TD_VID(pMeta->pVnode), __func__, __FILE__, lino, tstrerror(code));
-_err:
+    taosMemoryFree(pWriter);
-  metaError("vgId:%d, meta snapshot writer open failed since %s", TD_VID(pMeta->pVnode), tstrerror(code));
     *ppWriter = NULL;
+  } else {
+    metaDebug("vgId:%d, %s success", TD_VID(pMeta->pVnode), __func__);
+    *ppWriter = pWriter;
+  }
   return code;
 }
 
@@ -189,25 +186,24 @@ _err:
 
 int32_t metaSnapWrite(SMetaSnapWriter* pWriter, uint8_t* pData, uint32_t nData) {
   int32_t    code = 0;
-  int32_t    line = 0;
+  int32_t    lino = 0;
   SMeta*     pMeta = pWriter->pMeta;
   SMetaEntry metaEntry = {0};
   SDecoder*  pDecoder = &(SDecoder){0};
 
   tDecoderInit(pDecoder, pData + sizeof(SSnapDataHdr), nData - sizeof(SSnapDataHdr));
   code = metaDecodeEntry(pDecoder, &metaEntry);
-  VND_CHECK_CODE(code, line, _err);
+  TSDB_CHECK_CODE(code, lino, _exit);
 
   code = metaHandleEntry(pMeta, &metaEntry);
-  VND_CHECK_CODE(code, line, _err);
+  TSDB_CHECK_CODE(code, lino, _exit);
 
+_exit:
+  if (code) {
+    metaError("vgId:%d, %s failed at %s:%d since %s", TD_VID(pMeta->pVnode), __func__, __FILE__, lino, tstrerror(code));
+  }
   tDecoderClear(pDecoder);
   return code;
-
-_err:
-  tDecoderClear(pDecoder);
-  metaError("vgId:%d, vnode snapshot meta write failed since %s at line:%d", TD_VID(pMeta->pVnode), terrstr(), line);
-  return code;
 }
 
 typedef struct STableInfoForChildTable {
@@ -468,19 +464,17 @@ int32_t setForSnapShot(SSnapContext* ctx, int64_t uid) {
   return c;
 }
 
-void taosXSetTablePrimaryKey(SSnapContext* ctx, int64_t uid){
+void taosXSetTablePrimaryKey(SSnapContext* ctx, int64_t uid) {
   bool            ret = false;
-  SSchemaWrapper *schema = metaGetTableSchema(ctx->pMeta, uid, -1, 1);
+  SSchemaWrapper* schema = metaGetTableSchema(ctx->pMeta, uid, -1, 1);
-  if (schema->nCols >= 2 && schema->pSchema[1].flags & COL_IS_KEY){
+  if (schema->nCols >= 2 && schema->pSchema[1].flags & COL_IS_KEY) {
     ret = true;
   }
   tDeleteSchemaWrapper(schema);
   ctx->hasPrimaryKey = ret;
 }
 
-bool taosXGetTablePrimaryKey(SSnapContext* ctx){
+bool taosXGetTablePrimaryKey(SSnapContext* ctx) { return ctx->hasPrimaryKey; }
-  return ctx->hasPrimaryKey;
-}
 
 int32_t getTableInfoFromSnapshot(SSnapContext* ctx, void** pBuf, int32_t* contLen, int16_t* type, int64_t* uid) {
   int32_t ret = 0;

source/dnode/vnode/src/tq/tqMeta.c

@@ -37,7 +37,7 @@ int32_t tEncodeSTqHandle(SEncoder* pEncoder, const STqHandle* pHandle) {
     }
   } else if (pHandle->execHandle.subType == TOPIC_SUB_TYPE__TABLE) {
     if (tEncodeI64(pEncoder, pHandle->execHandle.execTb.suid) < 0) return -1;
-    if (pHandle->execHandle.execTb.qmsg != NULL){
+    if (pHandle->execHandle.execTb.qmsg != NULL) {
       if (tEncodeCStr(pEncoder, pHandle->execHandle.execTb.qmsg) < 0) return -1;
     }
   }
@@ -67,7 +67,7 @@ int32_t tDecodeSTqHandle(SDecoder* pDecoder, STqHandle* pHandle) {
     }
   } else if (pHandle->execHandle.subType == TOPIC_SUB_TYPE__TABLE) {
     if (tDecodeI64(pDecoder, &pHandle->execHandle.execTb.suid) < 0) return -1;
-    if (!tDecodeIsEnd(pDecoder)){
+    if (!tDecodeIsEnd(pDecoder)) {
       if (tDecodeCStrAlloc(pDecoder, &pHandle->execHandle.execTb.qmsg) < 0) return -1;
     }
   }
@@ -75,7 +75,7 @@ int32_t tDecodeSTqHandle(SDecoder* pDecoder, STqHandle* pHandle) {
   return 0;
 }
 
-int32_t tqMetaDecodeCheckInfo(STqCheckInfo *info, void *pVal, int32_t vLen){
+int32_t tqMetaDecodeCheckInfo(STqCheckInfo* info, void* pVal, int32_t vLen) {
   SDecoder decoder = {0};
   tDecoderInit(&decoder, (uint8_t*)pVal, vLen);
   int32_t code = tDecodeSTqCheckInfo(&decoder, info);
@@ -87,7 +87,7 @@ int32_t tqMetaDecodeCheckInfo(STqCheckInfo *info, void *pVal, int32_t vLen){
   return code;
 }
 
-int32_t tqMetaDecodeOffsetInfo(STqOffset *info, void *pVal, int32_t vLen){
+int32_t tqMetaDecodeOffsetInfo(STqOffset* info, void* pVal, int32_t vLen) {
   SDecoder decoder = {0};
   tDecoderInit(&decoder, (uint8_t*)pVal, vLen);
   int32_t code = tDecodeSTqOffset(&decoder, info);
@@ -131,7 +131,7 @@ END:
   return code;
 }
 
-void* tqMetaGetOffset(STQ* pTq, const char* subkey){
+void* tqMetaGetOffset(STQ* pTq, const char* subkey) {
   void* data = taosHashGet(pTq->pOffset, subkey, strlen(subkey));
   if (data == NULL) {
     int vLen = 0;
@@ -146,7 +146,7 @@ void* tqMetaGetOffset(STQ* pTq, const char* subkey){
       return NULL;
     }
 
-    if(taosHashPut(pTq->pOffset, subkey, strlen(subkey), &offset, sizeof(STqOffset)) != 0){
+    if (taosHashPut(pTq->pOffset, subkey, strlen(subkey), &offset, sizeof(STqOffset)) != 0) {
       tDeleteSTqOffset(&offset);
       tdbFree(data);
       return NULL;
@@ -192,14 +192,15 @@ END:
   return code;
 }
 
-static int tqMetaInitHandle(STQ* pTq, STqHandle* handle){
+static int tqMetaInitHandle(STQ* pTq, STqHandle* handle) {
   int32_t code = TDB_CODE_SUCCESS;
+
   SVnode* pVnode = pTq->pVnode;
   int32_t vgId = TD_VID(pVnode);
 
   handle->pRef = walOpenRef(pVnode->pWal);
   if (handle->pRef == NULL) {
-    return TSDB_CODE_OUT_OF_MEMORY;
+    TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
   }
   TQ_ERR_RETURN(walSetRefVer(handle->pRef, handle->snapshotVer));
 
@@ -213,8 +214,8 @@ static int tqMetaInitHandle(STQ* pTq, STqHandle* handle){
   initStorageAPI(&reader.api);
 
   if (handle->execHandle.subType == TOPIC_SUB_TYPE__COLUMN) {
-    handle->execHandle.task =
+    handle->execHandle.task = qCreateQueueExecTaskInfo(handle->execHandle.execCol.qmsg, &reader, vgId,
-        qCreateQueueExecTaskInfo(handle->execHandle.execCol.qmsg, &reader, vgId, &handle->execHandle.numOfCols, handle->consumerId);
+                                                       &handle->execHandle.numOfCols, handle->consumerId);
     if (handle->execHandle.task == NULL) {
       tqError("cannot create exec task for %s", handle->subKey);
       return TSDB_CODE_OUT_OF_MEMORY;
@@ -240,7 +241,7 @@ static int tqMetaInitHandle(STQ* pTq, STqHandle* handle){
   } else if (handle->execHandle.subType == TOPIC_SUB_TYPE__TABLE) {
     handle->pWalReader = walOpenReader(pVnode->pWal, NULL, 0);
 
-    if(handle->execHandle.execTb.qmsg != NULL && strcmp(handle->execHandle.execTb.qmsg, "") != 0) {
+    if (handle->execHandle.execTb.qmsg != NULL && strcmp(handle->execHandle.execTb.qmsg, "") != 0) {
       if (nodesStringToNode(handle->execHandle.execTb.qmsg, &handle->execHandle.execTb.node) != 0) {
         tqError("nodesStringToNode error in sub stable, since %s", terrstr());
         return TSDB_CODE_SCH_INTERNAL_ERROR;
@@ -251,13 +252,15 @@ static int tqMetaInitHandle(STQ* pTq, STqHandle* handle){
     handle->execHandle.task = qCreateQueueExecTaskInfo(NULL, &reader, vgId, NULL, handle->consumerId);
 
     SArray* tbUidList = NULL;
-    int ret = qGetTableList(handle->execHandle.execTb.suid, pVnode, handle->execHandle.execTb.node, &tbUidList, handle->execHandle.task);
+    int     ret = qGetTableList(handle->execHandle.execTb.suid, pVnode, handle->execHandle.execTb.node, &tbUidList,
-    if(ret != TDB_CODE_SUCCESS) {
+                                handle->execHandle.task);
+    if (ret != TDB_CODE_SUCCESS) {
       tqError("qGetTableList error:%d handle %s consumer:0x%" PRIx64, ret, handle->subKey, handle->consumerId);
       taosArrayDestroy(tbUidList);
       return TSDB_CODE_SCH_INTERNAL_ERROR;
     }
-    tqInfo("vgId:%d, tq try to get ctb for stb subscribe, suid:%" PRId64, pVnode->config.vgId, handle->execHandle.execTb.suid);
+    tqInfo("vgId:%d, tq try to get ctb for stb subscribe, suid:%" PRId64, pVnode->config.vgId,
+           handle->execHandle.execTb.suid);
     handle->execHandle.pTqReader = tqReaderOpen(pVnode);
     tqReaderSetTbUidList(handle->execHandle.pTqReader, tbUidList, NULL);
     taosArrayDestroy(tbUidList);
@@ -265,7 +268,7 @@ static int tqMetaInitHandle(STQ* pTq, STqHandle* handle){
   return 0;
 }
 
-static int32_t tqMetaRestoreHandle(STQ* pTq, void* pVal, int vLen, STqHandle* handle){
+static int32_t tqMetaRestoreHandle(STQ* pTq, void* pVal, int vLen, STqHandle* handle) {
   int32_t  vgId = TD_VID(pTq->pVnode);
   SDecoder decoder = {0};
   int32_t  code = TDB_CODE_SUCCESS;
@@ -281,7 +284,7 @@ END:
   return code;
 }
 
-int32_t tqMetaCreateHandle(STQ* pTq, SMqRebVgReq* req, STqHandle* handle){
+int32_t tqMetaCreateHandle(STQ* pTq, SMqRebVgReq* req, STqHandle* handle) {
   int32_t vgId = TD_VID(pTq->pVnode);
 
   memcpy(handle->subKey, req->subKey, TSDB_SUBSCRIBE_KEY_LEN);
@@ -289,26 +292,27 @@ int32_t tqMetaCreateHandle(STQ* pTq, SMqRebVgReq* req, STqHandle* handle){
 
   handle->execHandle.subType = req->subType;
   handle->fetchMeta = req->withMeta;
-  if(req->subType == TOPIC_SUB_TYPE__COLUMN){
+  if (req->subType == TOPIC_SUB_TYPE__COLUMN) {
     handle->execHandle.execCol.qmsg = taosStrdup(req->qmsg);
-  }else if(req->subType == TOPIC_SUB_TYPE__DB){
+  } else if (req->subType == TOPIC_SUB_TYPE__DB) {
     handle->execHandle.execDb.pFilterOutTbUid =
         taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_ENTRY_LOCK);
-  }else if(req->subType == TOPIC_SUB_TYPE__TABLE){
+  } else if (req->subType == TOPIC_SUB_TYPE__TABLE) {
     handle->execHandle.execTb.suid = req->suid;
     handle->execHandle.execTb.qmsg = taosStrdup(req->qmsg);
   }
 
   handle->snapshotVer = walGetCommittedVer(pTq->pVnode->pWal);
 
-  if(tqMetaInitHandle(pTq, handle) < 0){
+  if (tqMetaInitHandle(pTq, handle) < 0) {
     return -1;
   }
-  tqInfo("tqMetaCreateHandle %s consumer 0x%" PRIx64 " vgId:%d, snapshotVer:%" PRId64, handle->subKey, handle->consumerId, vgId, handle->snapshotVer);
+  tqInfo("tqMetaCreateHandle %s consumer 0x%" PRIx64 " vgId:%d, snapshotVer:%" PRId64, handle->subKey,
+         handle->consumerId, vgId, handle->snapshotVer);
   return taosHashPut(pTq->pHandle, handle->subKey, strlen(handle->subKey), handle, sizeof(STqHandle));
 }
 
-static int32_t tqMetaTransformInfo(TDB* pMetaDB, TTB* pOld, TTB* pNew){
+static int32_t tqMetaTransformInfo(TDB* pMetaDB, TTB* pOld, TTB* pNew) {
   TBC*  pCur = NULL;
   void* pKey = NULL;
   int   kLen = 0;
@@ -319,15 +323,16 @@ static int32_t tqMetaTransformInfo(TDB* pMetaDB, TTB* pOld, TTB* pNew){
   int32_t code = TDB_CODE_SUCCESS;
 
   TQ_ERR_GO_TO_END(tdbTbcOpen(pOld, &pCur, NULL));
-  TQ_ERR_GO_TO_END(tdbBegin(pMetaDB, &txn, tdbDefaultMalloc, tdbDefaultFree, NULL, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED));
+  TQ_ERR_GO_TO_END(
+      tdbBegin(pMetaDB, &txn, tdbDefaultMalloc, tdbDefaultFree, NULL, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED));
 
   TQ_ERR_GO_TO_END(tdbTbcMoveToFirst(pCur));
   while (tdbTbcNext(pCur, &pKey, &kLen, &pVal, &vLen) == 0) {
-    TQ_ERR_GO_TO_END (tdbTbUpsert(pNew, pKey, kLen, pVal, vLen, txn));
+    TQ_ERR_GO_TO_END(tdbTbUpsert(pNew, pKey, kLen, pVal, vLen, txn));
   }
 
-  TQ_ERR_GO_TO_END (tdbCommit(pMetaDB, txn));
+  TQ_ERR_GO_TO_END(tdbCommit(pMetaDB, txn));
-  TQ_ERR_GO_TO_END (tdbPostCommit(pMetaDB, txn));
+  TQ_ERR_GO_TO_END(tdbPostCommit(pMetaDB, txn));
 
 END:
   tdbFree(pKey);
@@ -338,24 +343,24 @@ END:
 
 int32_t tqMetaGetHandle(STQ* pTq, const char* key, STqHandle** pHandle) {
   void* data = taosHashGet(pTq->pHandle, key, strlen(key));
-  if(data == NULL){
+  if (data == NULL) {
     int vLen = 0;
     if (tdbTbGet(pTq->pExecStore, key, (int)strlen(key), &data, &vLen) < 0) {
       tdbFree(data);
       return TSDB_CODE_MND_SUBSCRIBE_NOT_EXIST;
     }
     STqHandle handle = {0};
-    if (tqMetaRestoreHandle(pTq, data, vLen, &handle) != 0){
+    if (tqMetaRestoreHandle(pTq, data, vLen, &handle) != 0) {
       tdbFree(data);
       tqDestroyTqHandle(&handle);
       return TSDB_CODE_OUT_OF_MEMORY;
     }
     tdbFree(data);
     *pHandle = taosHashGet(pTq->pHandle, key, strlen(key));
-    if(*pHandle == NULL){
+    if (*pHandle == NULL) {
       return TSDB_CODE_OUT_OF_MEMORY;
     }
-  }else{
+  } else {
     *pHandle = data;
   }
   return TDB_CODE_SUCCESS;
@@ -372,7 +377,7 @@ END:
   return code;
 }
 
-static int32_t replaceTqPath(char** path){
+static int32_t replaceTqPath(char** path) {
   char*   tpath = NULL;
   int32_t code = TDB_CODE_SUCCESS;
   TQ_ERR_RETURN(tqBuildFName(&tpath, *path, TQ_SUBSCRIBE_NAME));
@@ -412,10 +417,10 @@ int32_t tqMetaOpen(STQ* pTq) {
   char*   offsetNew = NULL;
   int32_t code = TDB_CODE_SUCCESS;
   TQ_ERR_GO_TO_END(tqBuildFName(&maindb, pTq->path, TDB_MAINDB_NAME));
-  if(!taosCheckExistFile(maindb)){
+  if (!taosCheckExistFile(maindb)) {
     TQ_ERR_GO_TO_END(replaceTqPath(&pTq->path));
     TQ_ERR_GO_TO_END(tqMetaOpenTdb(pTq));
-  }else{
+  } else {
     TQ_ERR_GO_TO_END(tqMetaTransform(pTq));
     (void)taosRemoveFile(maindb);
   }
@@ -454,6 +459,7 @@ int32_t tqMetaTransform(STQ* pTq) {
   TQ_ERR_GO_TO_END(tqMetaTransformInfo(pTq->pMetaDB, pCheckStore, pTq->pCheckStore));
 
   TQ_ERR_GO_TO_END(tqBuildFName(&offsetNew, pTq->path, TQ_OFFSET_NAME));
+
   if(taosCheckExistFile(offset)) {
     if (taosCopyFile(offset, offsetNew) < 0) {
       tqError("copy offset file error");
@@ -466,7 +472,7 @@ END:
   taosMemoryFree(offset);
   taosMemoryFree(offsetNew);
 
-  //return 0 always, so ignore
+  // return 0 always, so ignore
   (void)tdbTbClose(pExecStore);
   (void)tdbTbClose(pCheckStore);
   (void)tdbClose(pMetaDB);

source/dnode/vnode/src/tq/tqRead.c

@@ -188,7 +188,7 @@ int32_t tqFetchLog(STQ* pTq, STqHandle* pHandle, int64_t* fetchOffset, uint64_t
   int64_t committedVer = walGetCommittedVer(pHandle->pWalReader->pWal);
   int64_t appliedVer = walGetAppliedVer(pHandle->pWalReader->pWal);
 
-  wDebug("vgId:%d, start to fetch wal, index:%" PRId64 ", last:%" PRId64 " commit:%" PRId64 ", applied:%" PRId64
+  tqDebug("vgId:%d, start to fetch wal, index:%" PRId64 ", last:%" PRId64 " commit:%" PRId64 ", applied:%" PRId64
           ", 0x%" PRIx64,
           vgId, offset, lastVer, committedVer, appliedVer, id);
 
@@ -240,14 +240,12 @@ END:
   return code;
 }
 
-bool tqGetTablePrimaryKey(STqReader* pReader){
+bool tqGetTablePrimaryKey(STqReader* pReader) { return pReader->hasPrimaryKey; }
-  return pReader->hasPrimaryKey;
-}
 
-void tqSetTablePrimaryKey(STqReader* pReader, int64_t uid){
+void tqSetTablePrimaryKey(STqReader* pReader, int64_t uid) {
   bool            ret = false;
-  SSchemaWrapper *schema = metaGetTableSchema(pReader->pVnodeMeta, uid, -1, 1);
+  SSchemaWrapper* schema = metaGetTableSchema(pReader->pVnodeMeta, uid, -1, 1);
-  if (schema->nCols >= 2 && schema->pSchema[1].flags & COL_IS_KEY){
+  if (schema->nCols >= 2 && schema->pSchema[1].flags & COL_IS_KEY) {
     ret = true;
   }
   tDeleteSchemaWrapper(schema);
@@ -311,10 +309,7 @@ int32_t extractMsgFromWal(SWalReader* pReader, void** pItem, int64_t maxVer, con
   int32_t code = 0;
 
   while (1) {
-    code = walNextValidMsg(pReader);
+    TAOS_CHECK_RETURN(walNextValidMsg(pReader));
-    if (code != TSDB_CODE_SUCCESS) {
-      return code;
-    }
 
     SWalCont* pCont = &pReader->pHead->head;
     int64_t   ver = pCont->version;
@@ -405,7 +400,7 @@ bool tqNextBlockInWal(STqReader* pReader, const char* id, int sourceExcluded) {
     pReader->msg.msgStr = NULL;
 
     int64_t elapsed = taosGetTimestampMs() - st;
-    if(elapsed > 1000 || elapsed < 0){
+    if (elapsed > 1000 || elapsed < 0) {
       return false;
     }
 
@@ -684,7 +679,8 @@ int32_t tqRetrieveDataBlock(STqReader* pReader, SSDataBlock** pRes, const char*
       SColData* pCol = taosArrayGet(pCols, sourceIdx);
       SColVal   colVal;
 
-      tqTrace("lostdata colActual:%d, sourceIdx:%d, targetIdx:%d, numOfCols:%d, source cid:%d, dst cid:%d", colActual, sourceIdx, targetIdx, numOfCols, pCol->cid, pColData->info.colId);
+      tqTrace("lostdata colActual:%d, sourceIdx:%d, targetIdx:%d, numOfCols:%d, source cid:%d, dst cid:%d", colActual,
+              sourceIdx, targetIdx, numOfCols, pCol->cid, pColData->info.colId);
       if (pCol->cid < pColData->info.colId) {
         sourceIdx++;
       } else if (pCol->cid == pColData->info.colId) {

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

@@ -757,10 +757,9 @@ int32_t tsdbReadDataBlk(SDataFReader *pReader, SBlockIdx *pBlockIdx, SMapData *m
   TSDB_CHECK_CODE(code, lino, _exit);
 
   // decode
-  int64_t n = tGetMapData(pReader->aBuf[0], mDataBlk);
+  int32_t n;
-  if (n < 0) {
+  code = tGetMapData(pReader->aBuf[0], mDataBlk, &n);
-    TSDB_CHECK_CODE(code = TSDB_CODE_OUT_OF_MEMORY, lino, _exit);
+  if (code) goto _exit;
-  }
   ASSERT(n == size);
 
 _exit:

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

@@ -81,7 +81,7 @@ static int32_t tsdbFTypeToFRangeType(tsdb_ftype_t ftype) {
 static int32_t tsdbTFileSetToFSetPartition(STFileSet* fset, STsdbFSetPartition** ppSP) {
   STsdbFSetPartition* p = tsdbFSetPartitionCreate();
   if (p == NULL) {
-    goto _err;
+    return terrno;
   }
 
   p->fid = fset->fid;
@@ -134,10 +134,6 @@ static int32_t tsdbTFileSetToFSetPartition(STFileSet* fset, STsdbFSetPartition**
   }
   ppSP[0] = p;
   return 0;
-
-_err:
-  tsdbFSetPartitionClear(&p);
-  return -1;
 }
 
 // fset partition list
@@ -160,9 +156,11 @@ void tsdbFSetPartListDestroy(STsdbFSetPartList** ppList) {
 }
 
 int32_t tsdbFSetPartListToRangeDiff(STsdbFSetPartList* pList, TFileSetRangeArray** ppRanges) {
+  int32_t code = 0;
+
   TFileSetRangeArray* pDiff = taosMemoryCalloc(1, sizeof(TFileSetRangeArray));
   if (pDiff == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    code = TSDB_CODE_OUT_OF_MEMORY;
     goto _err;
   }
   TARRAY2_INIT(pDiff);
@@ -171,7 +169,7 @@ int32_t tsdbFSetPartListToRangeDiff(STsdbFSetPartList* pList, TFileSetRangeArray
   TARRAY2_FOREACH(pList, part) {
     STFileSetRange* r = taosMemoryCalloc(1, sizeof(STFileSetRange));
     if (r == NULL) {
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      code = TSDB_CODE_OUT_OF_MEMORY;
       goto _err;
     }
     int64_t maxVerValid = -1;
@@ -202,7 +200,7 @@ _err:
   if (pDiff) {
     tsdbTFileSetRangeArrayDestroy(&pDiff);
   }
-  return -1;
+  return code;
 }
 
 // serialization
@@ -235,96 +233,103 @@ int32_t tTsdbFSetPartListDataLenCalc(STsdbFSetPartList* pList) {
   return datLen;
 }
 
-int32_t tSerializeTsdbFSetPartList(void* buf, int32_t bufLen, STsdbFSetPartList* pList) {
+static int32_t tSerializeTsdbFSetPartList(void* buf, int32_t bufLen, STsdbFSetPartList* pList, int32_t* encodeSize) {
   SEncoder encoder = {0};
-  tEncoderInit(&encoder, buf, bufLen);
-
   int8_t   reserved8 = 0;
   int16_t  reserved16 = 0;
   int64_t  reserved64 = 0;
-
   int8_t   msgVer = TSDB_SNAP_MSG_VER;
   int32_t  len = TARRAY2_SIZE(pList);
+  int32_t  code = 0;
 
-  if (tStartEncode(&encoder) < 0) goto _err;
+  tEncoderInit(&encoder, buf, bufLen);
-  if (tEncodeI8(&encoder, msgVer) < 0) goto _err;
+  if ((code = tStartEncode(&encoder))) goto _exit;
-  if (tEncodeI32(&encoder, len) < 0) goto _err;
+  if ((code = tEncodeI8(&encoder, msgVer))) goto _exit;
+  if ((code = tEncodeI32(&encoder, len))) goto _exit;
 
   for (int32_t u = 0; u < len; u++) {
     STsdbFSetPartition* p = TARRAY2_GET(pList, u);
-    if (tEncodeI64(&encoder, p->fid) < 0) goto _err;
+    if ((code = tEncodeI64(&encoder, p->fid))) goto _exit;
-    if (tEncodeI8(&encoder, p->stat) < 0) goto _err;
+    if ((code = tEncodeI8(&encoder, p->stat))) goto _exit;
-    if (tEncodeI8(&encoder, reserved8) < 0) goto _err;
+    if ((code = tEncodeI8(&encoder, reserved8))) goto _exit;
-    if (tEncodeI16(&encoder, reserved16) < 0) goto _err;
+    if ((code = tEncodeI16(&encoder, reserved16))) goto _exit;
 
     int32_t typMax = TSDB_FSET_RANGE_TYP_MAX;
-    if (tEncodeI32(&encoder, typMax) < 0) goto _err;
+    if ((code = tEncodeI32(&encoder, typMax))) goto _exit;
 
     for (int32_t i = 0; i < typMax; i++) {
       SVerRangeList* iList = &p->verRanges[i];
       int32_t        iLen = TARRAY2_SIZE(iList);
 
-      if (tEncodeI32(&encoder, iLen) < 0) goto _err;
+      if ((code = tEncodeI32(&encoder, iLen))) goto _exit;
       for (int32_t j = 0; j < iLen; j++) {
         SVersionRange r = TARRAY2_GET(iList, j);
-        if (tEncodeI64(&encoder, r.minVer) < 0) goto _err;
+        if ((code = tEncodeI64(&encoder, r.minVer))) goto _exit;
-        if (tEncodeI64(&encoder, r.maxVer) < 0) goto _err;
+        if ((code = tEncodeI64(&encoder, r.maxVer))) goto _exit;
-        if (tEncodeI64(&encoder, reserved64) < 0) goto _err;
+        if ((code = tEncodeI64(&encoder, reserved64))) goto _exit;
       }
     }
   }
 
   tEndEncode(&encoder);
-  int32_t tlen = encoder.pos;
-  tEncoderClear(&encoder);
-  return tlen;
 
-_err:
+  if (encodeSize) {
+    encodeSize[0] = encoder.pos;
+  }
+
+_exit:
   tEncoderClear(&encoder);
-  return -1;
+  return code;
 }
 
 int32_t tDeserializeTsdbFSetPartList(void* buf, int32_t bufLen, STsdbFSetPartList* pList) {
   SDecoder decoder = {0};
-  tDecoderInit(&decoder, buf, bufLen);
-
   int8_t   reserved8 = 0;
   int16_t  reserved16 = 0;
   int64_t  reserved64 = 0;
+  int32_t  code = 0;
 
   STsdbFSetPartition* p = NULL;
 
+  tDecoderInit(&decoder, buf, bufLen);
   int8_t  msgVer = 0;
   int32_t len = 0;
-  if (tStartDecode(&decoder) < 0) goto _err;
+  if ((code = tStartDecode(&decoder))) goto _err;
-  if (tDecodeI8(&decoder, &msgVer) < 0) goto _err;
+  if ((code = tDecodeI8(&decoder, &msgVer))) goto _err;
-  if (msgVer != TSDB_SNAP_MSG_VER) goto _err;
+  if (msgVer != TSDB_SNAP_MSG_VER) {
-  if (tDecodeI32(&decoder, &len) < 0) goto _err;
+    code = TSDB_CODE_INVALID_MSG;
+    goto _err;
+  }
+  if ((code = tDecodeI32(&decoder, &len))) goto _err;
 
   for (int32_t u = 0; u < len; u++) {
     p = tsdbFSetPartitionCreate();
-    if (p == NULL) goto _err;
+    if (p == NULL) {
-    if (tDecodeI64(&decoder, &p->fid) < 0) goto _err;
+      code = terrno;
-    if (tDecodeI8(&decoder, &p->stat) < 0) goto _err;
+      goto _err;
-    if (tDecodeI8(&decoder, &reserved8) < 0) goto _err;
+    }
-    if (tDecodeI16(&decoder, &reserved16) < 0) goto _err;
+
+    if ((code = tDecodeI64(&decoder, &p->fid))) goto _err;
+    if ((code = tDecodeI8(&decoder, &p->stat))) goto _err;
+    if ((code = tDecodeI8(&decoder, &reserved8))) goto _err;
+    if ((code = tDecodeI16(&decoder, &reserved16))) goto _err;
 
     int32_t typMax = 0;
-    if (tDecodeI32(&decoder, &typMax) < 0) goto _err;
+    if ((code = tDecodeI32(&decoder, &typMax))) goto _err;
 
     for (int32_t i = 0; i < typMax; i++) {
       SVerRangeList* iList = &p->verRanges[i];
       int32_t        iLen = 0;
-      if (tDecodeI32(&decoder, &iLen) < 0) goto _err;
+      if ((code = tDecodeI32(&decoder, &iLen))) goto _err;
       for (int32_t j = 0; j < iLen; j++) {
         SVersionRange r = {0};
-        if (tDecodeI64(&decoder, &r.minVer) < 0) goto _err;
+        if ((code = tDecodeI64(&decoder, &r.minVer))) goto _err;
-        if (tDecodeI64(&decoder, &r.maxVer) < 0) goto _err;
+        if ((code = tDecodeI64(&decoder, &r.maxVer))) goto _err;
-        if (tDecodeI64(&decoder, &reserved64) < 0) goto _err;
+        if ((code = tDecodeI64(&decoder, &reserved64))) goto _err;
-        if (TARRAY2_APPEND(iList, r)) goto _err;
+        if ((code = TARRAY2_APPEND(iList, r))) goto _err;
       }
     }
-    if (TARRAY2_APPEND(pList, p)) goto _err;
+    if ((code = TARRAY2_APPEND(pList, p))) goto _err;
     p = NULL;
   }
 
@@ -337,7 +342,7 @@ _err:
     tsdbFSetPartitionClear(&p);
   }
   tDecoderClear(&decoder);
-  return -1;
+  return code;
 }
 
 // fs state
@@ -352,8 +357,9 @@ static STsdbFSetPartList* tsdbSnapGetFSetPartList(STFileSystem* fs) {
   STFileSet* fset;
   TARRAY2_FOREACH(fs->fSetArr, fset) {
     STsdbFSetPartition* pItem = NULL;
-    if (tsdbTFileSetToFSetPartition(fset, &pItem) < 0) {
+    code = tsdbTFileSetToFSetPartition(fset, &pItem);
-      code = -1;
+    if (code) {
+      terrno = code;
       break;
     }
     ASSERT(pItem != NULL);
@@ -404,7 +410,9 @@ static int32_t tsdbPartitionInfoInit(SVnode* pVnode, STsdbPartitionInfo* pInfo)
   for (int32_t j = 0; j < pInfo->tsdbMaxCnt; ++j) {
     STsdb* pTsdb = SMA_RSMA_GET_TSDB(pVnode, j);
     pInfo->pLists[j] = tsdbSnapGetFSetPartList(pTsdb->pFS);
-    if (pInfo->pLists[j] == NULL) return -1;
+    if (pInfo->pLists[j] == NULL) {
+      return terrno;
+    }
   }
   return 0;
 }
@@ -432,9 +440,10 @@ static int32_t tsdbPartitionInfoSerialize(STsdbPartitionInfo* pInfo, uint8_t* bu
     SSyncTLV* pSubHead = (void*)((char*)buf + offset);
     int32_t   valOffset = offset + sizeof(*pSubHead);
     ASSERT(pSubHead->val == (char*)buf + valOffset);
-    if ((tlen = tSerializeTsdbFSetPartList(pSubHead->val, bufLen - valOffset, pInfo->pLists[j])) < 0) {
+    int32_t code = tSerializeTsdbFSetPartList(pSubHead->val, bufLen - valOffset, pInfo->pLists[j], &tlen);
+    if (code) {
       tsdbError("vgId:%d, failed to serialize fset partition list of tsdb %d since %s", pInfo->vgId, j, terrstr());
-      return -1;
+      return code;
     }
     pSubHead->typ = pInfo->subTyps[j];
     pSubHead->len = tlen;
@@ -460,17 +469,18 @@ static int32_t tTsdbRepOptsDataLenCalc(STsdbRepOpts* pInfo) {
 }
 
 int32_t tSerializeTsdbRepOpts(void* buf, int32_t bufLen, STsdbRepOpts* pOpts) {
+  int32_t  code = 0;
   SEncoder encoder = {0};
-  tEncoderInit(&encoder, buf, bufLen);
-
   int64_t  reserved64 = 0;
   int8_t   msgVer = TSDB_SNAP_MSG_VER;
 
-  if (tStartEncode(&encoder) < 0) goto _err;
+  tEncoderInit(&encoder, buf, bufLen);
-  if (tEncodeI8(&encoder, msgVer) < 0) goto _err;
+
+  if ((code = tStartEncode(&encoder))) goto _err;
+  if ((code = tEncodeI8(&encoder, msgVer))) goto _err;
   int16_t format = pOpts->format;
-  if (tEncodeI16(&encoder, format) < 0) goto _err;
+  if ((code = tEncodeI16(&encoder, format))) goto _err;
-  if (tEncodeI64(&encoder, reserved64) < 0) goto _err;
+  if ((code = tEncodeI64(&encoder, reserved64))) goto _err;
 
   tEndEncode(&encoder);
   int32_t tlen = encoder.pos;
@@ -479,23 +489,24 @@ int32_t tSerializeTsdbRepOpts(void* buf, int32_t bufLen, STsdbRepOpts* pOpts) {
 
 _err:
   tEncoderClear(&encoder);
-  return -1;
+  return code;
 }
 
 int32_t tDeserializeTsdbRepOpts(void* buf, int32_t bufLen, STsdbRepOpts* pOpts) {
+  int32_t  code;
   SDecoder decoder = {0};
-  tDecoderInit(&decoder, buf, bufLen);
-
   int64_t  reserved64 = 0;
   int8_t   msgVer = 0;
 
-  if (tStartDecode(&decoder) < 0) goto _err;
+  tDecoderInit(&decoder, buf, bufLen);
-  if (tDecodeI8(&decoder, &msgVer) < 0) goto _err;
+
+  if ((code = tStartDecode(&decoder))) goto _err;
+  if ((code = tDecodeI8(&decoder, &msgVer))) goto _err;
   if (msgVer != TSDB_SNAP_MSG_VER) goto _err;
   int16_t format = 0;
-  if (tDecodeI16(&decoder, &format) < 0) goto _err;
+  if ((code = tDecodeI16(&decoder, &format))) goto _err;
   pOpts->format = format;
-  if (tDecodeI64(&decoder, &reserved64) < 0) goto _err;
+  if ((code = tDecodeI64(&decoder, &reserved64))) goto _err;
 
   tEndDecode(&decoder);
   tDecoderClear(&decoder);
@@ -503,7 +514,7 @@ int32_t tDeserializeTsdbRepOpts(void* buf, int32_t bufLen, STsdbRepOpts* pOpts)
 
 _err:
   tDecoderClear(&decoder);
-  return -1;
+  return code;
 }
 
 static int32_t tsdbRepOptsEstSize(STsdbRepOpts* pOpts) {
@@ -518,7 +529,7 @@ static int32_t tsdbRepOptsSerialize(STsdbRepOpts* pOpts, void* buf, int32_t bufL
   int32_t   offset = 0;
   int32_t   tlen = 0;
   if ((tlen = tSerializeTsdbRepOpts(pSubHead->val, bufLen, pOpts)) < 0) {
-    return -1;
+    return tlen;
   }
   pSubHead->typ = SNAP_DATA_RAW;
   pSubHead->len = tlen;
@@ -528,8 +539,10 @@ static int32_t tsdbRepOptsSerialize(STsdbRepOpts* pOpts, void* buf, int32_t bufL
 
 // snap info
 static int32_t tsdbSnapPrepDealWithSnapInfo(SVnode* pVnode, SSnapshot* pSnap, STsdbRepOpts* pInfo) {
-  if (!pSnap->data) return 0;
+  if (!pSnap->data) {
-  int32_t code = -1;
+    return 0;
+  }
+  int32_t code = 0;
 
   SSyncTLV* pHead = (void*)pSnap->data;
   int32_t   offset = 0;
@@ -546,30 +559,30 @@ static int32_t tsdbSnapPrepDealWithSnapInfo(SVnode* pVnode, SSnapshot* pSnap, ST
       case SNAP_DATA_RSMA2: {
       } break;
       case SNAP_DATA_RAW: {
-        if (tDeserializeTsdbRepOpts(buf, bufLen, pInfo) < 0) {
+        code = tDeserializeTsdbRepOpts(buf, bufLen, pInfo);
-          terrno = TSDB_CODE_INVALID_DATA_FMT;
+        if (code < 0) {
           tsdbError("vgId:%d, failed to deserialize tsdb rep opts since %s", TD_VID(pVnode), terrstr());
-          goto _out;
+          return code;
         }
       } break;
       default:
+        code = TSDB_CODE_INVALID_MSG;
         tsdbError("vgId:%d, unexpected subfield type of snap info. typ:%d", TD_VID(pVnode), pField->typ);
-        goto _out;
+        return code;
     }
   }
 
-  code = 0;
-_out:
   return code;
 }
 
 int32_t tsdbSnapPrepDescription(SVnode* pVnode, SSnapshot* pSnap) {
   ASSERT(pSnap->type == TDMT_SYNC_PREP_SNAPSHOT || pSnap->type == TDMT_SYNC_PREP_SNAPSHOT_REPLY);
   STsdbPartitionInfo  partitionInfo = {0};
-  int                 code = -1;
+  int                 code = 0;
   STsdbPartitionInfo* pInfo = &partitionInfo;
 
-  if (tsdbPartitionInfoInit(pVnode, pInfo) != 0) {
+  code = tsdbPartitionInfoInit(pVnode, pInfo);
+  if (code) {
     goto _out;
   }
 
@@ -577,7 +590,7 @@ int32_t tsdbSnapPrepDescription(SVnode* pVnode, SSnapshot* pSnap) {
   STsdbRepOpts opts = {.format = TSDB_SNAP_REP_FMT_RAW};
   if (pSnap->type == TDMT_SYNC_PREP_SNAPSHOT_REPLY) {
     STsdbRepOpts leaderOpts = {0};
-    if (tsdbSnapPrepDealWithSnapInfo(pVnode, pSnap, &leaderOpts) < 0) {
+    if ((code = tsdbSnapPrepDealWithSnapInfo(pVnode, pSnap, &leaderOpts)) < 0) {
       tsdbError("vgId:%d, failed to deal with snap info for reply since %s", TD_VID(pVnode), terrstr());
       goto _out;
     }
@@ -589,7 +602,7 @@ int32_t tsdbSnapPrepDescription(SVnode* pVnode, SSnapshot* pSnap) {
   int32_t       bufLen = headLen;
   bufLen += tsdbPartitionInfoEstSize(pInfo);
   bufLen += tsdbRepOptsEstSize(&opts);
-  if (syncSnapInfoDataRealloc(pSnap, bufLen) != 0) {
+  if ((code = syncSnapInfoDataRealloc(pSnap, bufLen)) != 0) {
     tsdbError("vgId:%d, failed to realloc memory for data of snap info. bytes:%d", TD_VID(pVnode), bufLen);
     goto _out;
   }
@@ -599,7 +612,8 @@ int32_t tsdbSnapPrepDescription(SVnode* pVnode, SSnapshot* pSnap) {
   int32_t offset = headLen;
   int32_t tlen = 0;
 
-  if ((tlen = tsdbPartitionInfoSerialize(pInfo, buf + offset, bufLen - offset)) < 0) {
+  if ((tlen = tsdbPartitionInfoSerialize(pInfo, (uint8_t*)(buf + offset), bufLen - offset)) < 0) {
+    code = tlen;
     tsdbError("vgId:%d, failed to serialize tsdb partition info since %s", TD_VID(pVnode), terrstr());
     goto _out;
   }
@@ -607,6 +621,7 @@ int32_t tsdbSnapPrepDescription(SVnode* pVnode, SSnapshot* pSnap) {
   ASSERT(offset <= bufLen);
 
   if ((tlen = tsdbRepOptsSerialize(&opts, buf + offset, bufLen - offset)) < 0) {
+    code = tlen;
     tsdbError("vgId:%d, failed to serialize tsdb rep opts since %s", TD_VID(pVnode), terrstr());
     goto _out;
   }
@@ -620,7 +635,7 @@ int32_t tsdbSnapPrepDescription(SVnode* pVnode, SSnapshot* pSnap) {
 
   tsdbInfo("vgId:%d, tsdb snap info prepared. type:%s, val length:%d", TD_VID(pVnode), TMSG_INFO(pHead->typ),
            pHead->len);
-  code = 0;
+
 _out:
   tsdbPartitionInfoClear(pInfo);
   return code;

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

@@ -152,7 +152,7 @@ int32_t tPutMapData(uint8_t *p, SMapData *pMapData) {
 }
 #endif
 
-int32_t tGetMapData(uint8_t *p, SMapData *pMapData) {
+int32_t tGetMapData(uint8_t *p, SMapData *pMapData, int32_t *decodedSize) {
   int32_t n = 0;
   int32_t offset;
 
@@ -160,7 +160,9 @@ int32_t tGetMapData(uint8_t *p, SMapData *pMapData) {
 
   n += tGetI32v(p + n, &pMapData->nItem);
   if (pMapData->nItem) {
-    if (tRealloc((uint8_t **)&pMapData->aOffset, sizeof(int32_t) * pMapData->nItem)) return -1;
+    if (tRealloc((uint8_t **)&pMapData->aOffset, sizeof(int32_t) * pMapData->nItem)) {
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
 
     int32_t lOffset = 0;
     for (int32_t iItem = 0; iItem < pMapData->nItem; iItem++) {
@@ -170,12 +172,18 @@ int32_t tGetMapData(uint8_t *p, SMapData *pMapData) {
     }
 
     n += tGetI32v(p + n, &pMapData->nData);
-    if (tRealloc(&pMapData->pData, pMapData->nData)) return -1;
+    if (tRealloc(&pMapData->pData, pMapData->nData)) {
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
     memcpy(pMapData->pData, p + n, pMapData->nData);
     n += pMapData->nData;
   }
 
-  return n;
+  if (decodedSize) {
+    *decodedSize = n;
+  }
+
+  return 0;
 }
 
 #ifdef BUILD_NO_CALL
@@ -680,20 +688,17 @@ int32_t tsdbRowCompareWithoutVersion(const void *p1, const void *p2) {
 
 // STSDBRowIter ======================================================
 int32_t tsdbRowIterOpen(STSDBRowIter *pIter, TSDBROW *pRow, STSchema *pTSchema) {
-  int32_t code = 0;
-
   pIter->pRow = pRow;
   if (pRow->type == TSDBROW_ROW_FMT) {
-    code = tRowIterOpen(pRow->pTSRow, pTSchema, &pIter->pIter);
+    int32_t code = tRowIterOpen(pRow->pTSRow, pTSchema, &pIter->pIter);
-    if (code) goto _exit;
+    if (code) return code;
   } else if (pRow->type == TSDBROW_COL_FMT) {
     pIter->iColData = 0;
   } else {
     ASSERT(0);
   }
 
-_exit:
+  return 0;
-  return code;
 }
 
 void tsdbRowClose(STSDBRowIter *pIter) {
@@ -760,7 +765,9 @@ int32_t tsdbRowMergerAdd(SRowMerger *pMerger, TSDBROW *pRow, STSchema *pTSchema)
         --iCol;
         continue;
       } else if (pTSchema->columns[jCol].colId > pTColumn->colId) {
-        taosArrayPush(pMerger->pArray, &COL_VAL_NONE(pTColumn->colId, pTColumn->type));
+        if (taosArrayPush(pMerger->pArray, &COL_VAL_NONE(pTColumn->colId, pTColumn->type)) == NULL) {
+          return TSDB_CODE_OUT_OF_MEMORY;
+        }
         continue;
       }
 
@@ -780,14 +787,15 @@ int32_t tsdbRowMergerAdd(SRowMerger *pMerger, TSDBROW *pRow, STSchema *pTSchema)
       }
 
       if (taosArrayPush(pMerger->pArray, pColVal) == NULL) {
-        code = TSDB_CODE_OUT_OF_MEMORY;
+        return TSDB_CODE_OUT_OF_MEMORY;
-        return code;
       }
     }
 
     for (; iCol < pMerger->pTSchema->numOfCols; ++iCol) {
       pTColumn = &pMerger->pTSchema->columns[iCol];
-      taosArrayPush(pMerger->pArray, &COL_VAL_NONE(pTColumn->colId, pTColumn->type));
+      if (taosArrayPush(pMerger->pArray, &COL_VAL_NONE(pTColumn->colId, pTColumn->type)) == NULL) {
+        return TSDB_CODE_OUT_OF_MEMORY;
+      }
     }
 
     pMerger->version = key.version;
@@ -962,8 +970,7 @@ _exit:
 */
 
 // delete skyline ======================================================
-static int32_t tsdbMergeSkyline(SArray *pSkyline1, SArray *pSkyline2, SArray *pSkyline) {
+static void tsdbMergeSkyline(SArray *pSkyline1, SArray *pSkyline2, SArray *pSkyline) {
-  int32_t  code = 0;
   int32_t  i1 = 0;
   int32_t  n1 = taosArrayGetSize(pSkyline1);
   int32_t  i2 = 0;
@@ -1017,7 +1024,6 @@ static int32_t tsdbMergeSkyline(SArray *pSkyline1, SArray *pSkyline2, SArray *pS
   }
 
   pSkyline->size = TARRAY_ELEM_IDX(pSkyline, pItem);
-  return code;
 }
 
 int32_t tsdbBuildDeleteSkylineImpl(SArray *aSkyline, int32_t sidx, int32_t eidx, SArray *pSkyline) {
@@ -1029,8 +1035,13 @@ int32_t tsdbBuildDeleteSkylineImpl(SArray *aSkyline, int32_t sidx, int32_t eidx,
   if (sidx == eidx) {
     TSDBKEY *pItem1 = taosArrayGet(aSkyline, sidx * 2);
     TSDBKEY *pItem2 = taosArrayGet(aSkyline, sidx * 2 + 1);
-    taosArrayPush(pSkyline, &pItem1);
+    if (taosArrayPush(pSkyline, &pItem1) == NULL) {
-    taosArrayPush(pSkyline, &pItem2);
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
+
+    if (taosArrayPush(pSkyline, &pItem2) == NULL) {
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
   } else {
     SArray *pSkyline1 = NULL;
     SArray *pSkyline2 = NULL;
@@ -1049,7 +1060,7 @@ int32_t tsdbBuildDeleteSkylineImpl(SArray *aSkyline, int32_t sidx, int32_t eidx,
     code = tsdbBuildDeleteSkylineImpl(aSkyline, midx + 1, eidx, pSkyline2);
     if (code) goto _clear;
 
-    code = tsdbMergeSkyline(pSkyline1, pSkyline2, pSkyline);
+    tsdbMergeSkyline(pSkyline1, pSkyline2, pSkyline);
 
   _clear:
     taosArrayDestroy(pSkyline1);
@@ -1064,13 +1075,28 @@ int32_t tsdbBuildDeleteSkyline(SArray *aDelData, int32_t sidx, int32_t eidx, SAr
   int32_t   code = 0;
   int32_t   dataNum = eidx - sidx + 1;
   SArray   *aTmpSkyline = taosArrayInit(dataNum * 2, sizeof(TSDBKEY));
+  if (aTmpSkyline == NULL) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
+
   SArray *pSkyline = taosArrayInit(dataNum * 2, POINTER_BYTES);
+  if (pSkyline == NULL) {
+    taosArrayDestroy(aTmpSkyline);
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
 
   taosArrayClear(aSkyline);
   for (int32_t i = sidx; i <= eidx; ++i) {
     pDelData = (SDelData *)taosArrayGet(aDelData, i);
-    taosArrayPush(aTmpSkyline, &(TSDBKEY){.ts = pDelData->sKey, .version = pDelData->version});
+    if (taosArrayPush(aTmpSkyline, &(TSDBKEY){.ts = pDelData->sKey, .version = pDelData->version}) == NULL) {
-    taosArrayPush(aTmpSkyline, &(TSDBKEY){.ts = pDelData->eKey, .version = 0});
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      goto _clear;
+    }
+
+    if (taosArrayPush(aTmpSkyline, &(TSDBKEY){.ts = pDelData->eKey, .version = 0}) == NULL) {
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      goto _clear;
+    }
   }
 
   code = tsdbBuildDeleteSkylineImpl(aTmpSkyline, sidx, eidx, pSkyline);
@@ -1079,7 +1105,10 @@ int32_t tsdbBuildDeleteSkyline(SArray *aDelData, int32_t sidx, int32_t eidx, SAr
   int32_t skylineNum = taosArrayGetSize(pSkyline);
   for (int32_t i = 0; i < skylineNum; ++i) {
     TSDBKEY *p = taosArrayGetP(pSkyline, i);
-    taosArrayPush(aSkyline, p);
+    if (taosArrayPush(aSkyline, p) == NULL) {
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      goto _clear;
+    }
   }
 
 _clear:
@@ -1519,8 +1548,8 @@ int32_t tBlockDataDecompress(SBufferReader *br, SBlockData *blockData, SBuffer *
     SBlockCol blockCol;
 
     code = tGetBlockCol(&br2, &blockCol, hdr.fmtVer, hdr.cmprAlg);
-    if (blockCol.alg == 0) blockCol.alg = hdr.cmprAlg;
     TSDB_CHECK_CODE(code, lino, _exit);
+    if (blockCol.alg == 0) blockCol.alg = hdr.cmprAlg;
     code = tBlockDataDecompressColData(&hdr, &blockCol, br, blockData, assist);
     TSDB_CHECK_CODE(code, lino, _exit);
   }
@@ -1812,7 +1841,9 @@ int32_t tsdbGetColCmprAlgFromSet(SHashObj *set, int16_t colId, uint32_t *alg) {
   if (set == NULL) return -1;
 
   uint32_t *ret = taosHashGet(set, &colId, sizeof(colId));
-  if (ret == NULL) return -1;
+  if (ret == NULL) {
+    return TSDB_CODE_NOT_FOUND;
+  }
 
   *alg = *ret;
   return 0;

source/dnode/vnode/src/vnd/vnodeQuery.c

@@ -47,7 +47,7 @@ int32_t fillTableColCmpr(SMetaReader *reader, SSchemaExt *pExt, int32_t numOfCol
   return 0;
 }
 
-int vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
+int32_t vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
   STableInfoReq  infoReq = {0};
   STableMetaRsp  metaRsp = {0};
   SMetaReader    mer1 = {0};
@@ -62,15 +62,15 @@ int vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
 
   // decode req
   if (tDeserializeSTableInfoReq(pMsg->pCont, pMsg->contLen, &infoReq) != 0) {
-    code = TSDB_CODE_INVALID_MSG;
+    code = terrno;
     goto _exit4;
   }
 
   metaRsp.dbId = pVnode->config.dbId;
-  strcpy(metaRsp.tbName, infoReq.tbName);
+  (void)strcpy(metaRsp.tbName, infoReq.tbName);
-  memcpy(metaRsp.dbFName, infoReq.dbFName, sizeof(metaRsp.dbFName));
+  (void)memcpy(metaRsp.dbFName, infoReq.dbFName, sizeof(metaRsp.dbFName));
 
-  sprintf(tableFName, "%s.%s", infoReq.dbFName, infoReq.tbName);
+  (void)sprintf(tableFName, "%s.%s", infoReq.dbFName, infoReq.tbName);
   code = vnodeValidateTableHash(pVnode, tableFName);
   if (code) {
     goto _exit4;
@@ -89,7 +89,7 @@ int vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
   metaRsp.tuid = mer1.me.uid;
 
   if (mer1.me.type == TSDB_SUPER_TABLE) {
-    strcpy(metaRsp.stbName, mer1.me.name);
+    (void)strcpy(metaRsp.stbName, mer1.me.name);
     schema = mer1.me.stbEntry.schemaRow;
     schemaTag = mer1.me.stbEntry.schemaTag;
     metaRsp.suid = mer1.me.uid;
@@ -97,7 +97,7 @@ int vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
     metaReaderDoInit(&mer2, pVnode->pMeta, META_READER_NOLOCK);
     if (metaReaderGetTableEntryByUid(&mer2, mer1.me.ctbEntry.suid) < 0) goto _exit2;
 
-    strcpy(metaRsp.stbName, mer2.me.name);
+    (void)strcpy(metaRsp.stbName, mer2.me.name);
     metaRsp.suid = mer2.me.uid;
     schema = mer2.me.stbEntry.schemaRow;
     schemaTag = mer2.me.stbEntry.schemaTag;
@@ -114,10 +114,13 @@ int vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
   metaRsp.tversion = schemaTag.version;
   metaRsp.pSchemas = (SSchema *)taosMemoryMalloc(sizeof(SSchema) * (metaRsp.numOfColumns + metaRsp.numOfTags));
   metaRsp.pSchemaExt = (SSchemaExt *)taosMemoryCalloc(metaRsp.numOfColumns, sizeof(SSchemaExt));
-
+  if (NULL == metaRsp.pSchemas || NULL == metaRsp.pSchemaExt) {
-  memcpy(metaRsp.pSchemas, schema.pSchema, sizeof(SSchema) * schema.nCols);
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    goto _exit;
+  }
+  (void)memcpy(metaRsp.pSchemas, schema.pSchema, sizeof(SSchema) * schema.nCols);
   if (schemaTag.nCols) {
-    memcpy(metaRsp.pSchemas + schema.nCols, schemaTag.pSchema, sizeof(SSchema) * schemaTag.nCols);
+    (void)memcpy(metaRsp.pSchemas + schema.nCols, schemaTag.pSchema, sizeof(SSchema) * schemaTag.nCols);
   }
   if (metaRsp.pSchemaExt) {
     SMetaReader *pReader = mer1.me.type == TSDB_CHILD_TABLE ? &mer2 : &mer1;
@@ -134,7 +137,7 @@ int vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
   // encode and send response
   rspLen = tSerializeSTableMetaRsp(NULL, 0, &metaRsp);
   if (rspLen < 0) {
-    code = TSDB_CODE_INVALID_MSG;
+    code = terrno;
     goto _exit;
   }
 
@@ -148,7 +151,12 @@ int vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
     code = TSDB_CODE_OUT_OF_MEMORY;
     goto _exit;
   }
-  tSerializeSTableMetaRsp(pRsp, rspLen, &metaRsp);
+
+  rspLen = tSerializeSTableMetaRsp(pRsp, rspLen, &metaRsp);
+  if (rspLen < 0) {
+    code = terrno;
+    goto _exit;
+  }
 
 _exit:
   taosMemoryFree(metaRsp.pSchemas);
@@ -174,10 +182,10 @@ _exit4:
     *pMsg = rpcMsg;
   }
 
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
-int vnodeGetTableCfg(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
+int32_t vnodeGetTableCfg(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
   STableCfgReq   cfgReq = {0};
   STableCfgRsp   cfgRsp = {0};
   SMetaReader    mer1 = {0};
@@ -192,14 +200,14 @@ int vnodeGetTableCfg(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
 
   // decode req
   if (tDeserializeSTableCfgReq(pMsg->pCont, pMsg->contLen, &cfgReq) != 0) {
-    code = TSDB_CODE_INVALID_MSG;
+    code = terrno;
     goto _exit;
   }
 
-  strcpy(cfgRsp.tbName, cfgReq.tbName);
+  (void)strcpy(cfgRsp.tbName, cfgReq.tbName);
-  memcpy(cfgRsp.dbFName, cfgReq.dbFName, sizeof(cfgRsp.dbFName));
+  (void)memcpy(cfgRsp.dbFName, cfgReq.dbFName, sizeof(cfgRsp.dbFName));
 
-  sprintf(tableFName, "%s.%s", cfgReq.dbFName, cfgReq.tbName);
+  (void)sprintf(tableFName, "%s.%s", cfgReq.dbFName, cfgReq.tbName);
   code = vnodeValidateTableHash(pVnode, tableFName);
   if (code) {
     goto _exit;
@@ -222,24 +230,36 @@ int vnodeGetTableCfg(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
     metaReaderDoInit(&mer2, pVnode->pMeta, META_READER_LOCK);
     if (metaReaderGetTableEntryByUid(&mer2, mer1.me.ctbEntry.suid) < 0) goto _exit;
 
-    strcpy(cfgRsp.stbName, mer2.me.name);
+    (void)strcpy(cfgRsp.stbName, mer2.me.name);
     schema = mer2.me.stbEntry.schemaRow;
     schemaTag = mer2.me.stbEntry.schemaTag;
     cfgRsp.ttl = mer1.me.ctbEntry.ttlDays;
     cfgRsp.commentLen = mer1.me.ctbEntry.commentLen;
     if (mer1.me.ctbEntry.commentLen > 0) {
       cfgRsp.pComment = taosStrdup(mer1.me.ctbEntry.comment);
+      if (NULL == cfgRsp.pComment) {
+        code = TSDB_CODE_OUT_OF_MEMORY;
+        goto _exit;
+      }
     }
     STag *pTag = (STag *)mer1.me.ctbEntry.pTags;
     cfgRsp.tagsLen = pTag->len;
     cfgRsp.pTags = taosMemoryMalloc(cfgRsp.tagsLen);
-    memcpy(cfgRsp.pTags, pTag, cfgRsp.tagsLen);
+    if (NULL == cfgRsp.pTags) {
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      goto _exit;
+    }
+    (void)memcpy(cfgRsp.pTags, pTag, cfgRsp.tagsLen);
   } else if (mer1.me.type == TSDB_NORMAL_TABLE) {
     schema = mer1.me.ntbEntry.schemaRow;
     cfgRsp.ttl = mer1.me.ntbEntry.ttlDays;
     cfgRsp.commentLen = mer1.me.ntbEntry.commentLen;
     if (mer1.me.ntbEntry.commentLen > 0) {
       cfgRsp.pComment = taosStrdup(mer1.me.ntbEntry.comment);
+      if (NULL == cfgRsp.pComment) {
+        code = TSDB_CODE_OUT_OF_MEMORY;
+        goto _exit;
+      }
     }
   } else {
     ASSERT(0);
@@ -250,9 +270,13 @@ int vnodeGetTableCfg(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
   cfgRsp.pSchemas = (SSchema *)taosMemoryMalloc(sizeof(SSchema) * (cfgRsp.numOfColumns + cfgRsp.numOfTags));
   cfgRsp.pSchemaExt = (SSchemaExt *)taosMemoryMalloc(cfgRsp.numOfColumns * sizeof(SSchemaExt));
 
-  memcpy(cfgRsp.pSchemas, schema.pSchema, sizeof(SSchema) * schema.nCols);
+  if (NULL == cfgRsp.pSchemas || NULL == cfgRsp.pSchemaExt) {
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    goto _exit;
+  }
+  (void)memcpy(cfgRsp.pSchemas, schema.pSchema, sizeof(SSchema) * schema.nCols);
   if (schemaTag.nCols) {
-    memcpy(cfgRsp.pSchemas + schema.nCols, schemaTag.pSchema, sizeof(SSchema) * schemaTag.nCols);
+    (void)memcpy(cfgRsp.pSchemas + schema.nCols, schemaTag.pSchema, sizeof(SSchema) * schemaTag.nCols);
   }
 
   // if (useCompress(cfgRsp.tableType)) {
@@ -271,7 +295,7 @@ int vnodeGetTableCfg(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
   // encode and send response
   rspLen = tSerializeSTableCfgRsp(NULL, 0, &cfgRsp);
   if (rspLen < 0) {
-    code = TSDB_CODE_INVALID_MSG;
+    code = terrno;
     goto _exit;
   }
 
@@ -285,7 +309,12 @@ int vnodeGetTableCfg(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
     code = TSDB_CODE_OUT_OF_MEMORY;
     goto _exit;
   }
-  tSerializeSTableCfgRsp(pRsp, rspLen, &cfgRsp);
+
+  rspLen = tSerializeSTableCfgRsp(pRsp, rspLen, &cfgRsp);
+  if (rspLen < 0) {
+    code = terrno;
+    goto _exit;
+  }
 
 _exit:
   rpcMsg.info = pMsg->info;
@@ -307,7 +336,7 @@ _exit:
   tFreeSTableCfgRsp(&cfgRsp);
   metaReaderClear(&mer2);
   metaReaderClear(&mer1);
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 static FORCE_INLINE void vnodeFreeSBatchRspMsg(void *p) {
@@ -331,7 +360,7 @@ int32_t vnodeGetBatchMeta(SVnode *pVnode, SRpcMsg *pMsg) {
   void        *pRsp = NULL;
 
   if (tDeserializeSBatchReq(pMsg->pCont, pMsg->contLen, &batchReq)) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    code = terrno;
     qError("tDeserializeSBatchReq failed");
     goto _exit;
   }
@@ -352,6 +381,10 @@ int32_t vnodeGetBatchMeta(SVnode *pVnode, SRpcMsg *pMsg) {
 
   for (int32_t i = 0; i < msgNum; ++i) {
     req = taosArrayGet(batchReq.pMsgs, i);
+    if (req == NULL) {
+      code = TSDB_CODE_OUT_OF_RANGE;
+      goto _exit;
+    }
 
     reqMsg.msgType = req->msgType;
     reqMsg.pCont = req->msg;
@@ -359,13 +392,16 @@ int32_t vnodeGetBatchMeta(SVnode *pVnode, SRpcMsg *pMsg) {
 
     switch (req->msgType) {
       case TDMT_VND_TABLE_META:
-        vnodeGetTableMeta(pVnode, &reqMsg, false);
+        // error code has been set into reqMsg, no need to handle it here.
+        (void)vnodeGetTableMeta(pVnode, &reqMsg, false);
         break;
       case TDMT_VND_TABLE_CFG:
-        vnodeGetTableCfg(pVnode, &reqMsg, false);
+        // error code has been set into reqMsg, no need to handle it here.
+        (void)vnodeGetTableCfg(pVnode, &reqMsg, false);
         break;
       case TDMT_VND_GET_STREAM_PROGRESS:
-        vnodeGetStreamProgress(pVnode, &reqMsg, false);
+        // error code has been set into reqMsg, no need to handle it here.
+        (void)vnodeGetStreamProgress(pVnode, &reqMsg, false);
         break;
       default:
         qError("invalid req msgType %d", req->msgType);
@@ -381,24 +417,28 @@ int32_t vnodeGetBatchMeta(SVnode *pVnode, SRpcMsg *pMsg) {
     rsp.rspCode = reqMsg.code;
     rsp.msg = reqMsg.pCont;
 
-    taosArrayPush(batchRsp.pRsps, &rsp);
+    if (NULL == taosArrayPush(batchRsp.pRsps, &rsp)) {
+      qError("taosArrayPush failed");
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      goto _exit;
+    }
   }
 
   rspSize = tSerializeSBatchRsp(NULL, 0, &batchRsp);
   if (rspSize < 0) {
     qError("tSerializeSBatchRsp failed");
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    code = terrno;
     goto _exit;
   }
   pRsp = rpcMallocCont(rspSize);
   if (pRsp == NULL) {
     qError("rpcMallocCont %d failed", rspSize);
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    code = terrno;
     goto _exit;
   }
   if (tSerializeSBatchRsp(pRsp, rspSize, &batchRsp) < 0) {
     qError("tSerializeSBatchRsp %d failed", rspSize);
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    code = terrno;
     goto _exit;
   }
 
@@ -501,7 +541,12 @@ int32_t vnodeGetTableList(void *pVnode, int8_t type, SArray *pList) {
 }
 
 int32_t vnodeGetAllTableList(SVnode *pVnode, uint64_t uid, SArray *list) {
+  int32_t code = TSDB_CODE_SUCCESS;
   SMCtbCursor *pCur = metaOpenCtbCursor(pVnode, uid, 1);
+  if (NULL == pCur) {
+    qError("vnode get all table list failed");
+    return TSDB_CODE_FAILED;
+  }
 
   while (1) {
     tb_uid_t id = metaCtbCursorNext(pCur);
@@ -510,11 +555,15 @@ int32_t vnodeGetAllTableList(SVnode *pVnode, uint64_t uid, SArray *list) {
     }
 
     STableKeyInfo info = {uid = id};
-    taosArrayPush(list, &info);
+    if (NULL == taosArrayPush(list, &info)) {
+      qError("taosArrayPush failed");
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      goto _exit;
     }
-
+  }
+_exit:
   metaCloseCtbCursor(pCur);
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 int32_t vnodeGetCtbIdListByFilter(SVnode *pVnode, int64_t suid, SArray *list, bool (*filter)(void *arg), void *arg) {
@@ -522,8 +571,13 @@ int32_t vnodeGetCtbIdListByFilter(SVnode *pVnode, int64_t suid, SArray *list, bo
 }
 
 int32_t vnodeGetCtbIdList(void *pVnode, int64_t suid, SArray *list) {
+  int32_t code = TSDB_CODE_SUCCESS;
   SVnode      *pVnodeObj = pVnode;
   SMCtbCursor *pCur = metaOpenCtbCursor(pVnodeObj, suid, 1);
+  if (NULL == pCur) {
+    qError("vnode get all table list failed");
+    return TSDB_CODE_FAILED;
+  }
 
   while (1) {
     tb_uid_t id = metaCtbCursorNext(pCur);
@@ -531,14 +585,20 @@ int32_t vnodeGetCtbIdList(void *pVnode, int64_t suid, SArray *list) {
       break;
     }
 
-    taosArrayPush(list, &id);
+    if (NULL == taosArrayPush(list, &id))  {
+      qError("taosArrayPush failed");
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      goto _exit;
+    }
   }
 
+_exit:
   metaCloseCtbCursor(pCur);
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 int32_t vnodeGetStbIdList(SVnode *pVnode, int64_t suid, SArray *list) {
+  int32_t code = TSDB_CODE_SUCCESS;
   SMStbCursor *pCur = metaOpenStbCursor(pVnode->pMeta, suid);
   if (!pCur) {
     return TSDB_CODE_FAILED;
@@ -550,15 +610,21 @@ int32_t vnodeGetStbIdList(SVnode *pVnode, int64_t suid, SArray *list) {
       break;
     }
 
-    taosArrayPush(list, &id);
+    if (NULL == taosArrayPush(list, &id))  {
+      qError("taosArrayPush failed");
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      goto _exit;
+    }
   }
 
+_exit:
   metaCloseStbCursor(pCur);
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 int32_t vnodeGetStbIdListByFilter(SVnode *pVnode, int64_t suid, SArray *list, bool (*filter)(void *arg, void *arg1),
                                   void *arg) {
+  int32_t code = TSDB_CODE_SUCCESS;
   SMStbCursor *pCur = metaOpenStbCursor(pVnode->pMeta, suid);
   if (!pCur) {
     return TSDB_CODE_FAILED;
@@ -574,11 +640,16 @@ int32_t vnodeGetStbIdListByFilter(SVnode *pVnode, int64_t suid, SArray *list, bo
       continue;
     }
 
-    taosArrayPush(list, &id);
+    if (NULL == taosArrayPush(list, &id))  {
+      qError("taosArrayPush failed");
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      goto _exit;
+    }
   }
 
+_exit:
   metaCloseStbCursor(pCur);
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 int32_t vnodeGetCtbNum(SVnode *pVnode, int64_t suid, int64_t *num) {
@@ -700,16 +771,20 @@ int32_t vnodeGetTimeSeriesNum(SVnode *pVnode, int64_t *num) {
 
   *num = 0;
   int64_t arrSize = taosArrayGetSize(suidList);
+  int32_t code = TSDB_CODE_SUCCESS;
   for (int64_t i = 0; i < arrSize; ++i) {
     tb_uid_t suid = *(tb_uid_t *)taosArrayGet(suidList, i);
 
     int64_t ctbNum = 0;
     int32_t numOfCols = 0;
-    metaGetStbStats(pVnode, suid, &ctbNum, &numOfCols);
+    code = metaGetStbStats(pVnode, suid, &ctbNum, &numOfCols);
-
+    if (TSDB_CODE_SUCCESS != code) {
+      goto _exit;
+    }
     *num += ctbNum * (numOfCols - 1);
   }
 
+_exit:
   taosArrayDestroy(suidList);
   return TSDB_CODE_SUCCESS;
 }
@@ -728,7 +803,11 @@ int32_t vnodeGetAllCtbNum(SVnode *pVnode, int64_t *num) {
     }
 
     int64_t ctbNum = 0;
-    vnodeGetCtbNum(pVnode, id, &ctbNum);
+    int32_t code = vnodeGetCtbNum(pVnode, id, &ctbNum);
+    if (TSDB_CODE_SUCCESS != code) {
+      metaCloseStbCursor(pCur);
+      return code;
+    }
 
     *num += ctbNum;
   }
@@ -771,14 +850,17 @@ int32_t vnodeGetStreamProgress(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
     rsp.vgId = req.vgId;
     rsp.streamId = req.streamId;
     rspLen = tSerializeStreamProgressRsp(0, 0, &rsp);
+    if (rspLen < 0) {
+      code = terrno;
+      goto _OVER;
+    }
     if (direct) {
       buf = rpcMallocCont(rspLen);
     } else {
       buf = taosMemoryCalloc(1, rspLen);
     }
     if (!buf) {
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      code = TSDB_CODE_OUT_OF_MEMORY;
-      code = -1;
       goto _OVER;
     }
   }
@@ -787,7 +869,11 @@ int32_t vnodeGetStreamProgress(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
     code = tqGetStreamExecInfo(pVnode, req.streamId, &rsp.progressDelay, &rsp.fillHisFinished);
   }
   if (code == TSDB_CODE_SUCCESS) {
-    tSerializeStreamProgressRsp(buf, rspLen, &rsp);
+    rspLen = tSerializeStreamProgressRsp(buf, rspLen, &rsp);
+    if (rspLen < 0) {
+      code = terrno;
+      goto _OVER;
+    }
     rpcMsg.pCont = buf;
     buf = NULL;
     rpcMsg.contLen = rspLen;

source/dnode/vnode/src/vnd/vnodeSnapshot.c

@@ -312,8 +312,7 @@ int32_t vnodeSnapRead(SVSnapReader *pReader, uint8_t **ppData, uint32_t *nData)
       goto _exit;
     } else {
       pReader->metaDone = 1;
-      code = metaSnapReaderClose(&pReader->pMetaReader);
+      metaSnapReaderClose(&pReader->pMetaReader);
-      TSDB_CHECK_CODE(code, lino, _exit);
     }
   }
 

source/libs/executor/inc/executil.h

@@ -165,7 +165,8 @@ SSDataBlock* createDataBlockFromDescNode(SDataBlockDescNode* pNode);
 int32_t      prepareDataBlockBuf(SSDataBlock* pDataBlock, SColMatchInfo* pMatchInfo);
 
 EDealRes doTranslateTagExpr(SNode** pNode, void* pContext);
-int32_t  getGroupIdFromTagsVal(void* pVnode, uint64_t uid, SNodeList* pGroupNode, char* keyBuf, uint64_t* pGroupId, SStorageAPI* pAPI);
+int32_t  getGroupIdFromTagsVal(void* pVnode, uint64_t uid, SNodeList* pGroupNode, char* keyBuf, uint64_t* pGroupId,
+                               SStorageAPI* pAPI);
 size_t   getTableTagsBufLen(const SNodeList* pGroups);
 
 SArray* createSortInfo(SNodeList* pNodeList);
@@ -173,18 +174,20 @@ SArray* makeColumnArrayFromList(SNodeList* pNodeList);
 int32_t extractColMatchInfo(SNodeList* pNodeList, SDataBlockDescNode* pOutputNodeList, int32_t* numOfOutputCols,
                             int32_t type, SColMatchInfo* pMatchInfo);
 
-void       createExprFromOneNode(SExprInfo* pExp, SNode* pNode, int16_t slotId);
+int32_t    createExprFromOneNode(SExprInfo* pExp, SNode* pNode, int16_t slotId);
-void       createExprFromTargetNode(SExprInfo* pExp, STargetNode* pTargetNode);
+int32_t       createExprFromTargetNode(SExprInfo* pExp, STargetNode* pTargetNode);
 SExprInfo* createExprInfo(SNodeList* pNodeList, SNodeList* pGroupKeys, int32_t* numOfExprs);
 
-SqlFunctionCtx* createSqlFunctionCtx(SExprInfo* pExprInfo, int32_t numOfOutput, int32_t** rowEntryInfoOffset, SFunctionStateStore* pStore);
+SqlFunctionCtx* createSqlFunctionCtx(SExprInfo* pExprInfo, int32_t numOfOutput, int32_t** rowEntryInfoOffset,
-void relocateColumnData(SSDataBlock* pBlock, const SArray* pColMatchInfo, SArray* pCols, bool outputEveryColumn);
+                                     SFunctionStateStore* pStore);
+int32_t relocateColumnData(SSDataBlock* pBlock, const SArray* pColMatchInfo, SArray* pCols, bool outputEveryColumn);
 int32_t initExecTimeWindowInfo(SColumnInfoData* pColData, STimeWindow* pQueryWindow);
 
 SInterval extractIntervalInfo(const STableScanPhysiNode* pTableScanNode);
 SColumn   extractColumnFromColumnNode(SColumnNode* pColNode);
 
-int32_t initQueryTableDataCond(SQueryTableDataCond* pCond, const STableScanPhysiNode* pTableScanNode, const SReadHandle* readHandle);
+int32_t initQueryTableDataCond(SQueryTableDataCond* pCond, const STableScanPhysiNode* pTableScanNode,
+                               const SReadHandle* readHandle);
 void    cleanupQueryTableDataCond(SQueryTableDataCond* pCond);
 
 int32_t convertFillType(int32_t mode);
@@ -214,7 +217,7 @@ int32_t buildKeys(char* keyBuf, const SArray* pSortGroupCols, const SSDataBlock*
 int32_t compKeys(const SArray* pSortGroupCols, const char* oldkeyBuf, int32_t oldKeysLen, const SSDataBlock* pDataBlock,
                  int32_t rowIndex);
 
-uint64_t calcGroupId(char *pData, int32_t len);
+uint64_t calcGroupId(char* pData, int32_t len);
 
 SNodeList* makeColsNodeArrFromSortKeys(SNodeList* pSortKeys);
 

source/libs/executor/inc/executorInt.h

@@ -903,7 +903,7 @@ int32_t appendDataToSpecialBlock(SSDataBlock* pBlock, TSKEY* pStartTs, TSKEY* pE
 
 uint64_t calGroupIdByData(SPartitionBySupporter* pParSup, SExprSupp* pExprSup, SSDataBlock* pBlock, int32_t rowId);
 
-int32_t finalizeResultRows(SDiskbasedBuf* pBuf, SResultRowPosition* resultRowPosition, SExprSupp* pSup,
+void finalizeResultRows(SDiskbasedBuf* pBuf, SResultRowPosition* resultRowPosition, SExprSupp* pSup,
                            SSDataBlock* pBlock, SExecTaskInfo* pTaskInfo);
 
 bool    groupbyTbname(SNodeList* pGroupList);

source/libs/executor/inc/tfill.h

@@ -20,6 +20,7 @@
 extern "C" {
 #endif
 
+#include "executil.h"
 #include "os.h"
 #include "taosdef.h"
 #include "tcommon.h"
@@ -77,6 +78,7 @@ typedef struct SFillInfo {
   SFillColInfo*    pFillCol;  // column info for fill operations
   SFillTagColInfo* pTags;     // tags value for filling gap
   const char*      id;
+  SExecTaskInfo*   pTaskInfo;
 } SFillInfo;
 
 typedef struct SResultCellData {
@@ -128,10 +130,10 @@ bool          taosFillHasMoreResults(struct SFillInfo* pFillInfo);
 
 SFillInfo* taosCreateFillInfo(TSKEY skey, int32_t numOfFillCols, int32_t numOfNotFillCols, int32_t capacity,
                               SInterval* pInterval, int32_t fillType, struct SFillColInfo* pCol, int32_t slotId,
-                              int32_t order, const char* id);
+                              int32_t order, const char* id, SExecTaskInfo* pTaskInfo);
 
 void*   taosDestroyFillInfo(struct SFillInfo* pFillInfo);
-void    taosFillResultDataBlock(struct SFillInfo* pFillInfo, SSDataBlock* p, int32_t capacity);
+int32_t taosFillResultDataBlock(struct SFillInfo* pFillInfo, SSDataBlock* p, int32_t capacity);
 int64_t getFillInfoStart(struct SFillInfo* pFillInfo);
 
 bool fillIfWindowPseudoColumn(SFillInfo* pFillInfo, SFillColInfo* pCol, SColumnInfoData* pDstColInfoData,

source/libs/executor/src/aggregateoperator.c

@@ -199,7 +199,9 @@ static bool nextGroupedResult(SOperatorInfo* pOperator) {
     pBlock = getNextBlockFromDownstream(pOperator, 0);
     if (pBlock == NULL) {
       if (!pAggInfo->hasValidBlock) {
-        createDataBlockForEmptyInput(pOperator, &pBlock);
+        code = createDataBlockForEmptyInput(pOperator, &pBlock);
+        QUERY_CHECK_CODE(code, lino, _end);
+
         if (pBlock == NULL) {
           break;
         }
@@ -256,6 +258,8 @@ _end:
 }
 
 SSDataBlock* getAggregateResult(SOperatorInfo* pOperator) {
+  int32_t           code = TSDB_CODE_SUCCESS;
+  int32_t           lino = 0;
   SAggOperatorInfo* pAggInfo = pOperator->info;
   SOptrBasicInfo*   pInfo = &pAggInfo->binfo;
 
@@ -267,11 +271,13 @@ SSDataBlock* getAggregateResult(SOperatorInfo* pOperator) {
   bool           hasNewGroups = false;
   do {
     hasNewGroups = nextGroupedResult(pOperator);
-    blockDataEnsureCapacity(pInfo->pRes, pOperator->resultInfo.capacity);
+    code = blockDataEnsureCapacity(pInfo->pRes, pOperator->resultInfo.capacity);
+    QUERY_CHECK_CODE(code, lino, _end);
 
     while (1) {
       doBuildResultDatablock(pOperator, pInfo, &pAggInfo->groupResInfo, pAggInfo->aggSup.pResultBuf);
-      doFilter(pInfo->pRes, pOperator->exprSupp.pFilterInfo, NULL);
+      code = doFilter(pInfo->pRes, pOperator->exprSupp.pFilterInfo, NULL);
+      QUERY_CHECK_CODE(code, lino, _end);
 
       if (!hasRemainResults(&pAggInfo->groupResInfo)) {
         if (!hasNewGroups) setOperatorCompleted(pOperator);
@@ -287,6 +293,12 @@ SSDataBlock* getAggregateResult(SOperatorInfo* pOperator) {
   size_t rows = blockDataGetNumOfRows(pInfo->pRes);
   pOperator->resultInfo.totalRows += rows;
 
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    T_LONG_JMP(pTaskInfo->env, code);
+  }
+
   return (rows == 0) ? NULL : pInfo->pRes;
 }
 
@@ -317,6 +329,8 @@ int32_t doAggregateImpl(SOperatorInfo* pOperator, SqlFunctionCtx* pCtx) {
 }
 
 static int32_t createDataBlockForEmptyInput(SOperatorInfo* pOperator, SSDataBlock** ppBlock) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
   if (!tsCountAlwaysReturnValue) {
     return TSDB_CODE_SUCCESS;
   }
@@ -357,9 +371,12 @@ static int32_t createDataBlockForEmptyInput(SOperatorInfo* pOperator, SSDataBloc
         int32_t slotId = pFuncParam->pCol->slotId;
         int32_t numOfCols = taosArrayGetSize(pBlock->pDataBlock);
         if (slotId >= numOfCols) {
-          taosArrayEnsureCap(pBlock->pDataBlock, slotId + 1);
+          code = taosArrayEnsureCap(pBlock->pDataBlock, slotId + 1);
+          QUERY_CHECK_CODE(code, lino, _end);
+
           for (int32_t k = numOfCols; k < slotId + 1; ++k) {
-            taosArrayPush(pBlock->pDataBlock, &colInfo);
+            void* tmp = taosArrayPush(pBlock->pDataBlock, &colInfo);
+            QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
           }
         }
       } else if (pFuncParam->type == FUNC_PARAM_TYPE_VALUE) {
@@ -368,14 +385,20 @@ static int32_t createDataBlockForEmptyInput(SOperatorInfo* pOperator, SSDataBloc
     }
   }
 
-  blockDataEnsureCapacity(pBlock, pBlock->info.rows);
+  code = blockDataEnsureCapacity(pBlock, pBlock->info.rows);
+  QUERY_CHECK_CODE(code, lino, _end);
+
   for (int32_t i = 0; i < blockDataGetNumOfCols(pBlock); ++i) {
     SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i);
     colDataSetNULL(pColInfoData, 0);
   }
   *ppBlock = pBlock;
 
-  return TSDB_CODE_SUCCESS;
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+  }
+  return code;
 }
 
 void destroyDataBlockForEmptyInput(bool blockAllocated, SSDataBlock** ppBlock) {
@@ -576,7 +599,12 @@ void applyAggFunctionOnPartialTuples(SExecTaskInfo* taskInfo, SqlFunctionCtx* pC
 
       SScalarParam out = {.columnData = &idata};
       SScalarParam tw = {.numOfRows = 5, .columnData = pTimeWindowData};
-      pCtx[k].sfp.process(&tw, 1, &out);
+      int32_t      code = pCtx[k].sfp.process(&tw, 1, &out);
+      if (code != TSDB_CODE_SUCCESS) {
+        qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+        taskInfo->code = code;
+        T_LONG_JMP(taskInfo->env, code);
+      }
       pEntryInfo->numOfRes = 1;
     } else {
       int32_t code = TSDB_CODE_SUCCESS;

source/libs/executor/src/cachescanoperator.c

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "os.h"
 #include "function.h"
+#include "os.h"
 #include "tname.h"
 
 #include "tdatablock.h"
@@ -90,6 +90,7 @@ int32_t createCacherowsScanOperator(SLastRowScanPhysiNode* pScanNode, SReadHandl
   QRY_OPTR_CHECK(pOptrInfo);
 
   int32_t             code = TSDB_CODE_SUCCESS;
+  int32_t             lino = 0;
   int32_t             numOfCols = 0;
   SNodeList*          pScanCols = pScanNode->scan.pScanCols;
   SCacheRowsScanInfo* pInfo = taosMemoryCalloc(1, sizeof(SCacheRowsScanInfo));
@@ -108,9 +109,7 @@ int32_t createCacherowsScanOperator(SLastRowScanPhysiNode* pScanNode, SReadHandl
   pInfo->pRes = createDataBlockFromDescNode(pDescNode);
 
   code = extractColMatchInfo(pScanCols, pDescNode, &numOfCols, COL_MATCH_FROM_COL_ID, &pInfo->matchInfo);
-  if (code != TSDB_CODE_SUCCESS) {
+  QUERY_CHECK_CODE(code, lino, _error);
-    goto _error;
-  }
 
   // todo: the pk information should comes from the physical plan
   // pk info may not in pScanCols, so extract primary key from pInfo->matchInfo may failed
@@ -124,7 +123,7 @@ int32_t createCacherowsScanOperator(SLastRowScanPhysiNode* pScanNode, SReadHandl
       pInfo->pkCol.pk = 1;
     }
   } else {
-    for(int32_t i = 0; i < taosArrayGetSize(pInfo->matchInfo.pList); ++i) {
+    for (int32_t i = 0; i < taosArrayGetSize(pInfo->matchInfo.pList); ++i) {
       SColMatchItem* pItem = taosArrayGet(pInfo->matchInfo.pList, i);
       if (pItem->isPk) {
         pInfo->numOfPks += 1;
@@ -136,24 +135,31 @@ int32_t createCacherowsScanOperator(SLastRowScanPhysiNode* pScanNode, SReadHandl
   }
 
   SArray* pCidList = taosArrayInit(numOfCols, sizeof(int16_t));
+  QUERY_CHECK_NULL(pCidList, code, lino, _error, TSDB_CODE_OUT_OF_MEMORY);
+
   pInfo->pFuncTypeList = taosArrayInit(taosArrayGetSize(pScanNode->pFuncTypes), sizeof(int32_t));
-  taosArrayAddAll(pInfo->pFuncTypeList, pScanNode->pFuncTypes);
+  QUERY_CHECK_NULL(pInfo->pFuncTypeList, code, lino, _error, TSDB_CODE_OUT_OF_MEMORY);
+
+  void* tmp = taosArrayAddAll(pInfo->pFuncTypeList, pScanNode->pFuncTypes);
+  if (!tmp && taosArrayGetSize(pScanNode->pFuncTypes) > 0) {
+    QUERY_CHECK_NULL(tmp, code, lino, _error, TSDB_CODE_OUT_OF_MEMORY);
+  }
 
   for (int i = 0; i < TARRAY_SIZE(pInfo->matchInfo.pList); ++i) {
     SColMatchItem* pColInfo = taosArrayGet(pInfo->matchInfo.pList, i);
-    taosArrayPush(pCidList, &pColInfo->colId);
+    void* tmp = taosArrayPush(pCidList, &pColInfo->colId);
+    QUERY_CHECK_NULL(tmp, code, lino, _error, TSDB_CODE_OUT_OF_MEMORY);
     if (pInfo->pFuncTypeList != NULL && taosArrayGetSize(pInfo->pFuncTypeList) > i) {
       pColInfo->funcType = *(int32_t*)taosArrayGet(pInfo->pFuncTypeList, i);
     }
   }
   pInfo->pCidList = pCidList;
 
-  removeRedundantTsCol(pScanNode, &pInfo->matchInfo);
+  code = removeRedundantTsCol(pScanNode, &pInfo->matchInfo);
+  QUERY_CHECK_CODE(code, lino, _error);
 
   code = extractCacheScanSlotId(pInfo->matchInfo.pList, pTaskInfo, &pInfo->pSlotIds, &pInfo->pDstSlotIds);
-  if (code != TSDB_CODE_SUCCESS) {
+  QUERY_CHECK_CODE(code, lino, _error);
-    goto _error;
-  }
 
   int32_t totalTables = tableListGetSize(pTableListInfo);
   int32_t capacity = 0;
@@ -169,17 +175,16 @@ int32_t createCacherowsScanOperator(SLastRowScanPhysiNode* pScanNode, SReadHandl
     uint64_t suid = tableListGetSuid(pTableListInfo);
     code = pInfo->readHandle.api.cacheFn.openReader(pInfo->readHandle.vnode, pInfo->retrieveType, pList, totalTables,
                                                     taosArrayGetSize(pInfo->matchInfo.pList), pCidList, pInfo->pSlotIds,
-                                                    suid, &pInfo->pLastrowReader, pTaskInfo->id.str, pScanNode->pFuncTypes,
+                                                    suid, &pInfo->pLastrowReader, pTaskInfo->id.str,
-                                                    &pInfo->pkCol, pInfo->numOfPks);
+                                                    pScanNode->pFuncTypes, &pInfo->pkCol, pInfo->numOfPks);
-    if (code != TSDB_CODE_SUCCESS) {
+    QUERY_CHECK_CODE(code, lino, _error);
-      goto _error;
-    }
 
     capacity = TMIN(totalTables, 4096);
 
     pInfo->pBufferedRes = createOneDataBlock(pInfo->pRes, false);
     setColIdForCacheReadBlock(pInfo->pBufferedRes, pScanNode);
-    blockDataEnsureCapacity(pInfo->pBufferedRes, capacity);
+    code = blockDataEnsureCapacity(pInfo->pBufferedRes, capacity);
+    QUERY_CHECK_CODE(code, lino, _error);
   } else {  // by tags
     pInfo->retrieveType = CACHESCAN_RETRIEVE_TYPE_SINGLE | SCAN_ROW_TYPE(pScanNode->ignoreNull);
     capacity = 1;  // only one row output
@@ -187,20 +192,22 @@ int32_t createCacherowsScanOperator(SLastRowScanPhysiNode* pScanNode, SReadHandl
   }
 
   initResultSizeInfo(&pOperator->resultInfo, capacity);
-  blockDataEnsureCapacity(pInfo->pRes, pOperator->resultInfo.capacity);
+  code = blockDataEnsureCapacity(pInfo->pRes, pOperator->resultInfo.capacity);
+  QUERY_CHECK_CODE(code, lino, _error);
 
   if (pScanNode->scan.pScanPseudoCols != NULL) {
     SExprSupp* p = &pInfo->pseudoExprSup;
     p->pExprInfo = createExprInfo(pScanNode->scan.pScanPseudoCols, NULL, &p->numOfExprs);
-    p->pCtx = createSqlFunctionCtx(p->pExprInfo, p->numOfExprs, &p->rowEntryInfoOffset, &pTaskInfo->storageAPI.functionStore);
+    p->pCtx =
+        createSqlFunctionCtx(p->pExprInfo, p->numOfExprs, &p->rowEntryInfoOffset, &pTaskInfo->storageAPI.functionStore);
   }
 
   setOperatorInfo(pOperator, "CachedRowScanOperator", QUERY_NODE_PHYSICAL_PLAN_LAST_ROW_SCAN, false, OP_NOT_OPENED,
                   pInfo, pTaskInfo);
   pOperator->exprSupp.numOfExprs = taosArrayGetSize(pInfo->pRes->pDataBlock);
 
-  pOperator->fpSet =
+  pOperator->fpSet = createOperatorFpSet(optrDummyOpenFn, doScanCache, NULL, destroyCacheScanOperator, optrDefaultBufFn,
-      createOperatorFpSet(optrDummyOpenFn, doScanCache, NULL, destroyCacheScanOperator, optrDefaultBufFn, NULL, optrDefaultGetNextExtFn, NULL);
+                                         NULL, optrDefaultGetNextExtFn, NULL);
 
   pOperator->cost.openCost = 0;
 
@@ -209,6 +216,9 @@ int32_t createCacherowsScanOperator(SLastRowScanPhysiNode* pScanNode, SReadHandl
 
 _error:
   pTaskInfo->code = code;
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
   destroyCacheScanOperator(pInfo);
   taosMemoryFree(pOperator);
   return code;
@@ -274,7 +284,11 @@ SSDataBlock* doScanCache(SOperatorInfo* pOperator) {
         } else {
           if (pSrc->pData) {
             char*   p = colDataGetData(pSrc, pInfo->indexOfBufferedRes);
-            colDataSetVal(pDst, 0, p, false);
+            int32_t code = colDataSetVal(pDst, 0, p, false);
+            if (code != TSDB_CODE_SUCCESS) {
+              qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+              T_LONG_JMP(pTaskInfo->env, code);
+            }
           }
         }
       }
@@ -326,7 +340,11 @@ SSDataBlock* doScanCache(SOperatorInfo* pOperator) {
           continue;
         }
       } else {
-        pReaderFn->reuseReader(pInfo->pLastrowReader, pList, num);
+        code = pReaderFn->reuseReader(pInfo->pLastrowReader, pList, num);
+        if (code != TSDB_CODE_SUCCESS) {
+          qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+          T_LONG_JMP(pTaskInfo->env, code);
+        }
       }
 
       taosArrayClear(pInfo->pUidList);
@@ -358,10 +376,10 @@ SSDataBlock* doScanCache(SOperatorInfo* pOperator) {
           }
         }
 
-        //pInfo->pLastrowReader = tsdbCacherowsReaderClose(pInfo->pLastrowReader);
+        // pInfo->pLastrowReader = tsdbCacherowsReaderClose(pInfo->pLastrowReader);
         return pInfo->pRes;
       } else {
-        //pInfo->pLastrowReader = tsdbCacherowsReaderClose(pInfo->pLastrowReader);
+        // pInfo->pLastrowReader = tsdbCacherowsReaderClose(pInfo->pLastrowReader);
       }
     }
 
@@ -437,12 +455,15 @@ int32_t extractCacheScanSlotId(const SArray* pColMatchInfo, SExecTaskInfo* pTask
 }
 
 int32_t removeRedundantTsCol(SLastRowScanPhysiNode* pScanNode, SColMatchInfo* pColMatchInfo) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
   if (!pScanNode->ignoreNull) {  // retrieve cached last value
     return TSDB_CODE_SUCCESS;
   }
 
   size_t  size = taosArrayGetSize(pColMatchInfo->pList);
   SArray* pMatchInfo = taosArrayInit(size, sizeof(SColMatchItem));
+  QUERY_CHECK_NULL(pMatchInfo, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
 
   for (int32_t i = 0; i < size; ++i) {
     SColMatchItem* pColInfo = taosArrayGet(pColMatchInfo->pList, i);
@@ -452,13 +473,20 @@ int32_t removeRedundantTsCol(SLastRowScanPhysiNode* pScanNode, SColMatchInfo* pC
 
     SSlotDescNode* pDesc = (SSlotDescNode*)nodesListGetNode(pList, slotId);
     if (pDesc->dataType.type != TSDB_DATA_TYPE_TIMESTAMP) {
-      taosArrayPush(pMatchInfo, pColInfo);
+      void* tmp = taosArrayPush(pMatchInfo, pColInfo);
-    } else if (FUNCTION_TYPE_CACHE_LAST_ROW == pColInfo->funcType){
+      QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
-      taosArrayPush(pMatchInfo, pColInfo);
+    } else if (FUNCTION_TYPE_CACHE_LAST_ROW == pColInfo->funcType) {
+      void* tmp = taosArrayPush(pMatchInfo, pColInfo);
+      QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
     }
   }
 
   taosArrayDestroy(pColMatchInfo->pList);
   pColMatchInfo->pList = pMatchInfo;
-  return TSDB_CODE_SUCCESS;
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
+  return code;
 }

source/libs/executor/src/countwindowoperator.c

@@ -74,12 +74,15 @@ static SCountWindowResult* getCountWinStateInfo(SCountWindowSupp* pCountSup) {
   return pBuffInfo;
 }
 
-static SCountWindowResult* setCountWindowOutputBuff(SExprSupp* pExprSup, SCountWindowSupp* pCountSup,
+static int32_t setCountWindowOutputBuff(SExprSupp* pExprSup, SCountWindowSupp* pCountSup, SResultRow** pResult,
-                                                    SResultRow** pResult) {
+                                        SCountWindowResult** ppResBuff) {
+  int32_t             code = TSDB_CODE_SUCCESS;
+  int32_t             lino = 0;
   SCountWindowResult* pBuff = getCountWinStateInfo(pCountSup);
   (*pResult) = &pBuff->row;
-  setResultRowInitCtx(*pResult, pExprSup->pCtx, pExprSup->numOfExprs, pExprSup->rowEntryInfoOffset);
+  code = setResultRowInitCtx(*pResult, pExprSup->pCtx, pExprSup->numOfExprs, pExprSup->rowEntryInfoOffset);
-  return pBuff;
+  (*ppResBuff) = pBuff;
+  return code;
 }
 
 static int32_t updateCountWindowInfo(int32_t start, int32_t blockRows, int32_t countWinRows, int32_t* pCurrentRows) {
@@ -88,17 +91,23 @@ static int32_t updateCountWindowInfo(int32_t start, int32_t blockRows, int32_t c
   return rows;
 }
 
-int32_t doCountWindowAggImpl(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
+void doCountWindowAggImpl(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
+  int32_t                   code = TSDB_CODE_SUCCESS;
+  int32_t                   lino = 0;
   SExecTaskInfo*            pTaskInfo = pOperator->pTaskInfo;
   SExprSupp*                pExprSup = &pOperator->exprSupp;
   SCountWindowOperatorInfo* pInfo = pOperator->info;
   SSDataBlock*              pRes = pInfo->binfo.pRes;
   SColumnInfoData*          pColInfoData = taosArrayGet(pBlock->pDataBlock, pInfo->tsSlotId);
   TSKEY*                    tsCols = (TSKEY*)pColInfoData->pData;
-  int32_t                   code = TSDB_CODE_SUCCESS;
 
   for (int32_t i = 0; i < pBlock->info.rows;) {
-    SCountWindowResult* pBuffInfo = setCountWindowOutputBuff(pExprSup, &pInfo->countSup, &pInfo->pRow);
+    SCountWindowResult* pBuffInfo = NULL;
+    code = setCountWindowOutputBuff(pExprSup, &pInfo->countSup, &pInfo->pRow, &pBuffInfo);
+    if (code != TSDB_CODE_SUCCESS) {
+      qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+      T_LONG_JMP(pTaskInfo->env, code);
+    }
     int32_t prevRows = pBuffInfo->winRows;
     int32_t num = updateCountWindowInfo(i, pBlock->info.rows, pInfo->windowCount, &pBuffInfo->winRows);
     int32_t step = num;
@@ -131,15 +140,17 @@ int32_t doCountWindowAggImpl(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
     }
     i += step;
   }
-
-  return code;
 }
 
 static void buildCountResult(SExprSupp* pExprSup, SCountWindowSupp* pCountSup, SExecTaskInfo* pTaskInfo,
                              SFilterInfo* pFilterInfo, SSDataBlock* pBlock) {
   SResultRow* pResultRow = NULL;
+  int32_t        code = TSDB_CODE_SUCCESS;
+  int32_t        lino = 0;
   for (int32_t i = 0; i < taosArrayGetSize(pCountSup->pWinStates); i++) {
-    SCountWindowResult* pBuff = setCountWindowOutputBuff(pExprSup, pCountSup, &pResultRow);
+    SCountWindowResult* pBuff = NULL;
+    code = setCountWindowOutputBuff(pExprSup, pCountSup, &pResultRow, &pBuff);
+    QUERY_CHECK_CODE(code, lino, _end);
     if (pBuff->winRows == 0) {
       continue;
     }
@@ -150,7 +161,14 @@ static void buildCountResult(SExprSupp* pExprSup, SCountWindowSupp* pCountSup, S
     clearWinStateBuff(pBuff);
     clearResultRowInitFlag(pExprSup->pCtx, pExprSup->numOfExprs);
   }
-  doFilter(pBlock, pFilterInfo, NULL);
+  code = doFilter(pBlock, pFilterInfo, NULL);
+  QUERY_CHECK_CODE(code, lino, _end);
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    T_LONG_JMP(pTaskInfo->env, code);
+  }
 }
 
 static SSDataBlock* countWindowAggregate(SOperatorInfo* pOperator) {
@@ -246,7 +264,8 @@ int32_t createCountwindowOperatorInfo(SOperatorInfo* downstream, SPhysiNode* phy
   QUERY_CHECK_CODE(code, lino, _error);
 
   SSDataBlock* pResBlock = createDataBlockFromDescNode(pCountWindowNode->window.node.pOutputDataBlockDesc);
-  blockDataEnsureCapacity(pResBlock, pOperator->resultInfo.capacity);
+  code = blockDataEnsureCapacity(pResBlock, pOperator->resultInfo.capacity);
+  QUERY_CHECK_CODE(code, lino, _error);
 
   initBasicInfo(&pInfo->binfo, pResBlock);
   initResultRowInfo(&pInfo->binfo.resultRowInfo);

source/libs/executor/src/eventwindowoperator.c

@@ -208,8 +208,12 @@ static SSDataBlock* eventWindowAggregate(SOperatorInfo* pOperator) {
       }
     }
 
-    eventWindowAggImpl(pOperator, pInfo, pBlock);
+    code = eventWindowAggImpl(pOperator, pInfo, pBlock);
-    doFilter(pRes, pSup->pFilterInfo, NULL);
+    QUERY_CHECK_CODE(code, lino, _end);
+
+    code = doFilter(pRes, pSup->pFilterInfo, NULL);
+    QUERY_CHECK_CODE(code, lino, _end);
+
     if (pRes->info.rows >= pOperator->resultInfo.threshold) {
       return pRes;
     }
@@ -257,6 +261,8 @@ static void doEventWindowAggImpl(SEventWindowOperatorInfo* pInfo, SExprSupp* pSu
 }
 
 int32_t eventWindowAggImpl(SOperatorInfo* pOperator, SEventWindowOperatorInfo* pInfo, SSDataBlock* pBlock) {
+  int32_t          code = TSDB_CODE_SUCCESS;
+  int32_t          lino = 0;
   SExecTaskInfo*   pTaskInfo = pOperator->pTaskInfo;
   SExprSupp*       pSup = &pOperator->exprSupp;
   SSDataBlock*     pRes = pInfo->binfo.pRes;
@@ -278,22 +284,20 @@ int32_t eventWindowAggImpl(SOperatorInfo* pOperator, SEventWindowOperatorInfo* p
 
   SFilterColumnParam param1 = {.numOfCols = taosArrayGetSize(pBlock->pDataBlock), .pDataBlock = pBlock->pDataBlock};
 
-  int32_t code = filterSetDataFromSlotId(pInfo->pStartCondInfo, &param1);
+  code = filterSetDataFromSlotId(pInfo->pStartCondInfo, &param1);
-  if (code != TSDB_CODE_SUCCESS) {
+  QUERY_CHECK_CODE(code, lino, _return);
-    return code;
-  }
 
   int32_t status1 = 0;
-  filterExecute(pInfo->pStartCondInfo, pBlock, &ps, NULL, param1.numOfCols, &status1);
+  code = filterExecute(pInfo->pStartCondInfo, pBlock, &ps, NULL, param1.numOfCols, &status1);
+  QUERY_CHECK_CODE(code, lino, _return);
 
   SFilterColumnParam param2 = {.numOfCols = taosArrayGetSize(pBlock->pDataBlock), .pDataBlock = pBlock->pDataBlock};
   code = filterSetDataFromSlotId(pInfo->pEndCondInfo, &param2);
-  if (code != TSDB_CODE_SUCCESS) {
+  QUERY_CHECK_CODE(code, lino, _return);
-    goto _return;
-  }
 
   int32_t status2 = 0;
-  filterExecute(pInfo->pEndCondInfo, pBlock, &pe, NULL, param2.numOfCols, &status2);
+  code = filterExecute(pInfo->pEndCondInfo, pBlock, &pe, NULL, param2.numOfCols, &status2);
+  QUERY_CHECK_CODE(code, lino, _return);
 
   int32_t startIndex = pInfo->inWindow ? 0 : -1;
   while (rowIndex < pBlock->info.rows) {
@@ -311,7 +315,8 @@ int32_t eventWindowAggImpl(SOperatorInfo* pOperator, SEventWindowOperatorInfo* p
         // check buffer size
         if (pRes->info.rows + pInfo->pRow->numOfRows >= pRes->info.capacity) {
           int32_t newSize = pRes->info.rows + pInfo->pRow->numOfRows;
-          blockDataEnsureCapacity(pRes, newSize);
+          code = blockDataEnsureCapacity(pRes, newSize);
+          QUERY_CHECK_CODE(code, lino, _return);
         }
 
         copyResultrowToDataBlock(pSup->pExprInfo, pSup->numOfExprs, pInfo->pRow, pSup->pCtx, pRes,
@@ -348,6 +353,9 @@ int32_t eventWindowAggImpl(SOperatorInfo* pOperator, SEventWindowOperatorInfo* p
 
 _return:
 
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
   colDataDestroy(ps);
   taosMemoryFree(ps);
   colDataDestroy(pe);

source/libs/executor/src/exchangeoperator.c

@@ -48,7 +48,7 @@ typedef struct SSourceDataInfo {
 static void destroyExchangeOperatorInfo(void* param);
 static void freeBlock(void* pParam);
 static void freeSourceDataInfo(void* param);
-static void* setAllSourcesCompleted(SOperatorInfo* pOperator);
+static void setAllSourcesCompleted(SOperatorInfo* pOperator);
 
 static int32_t loadRemoteDataCallback(void* param, SDataBuf* pMsg, int32_t code);
 static int32_t doSendFetchDataRequest(SExchangeInfo* pExchangeInfo, SExecTaskInfo* pTaskInfo, int32_t sourceIndex);
@@ -171,6 +171,7 @@ _error:
 }
 
 static SSDataBlock* doLoadRemoteDataImpl(SOperatorInfo* pOperator) {
+  int32_t        code = TSDB_CODE_SUCCESS;
   SExchangeInfo* pExchangeInfo = pOperator->info;
   SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
 
@@ -192,11 +193,22 @@ static SSDataBlock* doLoadRemoteDataImpl(SOperatorInfo* pOperator) {
   }
 
   if (p != NULL) {
-    taosArrayPush(pExchangeInfo->pRecycledBlocks, &p);
+    void* tmp = taosArrayPush(pExchangeInfo->pRecycledBlocks, &p);
+    if (!tmp) {
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+      pTaskInfo->code = code;
+      T_LONG_JMP(pTaskInfo->env, code);
+    }
     return p;
   } else {
     if (pExchangeInfo->seqLoadData) {
-      seqLoadRemoteData(pOperator);
+      code = seqLoadRemoteData(pOperator);
+      if (code != TSDB_CODE_SUCCESS) {
+        qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+        pTaskInfo->code = code;
+        T_LONG_JMP(pTaskInfo->env, code);
+      }
     } else {
       concurrentlyLoadRemoteDataImpl(pOperator, pExchangeInfo, pTaskInfo);
     }
@@ -206,7 +218,13 @@ static SSDataBlock* doLoadRemoteDataImpl(SOperatorInfo* pOperator) {
     } else {
       p = taosArrayGetP(pExchangeInfo->pResultBlockList, 0);
       taosArrayRemove(pExchangeInfo->pResultBlockList, 0);
-      taosArrayPush(pExchangeInfo->pRecycledBlocks, &p);
+      void* tmp = taosArrayPush(pExchangeInfo->pRecycledBlocks, &p);
+      if (!tmp) {
+        code = TSDB_CODE_OUT_OF_MEMORY;
+        qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+        pTaskInfo->code = code;
+        T_LONG_JMP(pTaskInfo->env, code);
+      }
       return p;
     }
   }
@@ -231,7 +249,11 @@ static SSDataBlock* loadRemoteData(SOperatorInfo* pOperator) {
       return NULL;
     }
 
-    doFilter(pBlock, pOperator->exprSupp.pFilterInfo, NULL);
+    pTaskInfo->code = doFilter(pBlock, pOperator->exprSupp.pFilterInfo, NULL);
+    if (pTaskInfo->code != TSDB_CODE_SUCCESS) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(pTaskInfo->code));
+      T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    }
     if (blockDataGetNumOfRows(pBlock) == 0) {
       continue;
     }
@@ -293,21 +315,32 @@ static int32_t initExchangeOperator(SExchangePhysiNode* pExNode, SExchangeInfo*
 
   pInfo->pSources = taosArrayInit(numOfSources, sizeof(SDownstreamSourceNode));
   if (pInfo->pSources == NULL) {
+    qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(TSDB_CODE_OUT_OF_MEMORY));
     return TSDB_CODE_OUT_OF_MEMORY;
   }
 
   if (pExNode->node.dynamicOp) {
     pInfo->pHashSources = tSimpleHashInit(numOfSources * 2, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT));
     if (NULL == pInfo->pHashSources) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(TSDB_CODE_OUT_OF_MEMORY));
       return TSDB_CODE_OUT_OF_MEMORY;
     }
   }
 
   for (int32_t i = 0; i < numOfSources; ++i) {
     SDownstreamSourceNode* pNode = (SDownstreamSourceNode*)nodesListGetNode((SNodeList*)pExNode->pSrcEndPoints, i);
-    taosArrayPush(pInfo->pSources, pNode);
+    void*                  tmp = taosArrayPush(pInfo->pSources, pNode);
+    if (!tmp) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(TSDB_CODE_OUT_OF_MEMORY));
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
     SExchangeSrcIndex idx = {.srcIdx = i, .inUseIdx = -1};
+    int32_t           code =
         tSimpleHashPut(pInfo->pHashSources, &pNode->addr.nodeId, sizeof(pNode->addr.nodeId), &idx, sizeof(idx));
+    if (pInfo->pHashSources && code != TSDB_CODE_SUCCESS) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+      return code;
+    }
   }
 
   initLimitInfo(pExNode->node.pLimit, pExNode->node.pSlimit, &pInfo->limitInfo);
@@ -321,6 +354,7 @@ int32_t createExchangeOperatorInfo(void* pTransporter, SExchangePhysiNode* pExNo
   QRY_OPTR_CHECK(pOptrInfo);
 
   int32_t code = 0;
+  int32_t        lino = 0;
   SExchangeInfo* pInfo = taosMemoryCalloc(1, sizeof(SExchangeInfo));
   SOperatorInfo* pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
   if (pInfo == NULL || pOperator == NULL) {
@@ -330,17 +364,18 @@ int32_t createExchangeOperatorInfo(void* pTransporter, SExchangePhysiNode* pExNo
 
   pInfo->dynamicOp = pExNode->node.dynamicOp;
   code = initExchangeOperator(pExNode, pInfo, GET_TASKID(pTaskInfo));
-  if (code != TSDB_CODE_SUCCESS) {
+  QUERY_CHECK_CODE(code, lino, _error);
-    goto _error;
+
-  }
+  code = tsem_init(&pInfo->ready, 0, 0);
+  QUERY_CHECK_CODE(code, lino, _error);
 
-  tsem_init(&pInfo->ready, 0, 0);
   pInfo->pDummyBlock = createDataBlockFromDescNode(pExNode->node.pOutputDataBlockDesc);
   pInfo->pResultBlockList = taosArrayInit(64, POINTER_BYTES);
   pInfo->pRecycledBlocks = taosArrayInit(64, POINTER_BYTES);
 
   SExchangeOpStopInfo stopInfo = {QUERY_NODE_PHYSICAL_PLAN_EXCHANGE, pInfo->self};
-  qAppendTaskStopInfo(pTaskInfo, &stopInfo);
+  code = qAppendTaskStopInfo(pTaskInfo, &stopInfo);
+  QUERY_CHECK_CODE(code, lino, _error);
 
   pInfo->seqLoadData = pExNode->seqRecvData;
   pInfo->pTransporter = pTransporter;
@@ -350,9 +385,7 @@ int32_t createExchangeOperatorInfo(void* pTransporter, SExchangePhysiNode* pExNo
   pOperator->exprSupp.numOfExprs = taosArrayGetSize(pInfo->pDummyBlock->pDataBlock);
 
   code = filterInitFromNode((SNode*)pExNode->node.pConditions, &pOperator->exprSupp.pFilterInfo, 0);
-  if (code != TSDB_CODE_SUCCESS) {
+  QUERY_CHECK_CODE(code, lino, _error);
-    goto _error;
-  }
 
   pOperator->fpSet = createOperatorFpSet(prepareLoadRemoteData, loadRemoteData, NULL, destroyExchangeOperatorInfo,
                                          optrDefaultBufFn, NULL, optrDefaultGetNextExtFn, NULL);
@@ -360,6 +393,10 @@ int32_t createExchangeOperatorInfo(void* pTransporter, SExchangePhysiNode* pExNo
   return code;
 
 _error:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    pTaskInfo->code = code;
+  }
   if (pInfo != NULL) {
     doDestroyExchangeOperatorInfo(pInfo);
   }
@@ -371,7 +408,7 @@ _error:
 
 void destroyExchangeOperatorInfo(void* param) {
   SExchangeInfo* pExInfo = (SExchangeInfo*)param;
-  taosRemoveRef(exchangeObjRefPool, pExInfo->self);
+  (void)taosRemoveRef(exchangeObjRefPool, pExInfo->self);
 }
 
 void freeBlock(void* pParam) {
@@ -399,7 +436,7 @@ void doDestroyExchangeOperatorInfo(void* param) {
   blockDataDestroy(pExInfo->pDummyBlock);
   tSimpleHashCleanup(pExInfo->pHashSources);
 
-  tsem_destroy(&pExInfo->ready);
+  (void)tsem_destroy(&pExInfo->ready);
   taosMemoryFreeClear(pExInfo->pTaskId);
 
   taosMemoryFreeClear(param);
@@ -451,7 +488,7 @@ int32_t loadRemoteDataCallback(void* param, SDataBuf* pMsg, int32_t code) {
     qError("failed to invoke post when fetch rsp is ready, code:%s, %p", tstrerror(code), pExchangeInfo);
   }
 
-  taosReleaseRef(exchangeObjRefPool, pWrapper->exchangeId);
+  (void)taosReleaseRef(exchangeObjRefPool, pWrapper->exchangeId);
   return code;
 }
 
@@ -484,6 +521,8 @@ int32_t buildTableScanOperatorParam(SOperatorParam** ppRes, SArray* pUidList, in
 }
 
 int32_t doSendFetchDataRequest(SExchangeInfo* pExchangeInfo, SExecTaskInfo* pTaskInfo, int32_t sourceIndex) {
+  int32_t          code = TSDB_CODE_SUCCESS;
+  int32_t          lino = 0;
   SSourceDataInfo* pDataInfo = taosArrayGet(pExchangeInfo->pSourceDataInfo, sourceIndex);
   if (EX_SOURCE_DATA_NOT_READY != pDataInfo->status) {
     return TSDB_CODE_SUCCESS;
@@ -495,6 +534,7 @@ int32_t doSendFetchDataRequest(SExchangeInfo* pExchangeInfo, SExecTaskInfo* pTas
   size_t totalSources = taosArrayGetSize(pExchangeInfo->pSources);
 
   SFetchRspHandleWrapper* pWrapper = taosMemoryCalloc(1, sizeof(SFetchRspHandleWrapper));
+  QUERY_CHECK_NULL(pWrapper, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
   pWrapper->exchangeId = pExchangeInfo->self;
   pWrapper->sourceIndex = sourceIndex;
 
@@ -503,7 +543,8 @@ int32_t doSendFetchDataRequest(SExchangeInfo* pExchangeInfo, SExecTaskInfo* pTas
     int32_t  code =
         (*pTaskInfo->localFetch.fp)(pTaskInfo->localFetch.handle, pSource->schedId, pTaskInfo->id.queryId,
                                     pSource->taskId, 0, pSource->execId, &pBuf.pData, pTaskInfo->localFetch.explainRes);
-    loadRemoteDataCallback(pWrapper, &pBuf, code);
+    code = loadRemoteDataCallback(pWrapper, &pBuf, code);
+    QUERY_CHECK_CODE(code, lino, _end);
     taosMemoryFree(pWrapper);
   } else {
     SResFetchReq req = {0};
@@ -572,11 +613,15 @@ int32_t doSendFetchDataRequest(SExchangeInfo* pExchangeInfo, SExecTaskInfo* pTas
     pMsgSendInfo->fp = loadRemoteDataCallback;
 
     int64_t transporterId = 0;
-    int32_t code =
+    code = asyncSendMsgToServer(pExchangeInfo->pTransporter, &pSource->addr.epSet, &transporterId, pMsgSendInfo);
-        asyncSendMsgToServer(pExchangeInfo->pTransporter, &pSource->addr.epSet, &transporterId, pMsgSendInfo);
+    QUERY_CHECK_CODE(code, lino, _end);
   }
 
-  return TSDB_CODE_SUCCESS;
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
+  return code;
 }
 
 void updateLoadRemoteInfo(SLoadRemoteDataInfo* pInfo, int64_t numOfRows, int32_t dataLen, int64_t startTs,
@@ -588,6 +633,8 @@ void updateLoadRemoteInfo(SLoadRemoteDataInfo* pInfo, int64_t numOfRows, int32_t
 }
 
 int32_t extractDataBlockFromFetchRsp(SSDataBlock* pRes, char* pData, SArray* pColList, char** pNextStart) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
   if (pColList == NULL) {  // data from other sources
     blockDataCleanup(pRes);
     *pNextStart = (char*)blockDecode(pRes, pData);
@@ -610,24 +657,32 @@ int32_t extractDataBlockFromFetchRsp(SSDataBlock* pRes, char* pData, SArray* pCo
     SSDataBlock* pBlock = createDataBlock();
     for (int32_t i = 0; i < numOfCols; ++i) {
       SColumnInfoData idata = createColumnInfoData(pSchema[i].type, pSchema[i].bytes, pSchema[i].colId);
-      blockDataAppendColInfo(pBlock, &idata);
+      code = blockDataAppendColInfo(pBlock, &idata);
+      QUERY_CHECK_CODE(code, lino, _end);
     }
 
-    (void) blockDecode(pBlock, pStart);
+    (void)blockDecode(pBlock, pStart);
-    blockDataEnsureCapacity(pRes, pBlock->info.rows);
+    code = blockDataEnsureCapacity(pRes, pBlock->info.rows);
+    QUERY_CHECK_CODE(code, lino, _end);
 
     // data from mnode
     pRes->info.dataLoad = 1;
     pRes->info.rows = pBlock->info.rows;
     pRes->info.scanFlag = MAIN_SCAN;
-    relocateColumnData(pRes, pColList, pBlock->pDataBlock, false);
+    code = relocateColumnData(pRes, pColList, pBlock->pDataBlock, false);
+    QUERY_CHECK_CODE(code, lino, _end);
+
     blockDataDestroy(pBlock);
   }
 
-  return TSDB_CODE_SUCCESS;
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
+  return code;
 }
 
-void* setAllSourcesCompleted(SOperatorInfo* pOperator) {
+void setAllSourcesCompleted(SOperatorInfo* pOperator) {
   SExchangeInfo* pExchangeInfo = pOperator->info;
   SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
 
@@ -638,7 +693,6 @@ void* setAllSourcesCompleted(SOperatorInfo* pOperator) {
          pLoadInfo->totalElapsed / 1000.0);
 
   setOperatorCompleted(pOperator);
-  return NULL;
 }
 
 int32_t getCompletedSources(const SArray* pArray) {
@@ -685,21 +739,24 @@ int32_t prepareConcurrentlyLoad(SOperatorInfo* pOperator) {
 }
 
 int32_t doExtractResultBlocks(SExchangeInfo* pExchangeInfo, SSourceDataInfo* pDataInfo) {
+  int32_t            code = TSDB_CODE_SUCCESS;
+  int32_t            lino = 0;
   SRetrieveTableRsp* pRetrieveRsp = pDataInfo->pRsp;
 
   char* pNextStart = pRetrieveRsp->data;
   char* pStart = pNextStart;
 
   int32_t index = 0;
-  int32_t code = 0;
 
   if (pRetrieveRsp->compressed) {  // decompress the data
     if (pDataInfo->decompBuf == NULL) {
       pDataInfo->decompBuf = taosMemoryMalloc(pRetrieveRsp->payloadLen);
+      QUERY_CHECK_NULL(pDataInfo->decompBuf, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
       pDataInfo->decompBufSize = pRetrieveRsp->payloadLen;
     } else {
       if (pDataInfo->decompBufSize < pRetrieveRsp->payloadLen) {
         char* p = taosMemoryRealloc(pDataInfo->decompBuf, pRetrieveRsp->payloadLen);
+        QUERY_CHECK_NULL(p, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
         if (p != NULL) {
           pDataInfo->decompBuf = p;
           pDataInfo->decompBufSize = pRetrieveRsp->payloadLen;
@@ -708,7 +765,6 @@ int32_t doExtractResultBlocks(SExchangeInfo* pExchangeInfo, SSourceDataInfo* pDa
     }
   }
 
-
   while (index++ < pRetrieveRsp->numOfBlocks) {
     SSDataBlock* pb = NULL;
     pStart = pNextStart;
@@ -718,12 +774,13 @@ int32_t doExtractResultBlocks(SExchangeInfo* pExchangeInfo, SSourceDataInfo* pDa
       blockDataCleanup(pb);
     } else {
       pb = createOneDataBlock(pExchangeInfo->pDummyBlock, false);
+      QUERY_CHECK_NULL(pb, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
     }
 
-    int32_t compLen = *(int32_t*) pStart;
+    int32_t compLen = *(int32_t*)pStart;
     pStart += sizeof(int32_t);
 
-    int32_t rawLen = *(int32_t*) pStart;
+    int32_t rawLen = *(int32_t*)pStart;
     pStart += sizeof(int32_t);
     ASSERT(compLen <= rawLen && compLen != 0);
 
@@ -740,9 +797,14 @@ int32_t doExtractResultBlocks(SExchangeInfo* pExchangeInfo, SSourceDataInfo* pDa
       return code;
     }
 
-    taosArrayPush(pExchangeInfo->pResultBlockList, &pb);
+    void* tmp = taosArrayPush(pExchangeInfo->pResultBlockList, &pb);
+    QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
   }
 
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
   return code;
 }
 
@@ -763,7 +825,13 @@ int32_t seqLoadRemoteData(SOperatorInfo* pOperator) {
     SSourceDataInfo* pDataInfo = taosArrayGet(pExchangeInfo->pSourceDataInfo, pExchangeInfo->current);
     pDataInfo->status = EX_SOURCE_DATA_NOT_READY;
 
-    doSendFetchDataRequest(pExchangeInfo, pTaskInfo, pExchangeInfo->current);
+    code = doSendFetchDataRequest(pExchangeInfo, pTaskInfo, pExchangeInfo->current);
+    if (code != TSDB_CODE_SUCCESS) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+      pTaskInfo->code = code;
+      T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    }
+
     code = exchangeWait(pOperator, pExchangeInfo);
     if (code != TSDB_CODE_SUCCESS || isTaskKilled(pTaskInfo)) {
       T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
@@ -844,7 +912,11 @@ int32_t addSingleExchangeSource(SOperatorInfo* pOperator, SExchangeOperatorBasic
     dataInfo.srcOpType = pBasicParam->srcOpType;
     dataInfo.tableSeq = pBasicParam->tableSeq;
 
-    taosArrayPush(pExchangeInfo->pSourceDataInfo, &dataInfo);
+    void* tmp = taosArrayPush(pExchangeInfo->pSourceDataInfo, &dataInfo);
+    if (!tmp) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(TSDB_CODE_OUT_OF_MEMORY));
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
     pIdx->inUseIdx = taosArrayGetSize(pExchangeInfo->pSourceDataInfo) - 1;
   } else {
     SSourceDataInfo* pDataInfo = taosArrayGet(pExchangeInfo->pSourceDataInfo, pIdx->inUseIdx);
@@ -990,7 +1062,7 @@ static int32_t exchangeWait(SOperatorInfo* pOperator, SExchangeInfo* pExchangeIn
       return pTask->code;
     }
   }
-  tsem_wait(&pExchangeInfo->ready);
+  (void)tsem_wait(&pExchangeInfo->ready);
   if (pTask->pWorkerCb) {
     code = pTask->pWorkerCb->afterRecoverFromBlocking(pTask->pWorkerCb->pPool);
     if (code != TSDB_CODE_SUCCESS) {

source/libs/executor/src/executil.c

@@ -143,7 +143,7 @@ void initGroupedResultInfo(SGroupResInfo* pGroupResInfo, SSHashObj* pHashmap, in
 
   // todo move away and record this during create window
   while ((pData = tSimpleHashIterate(pHashmap, pData, &iter)) != NULL) {
-    /*void* key = */ tSimpleHashGetKey(pData, &keyLen);
+    /*void* key = */ (void)tSimpleHashGetKey(pData, &keyLen);
     bufLen += keyLen + sizeof(SResultRowPosition);
   }
 
@@ -222,7 +222,13 @@ SArray* createSortInfo(SNodeList* pNodeList) {
 
     SColumnNode* pColNode = (SColumnNode*)pSortKey->pExpr;
     bi.slotId = pColNode->slotId;
-    taosArrayPush(pList, &bi);
+    void* tmp = taosArrayPush(pList, &bi);
+    if (!tmp) {
+      taosArrayDestroy(pList);
+      pList = NULL;
+      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      break;
+    }
   }
 
   return pList;
@@ -245,7 +251,14 @@ SSDataBlock* createDataBlockFromDescNode(SDataBlockDescNode* pNode) {
     idata.info.scale = pDescNode->dataType.scale;
     idata.info.precision = pDescNode->dataType.precision;
 
-    blockDataAppendColInfo(pBlock, &idata);
+    int32_t code = blockDataAppendColInfo(pBlock, &idata);
+    if (code != TSDB_CODE_SUCCESS) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+      blockDataDestroy(pBlock);
+      pBlock = NULL;
+      terrno = code;
+      break;
+    }
   }
 
   return pBlock;
@@ -297,8 +310,7 @@ EDealRes doTranslateTagExpr(SNode** pNode, void* pContext) {
       isTagCol = true;
   } else if (nodeType(*pNode) == QUERY_NODE_FUNCTION) {
     SFunctionNode* pFunc = (SFunctionNode*)*pNode;
-    if (pFunc->funcType == FUNCTION_TYPE_TBNAME)
+    if (pFunc->funcType == FUNCTION_TYPE_TBNAME) isTbname = true;
-      isTbname = true;
   }
   if (isTagCol) {
     SColumnNode* pSColumnNode = *(SColumnNode**)pNode;
@@ -325,7 +337,10 @@ EDealRes doTranslateTagExpr(SNode** pNode, void* pContext) {
       memcpy(varDataVal(res->datum.p), tagVal.pData, tagVal.nData);
       varDataSetLen(res->datum.p, tagVal.nData);
     } else {
-      nodesSetValueNodeValue(res, &(tagVal.i64));
+      int32_t code = nodesSetValueNodeValue(res, &(tagVal.i64));
+      if (code != TSDB_CODE_SUCCESS) {
+        return DEAL_RES_ERROR;
+      }
     }
     nodesDestroyNode(*pNode);
     *pNode = (SNode*)res;
@@ -411,7 +426,11 @@ static EDealRes getColumn(SNode** pNode, void* pContext) {
   tagFilterAssist* pData = (tagFilterAssist*)pContext;
   void*            data = taosHashGet(pData->colHash, &pSColumnNode->colId, sizeof(pSColumnNode->colId));
   if (!data) {
+    int32_t tempRes =
         taosHashPut(pData->colHash, &pSColumnNode->colId, sizeof(pSColumnNode->colId), pNode, sizeof((*pNode)));
+    if (tempRes != TSDB_CODE_SUCCESS && tempRes != TSDB_CODE_DUP_KEY) {
+      return DEAL_RES_ERROR;
+    }
     pSColumnNode->slotId = pData->index++;
     SColumnInfo cInfo = {.colId = pSColumnNode->colId,
                          .type = pSColumnNode->node.resType.type,
@@ -420,7 +439,10 @@ static EDealRes getColumn(SNode** pNode, void* pContext) {
 #if TAG_FILTER_DEBUG
     qDebug("tagfilter build column info, slotId:%d, colId:%d, type:%d", pSColumnNode->slotId, cInfo.colId, cInfo.type);
 #endif
-    taosArrayPush(pData->cInfoList, &cInfo);
+    void* tmp = taosArrayPush(pData->cInfoList, &cInfo);
+    if (!tmp) {
+      return DEAL_RES_ERROR;
+    }
   } else {
     SColumnNode* col = *(SColumnNode**)data;
     pSColumnNode->slotId = col->slotId;
@@ -468,28 +490,38 @@ void freeItem(void* p) {
   }
 }
 
-static void genTagFilterDigest(const SNode* pTagCond, T_MD5_CTX* pContext) {
+static int32_t genTagFilterDigest(const SNode* pTagCond, T_MD5_CTX* pContext) {
   if (pTagCond == NULL) {
-    return;
+    return TSDB_CODE_SUCCESS;
   }
 
   char*   payload = NULL;
   int32_t len = 0;
-  nodesNodeToMsg(pTagCond, &payload, &len);
+  int32_t code = nodesNodeToMsg(pTagCond, &payload, &len);
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+    return code;
+  }
 
   tMD5Init(pContext);
   tMD5Update(pContext, (uint8_t*)payload, (uint32_t)len);
   tMD5Final(pContext);
 
   taosMemoryFree(payload);
+  return TSDB_CODE_SUCCESS;
 }
 
-static void genTbGroupDigest(const SNode* pGroup, uint8_t* filterDigest, T_MD5_CTX* pContext) {
+static int32_t genTbGroupDigest(const SNode* pGroup, uint8_t* filterDigest, T_MD5_CTX* pContext) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
   char*   payload = NULL;
   int32_t len = 0;
-  nodesNodeToMsg(pGroup, &payload, &len);
+  code = nodesNodeToMsg(pGroup, &payload, &len);
+  QUERY_CHECK_CODE(code, lino, _end);
+
   if (filterDigest[0]) {
     payload = taosMemoryRealloc(payload, len + tListLen(pContext->digest));
+    QUERY_CHECK_NULL(payload, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
     memcpy(payload + len, filterDigest + 1, tListLen(pContext->digest));
     len += tListLen(pContext->digest);
   }
@@ -498,12 +530,18 @@ static void genTbGroupDigest(const SNode* pGroup, uint8_t* filterDigest, T_MD5_C
   tMD5Update(pContext, (uint8_t*)payload, (uint32_t)len);
   tMD5Final(pContext);
 
+_end:
   taosMemoryFree(payload);
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
+  return code;
 }
 
 int32_t getColInfoResultForGroupby(void* pVnode, SNodeList* group, STableListInfo* pTableListInfo, uint8_t* digest,
                                    SStorageAPI* pAPI, bool initRemainGroups) {
   int32_t      code = TSDB_CODE_SUCCESS;
+  int32_t      lino = 0;
   SArray*      pBlockList = NULL;
   SSDataBlock* pResBlock = NULL;
   void*        keyBuf = NULL;
@@ -540,11 +578,15 @@ int32_t getColInfoResultForGroupby(void* pVnode, SNodeList* group, STableListInf
   if (tsTagFilterCache) {
     SNodeListNode* listNode = (SNodeListNode*)nodesMakeNode(QUERY_NODE_NODE_LIST);
     listNode->pNodeList = group;
-    genTbGroupDigest((SNode*)listNode, digest, &context);
+    code = genTbGroupDigest((SNode*)listNode, digest, &context);
+    QUERY_CHECK_CODE(code, lino, end);
+
     nodesFree(listNode);
 
-    pAPI->metaFn.metaGetCachedTbGroup(pVnode, pTableListInfo->idInfo.suid, context.digest, tListLen(context.digest),
+    code = pAPI->metaFn.metaGetCachedTbGroup(pVnode, pTableListInfo->idInfo.suid, context.digest,
-                                      &tableList);
+                                             tListLen(context.digest), &tableList);
+    QUERY_CHECK_CODE(code, lino, end);
+
     if (tableList) {
       taosArrayDestroy(pTableListInfo->pTableList);
       pTableListInfo->pTableList = tableList;
@@ -555,10 +597,13 @@ int32_t getColInfoResultForGroupby(void* pVnode, SNodeList* group, STableListInf
   }
 
   pUidTagList = taosArrayInit(8, sizeof(STUidTagInfo));
+  QUERY_CHECK_NULL(pUidTagList, code, lino, end, TSDB_CODE_OUT_OF_MEMORY);
+
   for (int32_t i = 0; i < rows; ++i) {
     STableKeyInfo* pkeyInfo = taosArrayGet(pTableListInfo->pTableList, i);
     STUidTagInfo   info = {.uid = pkeyInfo->uid};
-    taosArrayPush(pUidTagList, &info);
+    void*          tmp = taosArrayPush(pUidTagList, &info);
+    QUERY_CHECK_NULL(tmp, code, lino, end, TSDB_CODE_OUT_OF_MEMORY);
   }
 
   code = pAPI->metaFn.getTableTags(pVnode, pTableListInfo->idInfo.suid, pUidTagList);
@@ -577,9 +622,14 @@ int32_t getColInfoResultForGroupby(void* pVnode, SNodeList* group, STableListInf
   //  qDebug("generate tag block rows:%d, cost:%ld us", rows, st1-st);
 
   pBlockList = taosArrayInit(2, POINTER_BYTES);
-  taosArrayPush(pBlockList, &pResBlock);
+  QUERY_CHECK_NULL(pBlockList, code, lino, end, TSDB_CODE_OUT_OF_MEMORY);
+
+  void* tmp = taosArrayPush(pBlockList, &pResBlock);
+  QUERY_CHECK_NULL(tmp, code, lino, end, TSDB_CODE_OUT_OF_MEMORY);
 
   groupData = taosArrayInit(2, POINTER_BYTES);
+  QUERY_CHECK_NULL(groupData, code, lino, end, TSDB_CODE_OUT_OF_MEMORY);
+
   FOREACH(pNode, group) {
     SScalarParam output = {0};
 
@@ -617,7 +667,8 @@ int32_t getColInfoResultForGroupby(void* pVnode, SNodeList* group, STableListInf
       goto end;
     }
 
-    taosArrayPush(groupData, &output.columnData);
+    void* tmp = taosArrayPush(groupData, &output.columnData);
+    QUERY_CHECK_NULL(tmp, code, lino, end, TSDB_CODE_OUT_OF_MEMORY);
   }
 
   int32_t keyLen = 0;
@@ -688,15 +739,21 @@ int32_t getColInfoResultForGroupby(void* pVnode, SNodeList* group, STableListInf
     info->groupId = calcGroupId(keyBuf, len);
     if (initRemainGroups) {
       // groupId ~ table uid
-      taosHashPut(pTableListInfo->remainGroups, &(info->groupId), sizeof(info->groupId), &(info->uid),
+      code = taosHashPut(pTableListInfo->remainGroups, &(info->groupId), sizeof(info->groupId), &(info->uid),
                          sizeof(info->uid));
+      if (code == TSDB_CODE_DUP_KEY) {
+        code = TSDB_CODE_SUCCESS;
+      }
+      QUERY_CHECK_CODE(code, lino, end);
     }
   }
 
   if (tsTagFilterCache) {
     tableList = taosArrayDup(pTableListInfo->pTableList, NULL);
-    pAPI->metaFn.metaPutTbGroupToCache(pVnode, pTableListInfo->idInfo.suid, context.digest, tListLen(context.digest),
+    code = pAPI->metaFn.metaPutTbGroupToCache(pVnode, pTableListInfo->idInfo.suid, context.digest,
-                                       tableList, taosArrayGetSize(tableList) * sizeof(STableKeyInfo));
+                                              tListLen(context.digest), tableList,
+                                              taosArrayGetSize(tableList) * sizeof(STableKeyInfo));
+    QUERY_CHECK_CODE(code, lino, end);
   }
 
   //  int64_t st2 = taosGetTimestampUs();
@@ -710,6 +767,9 @@ end:
   taosArrayDestroy(pBlockList);
   taosArrayDestroyEx(pUidTagList, freeItem);
   taosArrayDestroyP(groupData, releaseColInfoData);
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
   return code;
 }
 
@@ -726,10 +786,14 @@ static int32_t nameComparFn(const void* p1, const void* p2) {
 }
 
 static SArray* getTableNameList(const SNodeListNode* pList) {
+  int32_t    code = TSDB_CODE_SUCCESS;
+  int32_t    lino = 0;
   int32_t    len = LIST_LENGTH(pList->pNodeList);
   SListCell* cell = pList->pNodeList->pHead;
 
   SArray* pTbList = taosArrayInit(len, POINTER_BYTES);
+  QUERY_CHECK_NULL(pTbList, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
+
   for (int i = 0; i < pList->pNodeList->length; i++) {
     SValueNode* valueNode = (SValueNode*)cell->pNode;
     if (!IS_VAR_DATA_TYPE(valueNode->node.resType.type)) {
@@ -739,7 +803,8 @@ static SArray* getTableNameList(const SNodeListNode* pList) {
     }
 
     char* name = varDataVal(valueNode->datum.p);
-    taosArrayPush(pTbList, &name);
+    void* tmp = taosArrayPush(pTbList, &name);
+    QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
     cell = cell->pNext;
   }
 
@@ -750,7 +815,8 @@ static SArray* getTableNameList(const SNodeListNode* pList) {
 
   // remove the duplicates
   SArray* pNewList = taosArrayInit(taosArrayGetSize(pTbList), sizeof(void*));
-  taosArrayPush(pNewList, taosArrayGet(pTbList, 0));
+  void*   tmp = taosArrayPush(pNewList, taosArrayGet(pTbList, 0));
+  QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
 
   for (int32_t i = 1; i < numOfTables; ++i) {
     char** name = taosArrayGetLast(pNewList);
@@ -759,10 +825,16 @@ static SArray* getTableNameList(const SNodeListNode* pList) {
       continue;
     }
 
-    taosArrayPush(pNewList, nameInOldList);
+    tmp = taosArrayPush(pNewList, nameInOldList);
+    QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
   }
 
+_end:
   taosArrayDestroy(pTbList);
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    return NULL;
+  }
   return pNewList;
 }
 
@@ -868,9 +940,18 @@ static int32_t optimizeTbnameInCondImpl(void* pVnode, SArray* pExistedUidList, S
     size_t numOfExisted = taosArrayGetSize(pExistedUidList);  // len > 0 means there already have uids
     if (numOfExisted > 0) {
       uHash = taosHashInit(numOfExisted / 0.7, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
+      if (!uHash) {
+        qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(TSDB_CODE_OUT_OF_MEMORY));
+        return TSDB_CODE_OUT_OF_MEMORY;
+      }
+
       for (int i = 0; i < numOfExisted; i++) {
         STUidTagInfo* pTInfo = taosArrayGet(pExistedUidList, i);
-        taosHashPut(uHash, &pTInfo->uid, sizeof(uint64_t), &i, sizeof(i));
+        int32_t       tempRes = taosHashPut(uHash, &pTInfo->uid, sizeof(uint64_t), &i, sizeof(i));
+        if (tempRes != TSDB_CODE_SUCCESS && tempRes != TSDB_CODE_DUP_KEY) {
+          qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(tempRes));
+          return tempRes;
+        }
       }
     }
 
@@ -883,7 +964,10 @@ static int32_t optimizeTbnameInCondImpl(void* pVnode, SArray* pExistedUidList, S
         if (pStoreAPI->metaFn.getTableTypeByName(pVnode, name, &tbType) == 0 && tbType == TSDB_CHILD_TABLE) {
           if (NULL == uHash || taosHashGet(uHash, &uid, sizeof(uid)) == NULL) {
             STUidTagInfo s = {.uid = uid, .name = name, .pTagVal = NULL};
-            taosArrayPush(pExistedUidList, &s);
+            void*        tmp = taosArrayPush(pExistedUidList, &s);
+            if (!tmp) {
+              return TSDB_CODE_OUT_OF_MEMORY;
+            }
           }
         } else {
           taosArrayDestroy(pTbList);
@@ -906,6 +990,8 @@ static int32_t optimizeTbnameInCondImpl(void* pVnode, SArray* pExistedUidList, S
 
 SSDataBlock* createTagValBlockForFilter(SArray* pColList, int32_t numOfTables, SArray* pUidTagList, void* pVnode,
                                         SStorageAPI* pStorageAPI) {
+  int32_t      code = TSDB_CODE_SUCCESS;
+  int32_t      lino = 0;
   SSDataBlock* pResBlock = createDataBlock();
   if (pResBlock == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
@@ -915,10 +1001,11 @@ SSDataBlock* createTagValBlockForFilter(SArray* pColList, int32_t numOfTables, S
   for (int32_t i = 0; i < taosArrayGetSize(pColList); ++i) {
     SColumnInfoData colInfo = {0};
     colInfo.info = *(SColumnInfo*)taosArrayGet(pColList, i);
-    blockDataAppendColInfo(pResBlock, &colInfo);
+    code = blockDataAppendColInfo(pResBlock, &colInfo);
+    QUERY_CHECK_CODE(code, lino, _end);
   }
 
-  int32_t code = blockDataEnsureCapacity(pResBlock, numOfTables);
+  code = blockDataEnsureCapacity(pResBlock, numOfTables);
   if (code != TSDB_CODE_SUCCESS) {
     terrno = code;
     taosMemoryFree(pResBlock);
@@ -940,10 +1027,12 @@ SSDataBlock* createTagValBlockForFilter(SArray* pColList, int32_t numOfTables, S
         if (p1->name != NULL) {
           STR_TO_VARSTR(str, p1->name);
         } else {  // name is not retrieved during filter
-          pStorageAPI->metaFn.getTableNameByUid(pVnode, p1->uid, str);
+          code = pStorageAPI->metaFn.getTableNameByUid(pVnode, p1->uid, str);
+          QUERY_CHECK_CODE(code, lino, _end);
         }
 
-        colDataSetVal(pColInfo, i, str, false);
+        code = colDataSetVal(pColInfo, i, str, false);
+        QUERY_CHECK_CODE(code, lino, _end);
 #if TAG_FILTER_DEBUG
         qDebug("tagfilter uid:%ld, tbname:%s", *uid, str + 2);
 #endif
@@ -958,18 +1047,22 @@ SSDataBlock* createTagValBlockForFilter(SArray* pColList, int32_t numOfTables, S
           if (p == NULL || (pColInfo->info.type == TSDB_DATA_TYPE_JSON && ((STag*)p)->nTag == 0)) {
             colDataSetNULL(pColInfo, i);
           } else if (pColInfo->info.type == TSDB_DATA_TYPE_JSON) {
-            colDataSetVal(pColInfo, i, p, false);
+            code = colDataSetVal(pColInfo, i, p, false);
+            QUERY_CHECK_CODE(code, lino, _end);
           } else if (IS_VAR_DATA_TYPE(pColInfo->info.type)) {
             char* tmp = taosMemoryMalloc(tagVal.nData + VARSTR_HEADER_SIZE + 1);
+            QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
             varDataSetLen(tmp, tagVal.nData);
             memcpy(tmp + VARSTR_HEADER_SIZE, tagVal.pData, tagVal.nData);
-            colDataSetVal(pColInfo, i, tmp, false);
+            code = colDataSetVal(pColInfo, i, tmp, false);
+            QUERY_CHECK_CODE(code, lino, _end);
 #if TAG_FILTER_DEBUG
             qDebug("tagfilter varch:%s", tmp + 2);
 #endif
             taosMemoryFree(tmp);
           } else {
-            colDataSetVal(pColInfo, i, (const char*)&tagVal.i64, false);
+            code = colDataSetVal(pColInfo, i, (const char*)&tagVal.i64, false);
+            QUERY_CHECK_CODE(code, lino, _end);
 #if TAG_FILTER_DEBUG
             if (pColInfo->info.type == TSDB_DATA_TYPE_INT) {
               qDebug("tagfilter int:%d", *(int*)(&tagVal.i64));
@@ -983,6 +1076,13 @@ SSDataBlock* createTagValBlockForFilter(SArray* pColList, int32_t numOfTables, S
     }
   }
 
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    taosMemoryFree(pResBlock);
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    terrno = code;
+    return NULL;
+  }
   return pResBlock;
 }
 
@@ -1004,7 +1104,10 @@ static int32_t doSetQualifiedUid(STableListInfo* pListInfo, SArray* pUidList, co
       }
 
       if (addUid) {
-        taosArrayPush(pUidList, &uid);
+        void* tmp = taosArrayPush(pUidList, &uid);
+        if (tmp == NULL) {
+          return TSDB_CODE_OUT_OF_MEMORY;
+        }
       }
     }
   }
@@ -1012,17 +1115,23 @@ static int32_t doSetQualifiedUid(STableListInfo* pListInfo, SArray* pUidList, co
   return TSDB_CODE_SUCCESS;
 }
 
-static void copyExistedUids(SArray* pUidTagList, const SArray* pUidList) {
+static int32_t copyExistedUids(SArray* pUidTagList, const SArray* pUidList) {
+  int32_t code = TSDB_CODE_SUCCESS;
   int32_t numOfExisted = taosArrayGetSize(pUidList);
   if (numOfExisted == 0) {
-    return;
+    return code;
   }
 
   for (int32_t i = 0; i < numOfExisted; ++i) {
     uint64_t*    uid = taosArrayGet(pUidList, i);
     STUidTagInfo info = {.uid = *uid};
-    taosArrayPush(pUidTagList, &info);
+    void*        tmp = taosArrayPush(pUidTagList, &info);
+    if (!tmp) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(TSDB_CODE_OUT_OF_MEMORY));
+      return code;
     }
+  }
+  return code;
 }
 
 static int32_t doFilterByTagCond(STableListInfo* pListInfo, SArray* pUidList, SNode* pTagCond, void* pVnode,
@@ -1034,6 +1143,7 @@ static int32_t doFilterByTagCond(STableListInfo* pListInfo, SArray* pUidList, SN
 
   terrno = TSDB_CODE_SUCCESS;
 
+  int32_t      lino = 0;
   int32_t      code = TSDB_CODE_SUCCESS;
   SArray*      pBlockList = NULL;
   SSDataBlock* pResBlock = NULL;
@@ -1044,13 +1154,15 @@ static int32_t doFilterByTagCond(STableListInfo* pListInfo, SArray* pUidList, SN
   ctx.colHash = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_SMALLINT), false, HASH_NO_LOCK);
   if (ctx.colHash == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
-    goto end;
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    QUERY_CHECK_CODE(code, lino, end);
   }
 
   ctx.cInfoList = taosArrayInit(4, sizeof(SColumnInfo));
   if (ctx.cInfoList == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
-    goto end;
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    QUERY_CHECK_CODE(code, lino, end);
   }
 
   nodesRewriteExprPostOrder(&pTagCond, getColumn, (void*)&ctx);
@@ -1059,7 +1171,10 @@ static int32_t doFilterByTagCond(STableListInfo* pListInfo, SArray* pUidList, SN
 
   //  int64_t stt = taosGetTimestampUs();
   pUidTagList = taosArrayInit(10, sizeof(STUidTagInfo));
-  copyExistedUids(pUidTagList, pUidList);
+  QUERY_CHECK_NULL(pUidTagList, code, lino, end, TSDB_CODE_OUT_OF_MEMORY);
+
+  code = copyExistedUids(pUidTagList, pUidList);
+  QUERY_CHECK_CODE(code, lino, end);
 
   FilterCondType condType = checkTagCond(pTagCond);
 
@@ -1068,10 +1183,13 @@ static int32_t doFilterByTagCond(STableListInfo* pListInfo, SArray* pUidList, SN
     taosArrayClear(pUidList);
 
     int32_t numOfRows = taosArrayGetSize(pUidTagList);
-    taosArrayEnsureCap(pUidList, numOfRows);
+    code = taosArrayEnsureCap(pUidList, numOfRows);
+    QUERY_CHECK_CODE(code, lino, end);
+
     for (int32_t i = 0; i < numOfRows; ++i) {
       STUidTagInfo* pInfo = taosArrayGet(pUidTagList, i);
-      taosArrayPush(pUidList, &pInfo->uid);
+      void*         tmp = taosArrayPush(pUidList, &pInfo->uid);
+      QUERY_CHECK_NULL(tmp, code, lino, end, TSDB_CODE_OUT_OF_MEMORY);
     }
     terrno = 0;
   } else {
@@ -1083,7 +1201,7 @@ static int32_t doFilterByTagCond(STableListInfo* pListInfo, SArray* pUidList, SN
     if (code != TSDB_CODE_SUCCESS) {
       qError("failed to get table tags from meta, reason:%s, suid:%" PRIu64, tstrerror(code), pListInfo->idInfo.suid);
       terrno = code;
-      goto end;
+      QUERY_CHECK_CODE(code, lino, end);
     }
   }
 
@@ -1095,35 +1213,41 @@ static int32_t doFilterByTagCond(STableListInfo* pListInfo, SArray* pUidList, SN
   pResBlock = createTagValBlockForFilter(ctx.cInfoList, numOfTables, pUidTagList, pVnode, pAPI);
   if (pResBlock == NULL) {
     code = terrno;
-    goto end;
+    QUERY_CHECK_CODE(code, lino, end);
   }
 
   //  int64_t st1 = taosGetTimestampUs();
   //  qDebug("generate tag block rows:%d, cost:%ld us", rows, st1-st);
   pBlockList = taosArrayInit(2, POINTER_BYTES);
-  taosArrayPush(pBlockList, &pResBlock);
+  QUERY_CHECK_NULL(pBlockList, code, lino, end, TSDB_CODE_OUT_OF_MEMORY);
+
+  void* tmp = taosArrayPush(pBlockList, &pResBlock);
+  QUERY_CHECK_NULL(tmp, code, lino, end, TSDB_CODE_OUT_OF_MEMORY);
 
   code = createResultData(&type, numOfTables, &output);
   if (code != TSDB_CODE_SUCCESS) {
     terrno = code;
-    goto end;
+    QUERY_CHECK_CODE(code, lino, end);
   }
 
   code = scalarCalculate(pTagCond, pBlockList, &output);
   if (code != TSDB_CODE_SUCCESS) {
     qError("failed to calculate scalar, reason:%s", tstrerror(code));
     terrno = code;
-    goto end;
+    QUERY_CHECK_CODE(code, lino, end);
   }
 
   code = doSetQualifiedUid(pListInfo, pUidList, pUidTagList, (bool*)output.columnData->pData, addUid);
   if (code != TSDB_CODE_SUCCESS) {
     terrno = code;
-    goto end;
+    QUERY_CHECK_CODE(code, lino, end);
   }
   *listAdded = true;
 
 end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
   taosHashCleanup(ctx.colHash);
   taosArrayDestroy(ctx.cInfoList);
   blockDataDestroy(pResBlock);
@@ -1138,6 +1262,7 @@ end:
 int32_t getTableList(void* pVnode, SScanPhysiNode* pScanNode, SNode* pTagCond, SNode* pTagIndexCond,
                      STableListInfo* pListInfo, uint8_t* digest, const char* idstr, SStorageAPI* pStorageAPI) {
   int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
   size_t  numOfTables = 0;
   bool    listAdded = false;
 
@@ -1145,27 +1270,30 @@ int32_t getTableList(void* pVnode, SScanPhysiNode* pScanNode, SNode* pTagCond, S
   pListInfo->idInfo.tableType = pScanNode->tableType;
 
   SArray* pUidList = taosArrayInit(8, sizeof(uint64_t));
+  QUERY_CHECK_NULL(pUidList, code, lino, _error, TSDB_CODE_OUT_OF_MEMORY);
 
   SIdxFltStatus status = SFLT_NOT_INDEX;
   if (pScanNode->tableType != TSDB_SUPER_TABLE) {
     pListInfo->idInfo.uid = pScanNode->uid;
     if (pStorageAPI->metaFn.isTableExisted(pVnode, pScanNode->uid)) {
-      taosArrayPush(pUidList, &pScanNode->uid);
+      void* tmp = taosArrayPush(pUidList, &pScanNode->uid);
+      QUERY_CHECK_NULL(tmp, code, lino, _error, TSDB_CODE_OUT_OF_MEMORY);
     }
     code = doFilterByTagCond(pListInfo, pUidList, pTagCond, pVnode, status, pStorageAPI, false, &listAdded);
-    if (code != TSDB_CODE_SUCCESS) {
+    QUERY_CHECK_CODE(code, lino, _end);
-      goto _end;
-    }
   } else {
     T_MD5_CTX context = {0};
 
     if (tsTagFilterCache) {
       // try to retrieve the result from meta cache
-      genTagFilterDigest(pTagCond, &context);
+      code = genTagFilterDigest(pTagCond, &context);
+      QUERY_CHECK_CODE(code, lino, _error);
 
       bool acquired = false;
-      pStorageAPI->metaFn.getCachedTableList(pVnode, pScanNode->suid, context.digest, tListLen(context.digest),
+      code = pStorageAPI->metaFn.getCachedTableList(pVnode, pScanNode->suid, context.digest, tListLen(context.digest),
                                                     pUidList, &acquired);
+      QUERY_CHECK_CODE(code, lino, _error);
+
       if (acquired) {
         digest[0] = 1;
         memcpy(digest + 1, context.digest, tListLen(context.digest));
@@ -1175,7 +1303,8 @@ int32_t getTableList(void* pVnode, SScanPhysiNode* pScanNode, SNode* pTagCond, S
     }
 
     if (!pTagCond) {  // no tag filter condition exists, let's fetch all tables of this super table
-      pStorageAPI->metaFn.getChildTableList(pVnode, pScanNode->suid, pUidList);
+      code = pStorageAPI->metaFn.getChildTableList(pVnode, pScanNode->suid, pUidList);
+      QUERY_CHECK_CODE(code, lino, _error);
     } else {
       // failed to find the result in the cache, let try to calculate the results
       if (pTagIndexCond) {
@@ -1197,9 +1326,7 @@ int32_t getTableList(void* pVnode, SScanPhysiNode* pScanNode, SNode* pTagCond, S
     }
 
     code = doFilterByTagCond(pListInfo, pUidList, pTagCond, pVnode, status, pStorageAPI, tsTagFilterCache, &listAdded);
-    if (code != TSDB_CODE_SUCCESS) {
+    QUERY_CHECK_CODE(code, lino, _end);
-      goto _end;
-    }
 
     // let's add the filter results into meta-cache
     numOfTables = taosArrayGetSize(pUidList);
@@ -1207,14 +1334,17 @@ int32_t getTableList(void* pVnode, SScanPhysiNode* pScanNode, SNode* pTagCond, S
     if (tsTagFilterCache) {
       size_t size = numOfTables * sizeof(uint64_t) + sizeof(int32_t);
       char*  pPayload = taosMemoryMalloc(size);
+      QUERY_CHECK_NULL(pPayload, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
 
       *(int32_t*)pPayload = numOfTables;
       if (numOfTables > 0) {
         memcpy(pPayload + sizeof(int32_t), taosArrayGet(pUidList, 0), numOfTables * sizeof(uint64_t));
       }
 
-      pStorageAPI->metaFn.putCachedTableList(pVnode, pScanNode->suid, context.digest, tListLen(context.digest),
+      code = pStorageAPI->metaFn.putCachedTableList(pVnode, pScanNode->suid, context.digest, tListLen(context.digest),
                                                     pPayload, size, 1);
+      QUERY_CHECK_CODE(code, lino, _error);
+
       digest[0] = 1;
       memcpy(digest + 1, context.digest, tListLen(context.digest));
     }
@@ -1236,7 +1366,11 @@ _end:
     }
   }
 
+_error:
   taosArrayDestroy(pUidList);
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
   return code;
 }
 
@@ -1360,7 +1494,12 @@ SArray* makeColumnArrayFromList(SNodeList* pNodeList) {
     c.precision = pColNode->node.resType.precision;
     c.scale = pColNode->node.resType.scale;
 
-    taosArrayPush(pList, &c);
+    void* tmp = taosArrayPush(pList, &c);
+    if (!tmp) {
+      taosArrayDestroy(pList);
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(TSDB_CODE_OUT_OF_MEMORY));
+      return NULL;
+    }
   }
 
   return pList;
@@ -1369,7 +1508,8 @@ SArray* makeColumnArrayFromList(SNodeList* pNodeList) {
 int32_t extractColMatchInfo(SNodeList* pNodeList, SDataBlockDescNode* pOutputNodeList, int32_t* numOfOutputCols,
                             int32_t type, SColMatchInfo* pMatchInfo) {
   size_t  numOfCols = LIST_LENGTH(pNodeList);
-  int32_t code = 0;
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
 
   pMatchInfo->matchType = type;
 
@@ -1390,7 +1530,8 @@ int32_t extractColMatchInfo(SNodeList* pNodeList, SDataBlockDescNode* pOutputNod
       c.dstSlotId = pNode->slotId;
       c.isPk = pColNode->isPk;
       c.dataType = pColNode->node.resType;
-      taosArrayPush(pList, &c);
+      void* tmp = taosArrayPush(pList, &c);
+      QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
     }
   }
 
@@ -1424,6 +1565,11 @@ int32_t extractColMatchInfo(SNodeList* pNodeList, SDataBlockDescNode* pOutputNod
   }
 
   pMatchInfo->pList = pList;
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
   return code;
 }
 
@@ -1458,8 +1604,12 @@ static SColumn* createColumn(int32_t blockId, int32_t slotId, int32_t colId, SDa
   return pCol;
 }
 
-void createExprFromOneNode(SExprInfo* pExp, SNode* pNode, int16_t slotId) {
+int32_t createExprFromOneNode(SExprInfo* pExp, SNode* pNode, int16_t slotId) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
   pExp->pExpr = taosMemoryCalloc(1, sizeof(tExprNode));
+  QUERY_CHECK_NULL(pExp->pExpr, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
+
   pExp->pExpr->_function.num = 1;
   pExp->pExpr->_function.functionId = -1;
 
@@ -1470,6 +1620,8 @@ void createExprFromOneNode(SExprInfo* pExp, SNode* pNode, int16_t slotId) {
     SColumnNode* pColNode = (SColumnNode*)pNode;
 
     pExp->base.pParam = taosMemoryCalloc(1, sizeof(SFunctParam));
+    QUERY_CHECK_NULL(pExp->base.pParam, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
+
     pExp->base.numOfParams = 1;
 
     SDataType* pType = &pColNode->node.resType;
@@ -1483,6 +1635,8 @@ void createExprFromOneNode(SExprInfo* pExp, SNode* pNode, int16_t slotId) {
     SValueNode* pValNode = (SValueNode*)pNode;
 
     pExp->base.pParam = taosMemoryCalloc(1, sizeof(SFunctParam));
+    QUERY_CHECK_NULL(pExp->base.pParam, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
+
     pExp->base.numOfParams = 1;
 
     SDataType* pType = &pValNode->node.resType;
@@ -1518,7 +1672,8 @@ void createExprFromOneNode(SExprInfo* pExp, SNode* pNode, int16_t slotId) {
       if (NULL == res) {  // todo handle error
       } else {
         res->node.resType = (SDataType){.bytes = sizeof(int64_t), .type = TSDB_DATA_TYPE_BIGINT};
-        nodesListAppend(pFuncNode->pParameterList, (SNode*)res);
+        code = nodesListAppend(pFuncNode->pParameterList, (SNode*)res);
+        QUERY_CHECK_CODE(code, lino, _end);
       }
     }
 #endif
@@ -1567,10 +1722,16 @@ void createExprFromOneNode(SExprInfo* pExp, SNode* pNode, int16_t slotId) {
   } else {
     ASSERT(0);
   }
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
+  return code;
 }
 
-void createExprFromTargetNode(SExprInfo* pExp, STargetNode* pTargetNode) {
+int32_t createExprFromTargetNode(SExprInfo* pExp, STargetNode* pTargetNode) {
-  createExprFromOneNode(pExp, pTargetNode->pExpr, pTargetNode->slotId);
+  return createExprFromOneNode(pExp, pTargetNode->pExpr, pTargetNode->slotId);
 }
 
 SExprInfo* createExpr(SNodeList* pNodeList, int32_t* numOfExprs) {
@@ -1579,7 +1740,12 @@ SExprInfo* createExpr(SNodeList* pNodeList, int32_t* numOfExprs) {
 
   for (int32_t i = 0; i < (*numOfExprs); ++i) {
     SExprInfo* pExp = &pExprs[i];
-    createExprFromOneNode(pExp, nodesListGetNode(pNodeList, i), i + UD_TAG_COLUMN_INDEX);
+    int32_t    code = createExprFromOneNode(pExp, nodesListGetNode(pNodeList, i), i + UD_TAG_COLUMN_INDEX);
+    if (code != TSDB_CODE_SUCCESS) {
+      taosMemoryFreeClear(pExprs);
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+      return NULL;
+    }
   }
 
   return pExprs;
@@ -1608,7 +1774,12 @@ SExprInfo* createExprInfo(SNodeList* pNodeList, SNodeList* pGroupKeys, int32_t*
     }
 
     SExprInfo* pExp = &pExprs[i];
-    createExprFromTargetNode(pExp, pTargetNode);
+    int32_t    code = createExprFromTargetNode(pExp, pTargetNode);
+    if (code != TSDB_CODE_SUCCESS) {
+      taosMemoryFreeClear(pExprs);
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+      return NULL;
+    }
   }
 
   return pExprs;
@@ -1627,8 +1798,8 @@ static int32_t setSelectValueColumnInfo(SqlFunctionCtx* pCtx, int32_t numOfOutpu
   SHashObj* pSelectFuncs = taosHashInit(8, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_ENTRY_LOCK);
   for (int32_t i = 0; i < numOfOutput; ++i) {
     const char* pName = pCtx[i].pExpr->pExpr->_function.functionName;
-    if ((strcmp(pName, "_select_value") == 0) || (strcmp(pName, "_group_key") == 0)
+    if ((strcmp(pName, "_select_value") == 0) || (strcmp(pName, "_group_key") == 0) ||
-      || (strcmp(pName, "_group_const_value") == 0)) {
+        (strcmp(pName, "_group_const_value") == 0)) {
       pValCtx[num++] = &pCtx[i];
     } else if (fmIsSelectFunc(pCtx[i].functionId)) {
       void* data = taosHashGet(pSelectFuncs, pName, strlen(pName));
@@ -1636,7 +1807,11 @@ static int32_t setSelectValueColumnInfo(SqlFunctionCtx* pCtx, int32_t numOfOutpu
         p = NULL;
         break;
       } else {
-        taosHashPut(pSelectFuncs, pName, strlen(pName), &num, sizeof(num));
+        int32_t tempRes = taosHashPut(pSelectFuncs, pName, strlen(pName), &num, sizeof(num));
+        if (tempRes != TSDB_CODE_SUCCESS && tempRes != TSDB_CODE_DUP_KEY) {
+          qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(tempRes));
+          return tempRes;
+        }
         p = &pCtx[i];
       }
     }
@@ -1655,6 +1830,8 @@ static int32_t setSelectValueColumnInfo(SqlFunctionCtx* pCtx, int32_t numOfOutpu
 
 SqlFunctionCtx* createSqlFunctionCtx(SExprInfo* pExprInfo, int32_t numOfOutput, int32_t** rowEntryInfoOffset,
                                      SFunctionStateStore* pStore) {
+  int32_t         code = TSDB_CODE_SUCCESS;
+  int32_t         lino = 0;
   SqlFunctionCtx* pFuncCtx = (SqlFunctionCtx*)taosMemoryCalloc(numOfOutput, sizeof(SqlFunctionCtx));
   if (pFuncCtx == NULL) {
     return NULL;
@@ -1681,20 +1858,35 @@ SqlFunctionCtx* createSqlFunctionCtx(SExprInfo* pExprInfo, int32_t numOfOutput,
       pCtx->isPseudoFunc = fmIsWindowPseudoColumnFunc(pCtx->functionId);
       pCtx->isNotNullFunc = fmIsNotNullOutputFunc(pCtx->functionId);
 
-      if (fmIsAggFunc(pCtx->functionId) || fmIsIndefiniteRowsFunc(pCtx->functionId)) {
       bool isUdaf = fmIsUserDefinedFunc(pCtx->functionId);
+      if (fmIsAggFunc(pCtx->functionId) || fmIsIndefiniteRowsFunc(pCtx->functionId)) {
         if (!isUdaf) {
-          fmGetFuncExecFuncs(pCtx->functionId, &pCtx->fpSet);
+          code = fmGetFuncExecFuncs(pCtx->functionId, &pCtx->fpSet);
+          QUERY_CHECK_CODE(code, lino, _end);
         } else {
           char* udfName = pExpr->pExpr->_function.pFunctNode->functionName;
           pCtx->udfName = taosStrdup(udfName);
-          fmGetUdafExecFuncs(pCtx->functionId, &pCtx->fpSet);
+          code = fmGetUdafExecFuncs(pCtx->functionId, &pCtx->fpSet);
+          QUERY_CHECK_CODE(code, lino, _end);
+        }
+        bool tmp = pCtx->fpSet.getEnv(pExpr->pExpr->_function.pFunctNode, &env);
+        if (!tmp) {
+          code = TSDB_CODE_OUT_OF_MEMORY;
+          QUERY_CHECK_CODE(code, lino, _end);
         }
-        pCtx->fpSet.getEnv(pExpr->pExpr->_function.pFunctNode, &env);
       } else {
-        fmGetScalarFuncExecFuncs(pCtx->functionId, &pCtx->sfp);
+        code = fmGetScalarFuncExecFuncs(pCtx->functionId, &pCtx->sfp);
+        if (code != TSDB_CODE_SUCCESS && isUdaf) {
+          code = TSDB_CODE_SUCCESS;
+        }
+        QUERY_CHECK_CODE(code, lino, _end);
+
         if (pCtx->sfp.getEnv != NULL) {
-          pCtx->sfp.getEnv(pExpr->pExpr->_function.pFunctNode, &env);
+          bool tmp = pCtx->sfp.getEnv(pExpr->pExpr->_function.pFunctNode, &env);
+          if (!tmp) {
+            code = TSDB_CODE_OUT_OF_MEMORY;
+            QUERY_CHECK_CODE(code, lino, _end);
+          }
         }
       }
       pCtx->resDataInfo.interBufSize = env.calcMemSize;
@@ -1706,7 +1898,9 @@ SqlFunctionCtx* createSqlFunctionCtx(SExprInfo* pExprInfo, int32_t numOfOutput,
 
     pCtx->input.numOfInputCols = pFunct->numOfParams;
     pCtx->input.pData = taosMemoryCalloc(pFunct->numOfParams, POINTER_BYTES);
+    QUERY_CHECK_NULL(pCtx->input.pData, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
     pCtx->input.pColumnDataAgg = taosMemoryCalloc(pFunct->numOfParams, POINTER_BYTES);
+    QUERY_CHECK_NULL(pCtx->input.pColumnDataAgg, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
 
     pCtx->pTsOutput = NULL;
     pCtx->resDataInfo.bytes = pFunct->resSchema.bytes;
@@ -1726,13 +1920,26 @@ SqlFunctionCtx* createSqlFunctionCtx(SExprInfo* pExprInfo, int32_t numOfOutput,
                                          pFuncCtx[i - 1].resDataInfo.interBufSize);
   }
 
-  setSelectValueColumnInfo(pFuncCtx, numOfOutput);
+  code = setSelectValueColumnInfo(pFuncCtx, numOfOutput);
+  QUERY_CHECK_CODE(code, lino, _end);
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    for (int32_t i = 0; i < numOfOutput; ++i) {
+      taosMemoryFree(pFuncCtx[i].input.pData);
+      taosMemoryFree(pFuncCtx[i].input.pColumnDataAgg);
+    }
+    taosMemoryFreeClear(pFuncCtx);
+    return NULL;
+  }
   return pFuncCtx;
 }
 
 // NOTE: sources columns are more than the destination SSDatablock columns.
 // doFilter in table scan needs every column even its output is false
-void relocateColumnData(SSDataBlock* pBlock, const SArray* pColMatchInfo, SArray* pCols, bool outputEveryColumn) {
+int32_t relocateColumnData(SSDataBlock* pBlock, const SArray* pColMatchInfo, SArray* pCols, bool outputEveryColumn) {
+  int32_t code = TSDB_CODE_SUCCESS;
   size_t  numOfSrcCols = taosArrayGetSize(pCols);
 
   int32_t i = 0, j = 0;
@@ -1742,7 +1949,11 @@ void relocateColumnData(SSDataBlock* pBlock, const SArray* pColMatchInfo, SArray
 
     if (p->info.colId == pmInfo->colId) {
       SColumnInfoData* pDst = taosArrayGet(pBlock->pDataBlock, pmInfo->dstSlotId);
-      colDataAssign(pDst, p, pBlock->info.rows, &pBlock->info);
+      code = colDataAssign(pDst, p, pBlock->info.rows, &pBlock->info);
+      if (code != TSDB_CODE_SUCCESS) {
+        qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+        return code;
+      }
       i++;
       j++;
     } else if (p->info.colId < pmInfo->colId) {
@@ -1751,6 +1962,7 @@ void relocateColumnData(SSDataBlock* pBlock, const SArray* pColMatchInfo, SArray
       ASSERT(0);
     }
   }
+  return code;
 }
 
 SInterval extractIntervalInfo(const STableScanPhysiNode* pTableScanNode) {
@@ -2024,7 +2236,6 @@ uint64_t tableListGetTableGroupId(const STableListInfo* pTableList, uint64_t tab
 int32_t tableListAddTableInfo(STableListInfo* pTableList, uint64_t uid, uint64_t gid) {
   int32_t code = TSDB_CODE_SUCCESS;
   int32_t lino = 0;
-
   if (pTableList->map == NULL) {
     pTableList->map = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_ENTRY_LOCK);
     QUERY_CHECK_NULL(pTableList->map, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
@@ -2036,6 +2247,9 @@ int32_t tableListAddTableInfo(STableListInfo* pTableList, uint64_t uid, uint64_t
 
   int32_t slot = (int32_t)taosArrayGetSize(pTableList->pTableList) - 1;
   code = taosHashPut(pTableList->map, &uid, sizeof(uid), &slot, sizeof(slot));
+  if (code == TSDB_CODE_DUP_KEY) {
+    code = TSDB_CODE_SUCCESS;
+  }
   QUERY_CHECK_CODE(code, lino, _end);
 
 _end:
@@ -2159,12 +2373,20 @@ static int32_t sortTableGroup(STableListInfo* pTableListInfo) {
   uint64_t       gid = pInfo->groupId;
 
   int32_t start = 0;
-  taosArrayPush(pList, &start);
+  void*   tmp = taosArrayPush(pList, &start);
+  if (!tmp) {
+    qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(TSDB_CODE_OUT_OF_MEMORY));
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
 
   for (int32_t i = 1; i < size; ++i) {
     pInfo = taosArrayGet(pTableListInfo->pTableList, i);
     if (pInfo->groupId != gid) {
-      taosArrayPush(pList, &i);
+      tmp = taosArrayPush(pList, &i);
+      if (!tmp) {
+        qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(TSDB_CODE_OUT_OF_MEMORY));
+        return TSDB_CODE_OUT_OF_MEMORY;
+      }
       gid = pInfo->groupId;
     }
   }
@@ -2191,7 +2413,8 @@ int32_t buildGroupIdMapForAllTables(STableListInfo* pTableListInfo, SReadHandle*
     return code;
   }
   if (group == NULL || groupByTbname) {
-    if (tsCountAlwaysReturnValue && QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN == nodeType(pScanNode) && ((STableScanPhysiNode*)pScanNode)->needCountEmptyTable) {
+    if (tsCountAlwaysReturnValue && QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN == nodeType(pScanNode) &&
+        ((STableScanPhysiNode*)pScanNode)->needCountEmptyTable) {
       pTableListInfo->remainGroups =
           taosHashInit(numOfTables, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
       if (pTableListInfo->remainGroups == NULL) {
@@ -2202,8 +2425,12 @@ int32_t buildGroupIdMapForAllTables(STableListInfo* pTableListInfo, SReadHandle*
         STableKeyInfo* info = taosArrayGet(pTableListInfo->pTableList, i);
         info->groupId = groupByTbname ? info->uid : 0;
 
-        taosHashPut(pTableListInfo->remainGroups, &(info->groupId), sizeof(info->groupId), &(info->uid),
+        int32_t tempRes = taosHashPut(pTableListInfo->remainGroups, &(info->groupId), sizeof(info->groupId),
-                    sizeof(info->uid));
+                                      &(info->uid), sizeof(info->uid));
+        if (tempRes != TSDB_CODE_SUCCESS && tempRes != TSDB_CODE_DUP_KEY) {
+          qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(tempRes));
+          return tempRes;
+        }
       }
     } else {
       for (int32_t i = 0; i < numOfTables; i++) {
@@ -2251,7 +2478,11 @@ int32_t buildGroupIdMapForAllTables(STableListInfo* pTableListInfo, SReadHandle*
   size_t size = taosArrayGetSize(pTableListInfo->pTableList);
   for (int32_t i = 0; i < size; ++i) {
     STableKeyInfo* p = taosArrayGet(pTableListInfo->pTableList, i);
-    taosHashPut(pTableListInfo->map, &p->uid, sizeof(uint64_t), &i, sizeof(int32_t));
+    int32_t        tempRes = taosHashPut(pTableListInfo->map, &p->uid, sizeof(uint64_t), &i, sizeof(int32_t));
+    if (tempRes != TSDB_CODE_SUCCESS && tempRes != TSDB_CODE_DUP_KEY) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(tempRes));
+      return tempRes;
+    }
   }
 
   return code;
@@ -2457,7 +2688,11 @@ SNodeList* makeColsNodeArrFromSortKeys(SNodeList* pSortKeys) {
   SNodeList* ret = NULL;
   FOREACH(node, pSortKeys) {
     SOrderByExprNode* pSortKey = (SOrderByExprNode*)node;
-    nodesListMakeAppend(&ret, pSortKey->pExpr);
+    int32_t           code = nodesListMakeAppend(&ret, pSortKey->pExpr);
+    if (code != TSDB_CODE_SUCCESS) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+      return NULL;
+    }
   }
   return ret;
 }

source/libs/executor/src/executor.c

@@ -97,7 +97,7 @@ static int32_t doSetSMABlock(SOperatorInfo* pOperator, void* input, size_t numOf
 
 _end:
   if (code != TSDB_CODE_SUCCESS) {
-    qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
   }
   return code;
 }

source/libs/executor/src/executorInt.c

@@ -521,8 +521,8 @@ int32_t setResultRowInitCtx(SResultRow* pResult, SqlFunctionCtx* pCtx, int32_t n
 
     if (!pResInfo->initialized) {
       if (pCtx[i].functionId != -1) {
-        bool ini = pCtx[i].fpSet.init(&pCtx[i], pResInfo);
+        int32_t code = pCtx[i].fpSet.init(&pCtx[i], pResInfo);
-        if (!ini && fmIsUserDefinedFunc(pCtx[i].functionId)) {
+        if (code != TSDB_CODE_SUCCESS && fmIsUserDefinedFunc(pCtx[i].functionId)){
           pResInfo->initialized = false;
           return TSDB_CODE_UDF_FUNC_EXEC_FAILURE;
         }
@@ -677,7 +677,7 @@ _end:
 }
 
 // todo refactor. SResultRow has direct pointer in miainfo
-int32_t finalizeResultRows(SDiskbasedBuf* pBuf, SResultRowPosition* resultRowPosition, SExprSupp* pSup,
+void finalizeResultRows(SDiskbasedBuf* pBuf, SResultRowPosition* resultRowPosition, SExprSupp* pSup,
                            SSDataBlock* pBlock, SExecTaskInfo* pTaskInfo) {
   SFilePage* page = getBufPage(pBuf, resultRowPosition->pageId);
   if (page == NULL) {
@@ -694,7 +694,7 @@ int32_t finalizeResultRows(SDiskbasedBuf* pBuf, SResultRowPosition* resultRowPos
   doUpdateNumOfRows(pCtx, pRow, pSup->numOfExprs, rowEntryOffset);
   if (pRow->numOfRows == 0) {
     releaseBufPage(pBuf, page);
-    return 0;
+    return ;
   }
 
   int32_t size = pBlock->info.capacity;
@@ -713,7 +713,6 @@ int32_t finalizeResultRows(SDiskbasedBuf* pBuf, SResultRowPosition* resultRowPos
 
   releaseBufPage(pBuf, page);
   pBlock->info.rows += pRow->numOfRows;
-  return 0;
 }
 
 void doCopyToSDataBlockByHash(SExecTaskInfo* pTaskInfo, SSDataBlock* pBlock, SExprSupp* pSup, SDiskbasedBuf* pBuf,

source/libs/executor/src/filloperator.c

@@ -64,6 +64,7 @@ static void doHandleRemainBlockForNewGroupImpl(SOperatorInfo* pOperator, SFillOp
                                                SResultInfo* pResultInfo, int32_t order) {
   pInfo->totalInputRows = pInfo->existNewGroupBlock->info.rows;
   SSDataBlock*   pResBlock = pInfo->pFinalRes;
+  SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
 
   //  int32_t order = TSDB_ORDER_ASC;
   int32_t scanFlag = MAIN_SCAN;
@@ -85,7 +86,11 @@ static void doHandleRemainBlockForNewGroupImpl(SOperatorInfo* pOperator, SFillOp
   }
 
   int32_t numOfResultRows = pResultInfo->capacity - pResBlock->info.rows;
-  taosFillResultDataBlock(pInfo->pFillInfo, pResBlock, numOfResultRows);
+  int32_t code = taosFillResultDataBlock(pInfo->pFillInfo, pResBlock, numOfResultRows);
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+    T_LONG_JMP(pTaskInfo->env, code);
+  }
 
   pInfo->curGroupId = pInfo->existNewGroupBlock->info.id.groupId;
   pInfo->existNewGroupBlock = NULL;
@@ -96,7 +101,11 @@ static void doHandleRemainBlockFromNewGroup(SOperatorInfo* pOperator, SFillOpera
   SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
   if (taosFillHasMoreResults(pInfo->pFillInfo)) {
     int32_t numOfResultRows = pResultInfo->capacity - pInfo->pFinalRes->info.rows;
-    taosFillResultDataBlock(pInfo->pFillInfo, pInfo->pFinalRes, numOfResultRows);
+    int32_t code = taosFillResultDataBlock(pInfo->pFillInfo, pInfo->pFinalRes, numOfResultRows);
+    if (code != TSDB_CODE_SUCCESS) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+      T_LONG_JMP(pTaskInfo->env, code);
+    }
     pInfo->pRes->info.id.groupId = pInfo->curGroupId;
     return;
   }
@@ -269,7 +278,8 @@ static SSDataBlock* doFillImpl(SOperatorInfo* pOperator) {
     }
 
     int32_t numOfResultRows = pOperator->resultInfo.capacity - pResBlock->info.rows;
-    taosFillResultDataBlock(pInfo->pFillInfo, pResBlock, numOfResultRows);
+    code = taosFillResultDataBlock(pInfo->pFillInfo, pResBlock, numOfResultRows);
+    QUERY_CHECK_CODE(code, lino, _end);
 
     // current group has no more result to return
     if (pResBlock->info.rows > 0) {
@@ -356,7 +366,8 @@ void destroyFillOperatorInfo(void* param) {
 
 static int32_t initFillInfo(SFillOperatorInfo* pInfo, SExprInfo* pExpr, int32_t numOfCols, SExprInfo* pNotFillExpr,
                             int32_t numOfNotFillCols, SNodeListNode* pValNode, STimeWindow win, int32_t capacity,
-                            const char* id, SInterval* pInterval, int32_t fillType, int32_t order) {
+                            const char* id, SInterval* pInterval, int32_t fillType, int32_t order,
+                            SExecTaskInfo* pTaskInfo) {
   SFillColInfo* pColInfo = createFillColInfo(pExpr, numOfCols, pNotFillExpr, numOfNotFillCols, pValNode);
 
   int64_t startKey = (order == TSDB_ORDER_ASC) ? win.skey : win.ekey;
@@ -364,7 +375,7 @@ static int32_t initFillInfo(SFillOperatorInfo* pInfo, SExprInfo* pExpr, int32_t
   //  STimeWindow w = {0};
   //  getInitialStartTimeWindow(pInterval, startKey, &w, order == TSDB_ORDER_ASC);
   pInfo->pFillInfo = taosCreateFillInfo(startKey, numOfCols, numOfNotFillCols, capacity, pInterval, fillType, pColInfo,
-                                        pInfo->primaryTsCol, order, id);
+                                        pInfo->primaryTsCol, order, id, pTaskInfo);
 
   if (order == TSDB_ORDER_ASC) {
     pInfo->win.skey = win.skey;
@@ -414,7 +425,13 @@ static int32_t createPrimaryTsExprIfNeeded(SFillOperatorInfo* pInfo, SFillPhysiN
       return TSDB_CODE_OUT_OF_MEMORY;
     }
 
-    createExprFromTargetNode(&pExpr[pExprSupp->numOfExprs], (STargetNode*)pPhyFillNode->pWStartTs);
+    int32_t code = createExprFromTargetNode(&pExpr[pExprSupp->numOfExprs], (STargetNode*)pPhyFillNode->pWStartTs);
+    if (code != TSDB_CODE_SUCCESS) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+      taosMemoryFreeClear(pExpr);
+      return code;
+    }
+
     pExprSupp->numOfExprs += 1;
     pExprSupp->pExprInfo = pExpr;
   }
@@ -480,7 +497,7 @@ int32_t createFillOperatorInfo(SOperatorInfo* downstream, SFillPhysiNode* pPhyFi
 
   code = initFillInfo(pInfo, pExprInfo, pInfo->numOfExpr, pNoFillSupp->pExprInfo, pNoFillSupp->numOfExprs,
                       (SNodeListNode*)pPhyFillNode->pValues, pPhyFillNode->timeRange, pResultInfo->capacity,
-                      pTaskInfo->id.str, pInterval, type, order);
+                      pTaskInfo->id.str, pInterval, type, order, pTaskInfo);
   if (code != TSDB_CODE_SUCCESS) {
     goto _error;
   }

source/libs/executor/src/groupoperator.c

@@ -778,6 +778,9 @@ void* getCurrentDataGroupInfo(const SPartitionOperatorInfo* pInfo, SDataGroupInf
     QUERY_CHECK_NULL(gi.pPageList, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
 
     code = taosHashPut(pInfo->pGroupSet, pInfo->keyBuf, len, &gi, sizeof(SDataGroupInfo));
+    if (code == TSDB_CODE_DUP_KEY) {
+      code = TSDB_CODE_SUCCESS;
+    }
     QUERY_CHECK_CODE(code, lino, _end);
 
     p = taosHashGet(pInfo->pGroupSet, pInfo->keyBuf, len);
@@ -1403,6 +1406,9 @@ static void doStreamHashPartitionImpl(SStreamPartitionOperatorInfo* pInfo, SSDat
 
       code =
           taosHashPut(pInfo->pPartitions, pInfo->partitionSup.keyBuf, keyLen, &newParData, sizeof(SPartitionDataInfo));
+      if (code == TSDB_CODE_DUP_KEY) {
+        code = TSDB_CODE_SUCCESS;
+      }
       QUERY_CHECK_CODE(code, lino, _end);
     }
   }
@@ -1622,7 +1628,9 @@ int32_t createStreamPartitionOperatorInfo(SOperatorInfo* downstream, SStreamPart
     QUERY_CHECK_NULL(pSubTableExpr, code, lino, _error, TSDB_CODE_OUT_OF_MEMORY);
 
     pInfo->tbnameCalSup.pExprInfo = pSubTableExpr;
-    createExprFromOneNode(pSubTableExpr, pPartNode->pSubtable, 0);
+    code = createExprFromOneNode(pSubTableExpr, pPartNode->pSubtable, 0);
+    QUERY_CHECK_CODE(code, lino, _error);
+
     code = initExprSupp(&pInfo->tbnameCalSup, pSubTableExpr, 1, &pTaskInfo->storageAPI.functionStore);
     QUERY_CHECK_CODE(code, lino, _error);
   }

source/libs/executor/src/scanoperator.c

@@ -175,8 +175,13 @@ static int32_t insertTableToScanIgnoreList(STableScanInfo* pTableScanInfo, uint6
     }
   }
 
-  return taosHashPut(pTableScanInfo->pIgnoreTables, &uid, sizeof(uid), &pTableScanInfo->scanTimes,
+  int32_t tempRes = taosHashPut(pTableScanInfo->pIgnoreTables, &uid, sizeof(uid), &pTableScanInfo->scanTimes,
                                 sizeof(pTableScanInfo->scanTimes));
+  if (tempRes != TSDB_CODE_SUCCESS && tempRes != TSDB_CODE_DUP_KEY) {
+    qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(tempRes));
+    return tempRes;
+  }
+  return TSDB_CODE_SUCCESS;
 }
 
 static int32_t doDynamicPruneDataBlock(SOperatorInfo* pOperator, SDataBlockInfo* pBlockInfo, uint32_t* status) {
@@ -202,8 +207,9 @@ static int32_t doDynamicPruneDataBlock(SOperatorInfo* pOperator, SDataBlockInfo*
 
     SResultRowEntryInfo* pEntry = getResultEntryInfo(pRow, i, pTableScanInfo->base.pdInfo.pExprSup->rowEntryInfoOffset);
 
-    int32_t reqStatus = fmFuncDynDataRequired(functionId, pEntry, pBlockInfo);
+    int32_t reqStatus;
-    if (reqStatus != FUNC_DATA_REQUIRED_NOT_LOAD) {
+    code = fmFuncDynDataRequired(functionId, pEntry, pBlockInfo, &reqStatus);
+    if (code != TSDB_CODE_SUCCESS || reqStatus != FUNC_DATA_REQUIRED_NOT_LOAD) {
       notLoadBlock = false;
       break;
     }
@@ -278,7 +284,8 @@ bool applyLimitOffset(SLimitInfo* pLimitInfo, SSDataBlock* pBlock, SExecTaskInfo
       int32_t code = blockDataTrimFirstRows(pBlock, pLimitInfo->remainOffset);
       if (code != TSDB_CODE_SUCCESS) {
         qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
-        T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+        pTaskInfo->code = code;
+        T_LONG_JMP(pTaskInfo->env, code);
       }
       pLimitInfo->remainOffset = 0;
     }
@@ -359,11 +366,9 @@ static int32_t loadDataBlock(SOperatorInfo* pOperator, STableScanBase* pTableSca
     if (success) {
       size_t size = taosArrayGetSize(pBlock->pDataBlock);
       bool   keep = false;
-      int32_t code =
+      code = doFilterByBlockSMA(pOperator->exprSupp.pFilterInfo, pBlock->pBlockAgg, size, pBlockInfo->rows, &keep);
-          doFilterByBlockSMA(pOperator->exprSupp.pFilterInfo, pBlock->pBlockAgg, size, pBlockInfo->rows, &keep);
+      QUERY_CHECK_CODE(code, lino, _end);
-      if (TSDB_CODE_SUCCESS != code) {
+
-        return code;
-      }
       if (!keep) {
         qDebug("%s data block filter out by block SMA, brange:%" PRId64 "-%" PRId64 ", rows:%" PRId64,
                GET_TASKID(pTaskInfo), pBlockInfo->window.skey, pBlockInfo->window.ekey, pBlockInfo->rows);
@@ -1001,7 +1006,8 @@ static SSDataBlock* doGroupedTableScan(SOperatorInfo* pOperator) {
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
   return NULL;
 }
@@ -1102,7 +1108,8 @@ static SSDataBlock* startNextGroupScan(SOperatorInfo* pOperator) {
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
   return NULL;
 }
@@ -1125,14 +1132,19 @@ static SSDataBlock* groupSeqTableScan(SOperatorInfo* pOperator) {
 
     taosRLockLatch(&pTaskInfo->lock);
     code = initNextGroupScan(pInfo, &pList, &num);
-    QUERY_CHECK_CODE(code, lino, _end);
 
     taosRUnLockLatch(&pTaskInfo->lock);
+    QUERY_CHECK_CODE(code, lino, _end);
 
     ASSERT(pInfo->base.dataReader == NULL);
 
-    pAPI->tsdReader.tsdReaderOpen(pInfo->base.readHandle.vnode, &pInfo->base.cond, pList, num, pInfo->pResBlock,
+    code = pAPI->tsdReader.tsdReaderOpen(pInfo->base.readHandle.vnode, &pInfo->base.cond, pList, num, pInfo->pResBlock,
                                          (void**)&pInfo->base.dataReader, GET_TASKID(pTaskInfo), &pInfo->pIgnoreTables);
+    if (code != TSDB_CODE_SUCCESS) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+      T_LONG_JMP(pTaskInfo->env, code);
+    }
+
     if (pInfo->filesetDelimited) {
       pAPI->tsdReader.tsdSetFilesetDelimited(pInfo->base.dataReader);
     }
@@ -1159,7 +1171,8 @@ static SSDataBlock* groupSeqTableScan(SOperatorInfo* pOperator) {
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
   return result;
 }
@@ -1236,7 +1249,8 @@ static SSDataBlock* doTableScan(SOperatorInfo* pOperator) {
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
   return NULL;
 }
@@ -3486,7 +3500,8 @@ static SSDataBlock* doRawScan(SOperatorInfo* pOperator) {
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
   return NULL;
 }
@@ -3642,6 +3657,9 @@ void streamScanReloadState(SOperatorInfo* pOperator) {
         size_t   keySize = 0;
         int64_t* pUid = taosHashGetKey(pIte, &keySize);
         code = taosHashPut(pUpInfo->pMap, pUid, sizeof(int64_t), pIte, sizeof(TSKEY));
+        if (code == TSDB_CODE_DUP_KEY) {
+          code = TSDB_CODE_SUCCESS;
+        }
         QUERY_CHECK_CODE(code, lino, _end);
 
         pIte = taosHashIterate(curMap, pIte);
@@ -3739,7 +3757,9 @@ int32_t createStreamScanOperatorInfo(SReadHandle* pHandle, STableScanPhysiNode*
     }
 
     pInfo->tbnameCalSup.pExprInfo = pSubTableExpr;
-    createExprFromOneNode(pSubTableExpr, pTableScanNode->pSubtable, 0);
+    code = createExprFromOneNode(pSubTableExpr, pTableScanNode->pSubtable, 0);
+    QUERY_CHECK_CODE(code, lino, _error);
+
     if (initExprSupp(&pInfo->tbnameCalSup, pSubTableExpr, 1, &pTaskInfo->storageAPI.functionStore) != 0) {
       tableListDestroy(pTableListInfo);
       goto _error;
@@ -3968,7 +3988,8 @@ static void doTagScanOneTable(SOperatorInfo* pOperator, const SSDataBlock* pRes,
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
 }
 
@@ -4033,6 +4054,9 @@ static EDealRes tagScanRewriteTagColumn(SNode** pNode, void* pContext) {
   void*                  data = taosHashGet(pCtx->colHash, &pSColumnNode->colId, sizeof(pSColumnNode->colId));
   if (!data) {
     code = taosHashPut(pCtx->colHash, &pSColumnNode->colId, sizeof(pSColumnNode->colId), pNode, sizeof((*pNode)));
+    if (code == TSDB_CODE_DUP_KEY) {
+      code = TSDB_CODE_SUCCESS;
+    }
     QUERY_CHECK_CODE(code, lino, _end);
     pSColumnNode->slotId = pCtx->index++;
     SColumnInfo cInfo = {.colId = pSColumnNode->colId,
@@ -4271,7 +4295,8 @@ static SSDataBlock* doTagScanFromCtbIdx(SOperatorInfo* pOperator) {
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
   pOperator->resultInfo.totalRows += pRes->info.rows;
   return (pRes->info.rows == 0) ? NULL : pInfo->pRes;
@@ -4706,7 +4731,8 @@ static void adjustSubTableFromMemBlock(SOperatorInfo* pOperatorInfo, STmsSubTabl
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
 }
 
@@ -4806,7 +4832,8 @@ static SSDataBlock* getSubTablesSortedBlock(SOperatorInfo* pOperator, SSDataBloc
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
   return (pResBlock->info.rows > 0) ? pResBlock : NULL;
 }
@@ -4924,7 +4951,8 @@ SSDataBlock* doTableMergeScanParaSubTables(SOperatorInfo* pOperator) {
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
   return pBlock;
 }
@@ -4944,13 +4972,17 @@ static void tableMergeScanDoSkipTable(uint64_t uid, void* pTableMergeOpInfo) {
   int bSkip = 1;
   if (pInfo->mSkipTables != NULL) {
     code = taosHashPut(pInfo->mSkipTables, &uid, sizeof(uid), &bSkip, sizeof(bSkip));
+    if (code == TSDB_CODE_DUP_KEY) {
+      code = TSDB_CODE_SUCCESS;
+    }
     QUERY_CHECK_CODE(code, lino, _end);
   }
 
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
 }
 
@@ -5247,7 +5279,8 @@ void startGroupTableMergeScan(SOperatorInfo* pOperator) {
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
 }
 
@@ -5383,7 +5416,6 @@ SSDataBlock* doTableMergeScan(SOperatorInfo* pOperator) {
   }
 
   pOperator->cost.totalCost += (taosGetTimestampUs() - st) / 1000.0;
-  ;
 
   return pBlock;
 }
@@ -5805,7 +5837,8 @@ static void buildSysDbFilterTableCount(SOperatorInfo* pOperator, STableCountScan
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
   setOperatorCompleted(pOperator);
 }
@@ -5846,7 +5879,8 @@ static void buildSysDbGroupedTableCount(SOperatorInfo* pOperator, STableCountSca
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
 }
 
@@ -5894,7 +5928,8 @@ static SSDataBlock* buildVnodeDbTableCount(SOperatorInfo* pOperator, STableCount
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
   return pRes->info.rows > 0 ? pRes : NULL;
 }
@@ -5941,7 +5976,8 @@ static void buildVnodeGroupedTableCount(SOperatorInfo* pOperator, STableCountSca
 _end:
   if (code != TSDB_CODE_SUCCESS) {
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
   }
 }
 
@@ -5979,7 +6015,8 @@ static void buildVnodeFilteredTbCount(SOperatorInfo* pOperator, STableCountScanO
 
 _end:
   if (code != TSDB_CODE_SUCCESS) {
-    T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
     qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
   }
   setOperatorCompleted(pOperator);

source/libs/executor/src/streamtimewindowoperator.c

@@ -1600,7 +1600,7 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) {
 
         if (pBlock->info.type != STREAM_CLEAR) {
           void* tmp = taosArrayAddAll(pInfo->pDelWins, delWins);
-          if (!tmp) {
+          if (!tmp && taosArrayGetSize(delWins) > 0) {
             code = TSDB_CODE_OUT_OF_MEMORY;
             QUERY_CHECK_CODE(code, lino, _end);
           }
@@ -1610,7 +1610,7 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) {
       }
       removeResults(delWins, pInfo->pUpdatedMap);
       void* tmp = taosArrayAddAll(pInfo->pDelWins, delWins);
-      if (!tmp) {
+      if (!tmp && taosArrayGetSize(delWins) > 0) {
         code = TSDB_CODE_OUT_OF_MEMORY;
         QUERY_CHECK_CODE(code, lino, _end);
       }
@@ -5333,7 +5333,7 @@ static SSDataBlock* doStreamMidIntervalAgg(SOperatorInfo* pOperator) {
 
       removeResults(delWins, pInfo->pUpdatedMap);
       void* tmp = taosArrayAddAll(pInfo->pDelWins, delWins);
-      if (!tmp) {
+      if (!tmp && taosArrayGetSize(delWins) > 0) {
         code = TSDB_CODE_OUT_OF_MEMORY;
         QUERY_CHECK_CODE(code, lino, _end);
       }

source/libs/executor/src/tfill.c

@@ -28,6 +28,7 @@
 #include "executorInt.h"
 #include "function.h"
 #include "querynodes.h"
+#include "querytask.h"
 #include "tdatablock.h"
 #include "tfill.h"
 
@@ -35,7 +36,7 @@
 #define DO_INTERPOLATION(_v1, _v2, _k1, _k2, _k) \
   ((_v1) + ((_v2) - (_v1)) * (((double)(_k)) - ((double)(_k1))) / (((double)(_k2)) - ((double)(_k1))))
 
-static void doSetVal(SColumnInfoData* pDstColInfoData, int32_t rowIndex, const SGroupKeys* pKey);
+static int32_t doSetVal(SColumnInfoData* pDstColInfoData, int32_t rowIndex, const SGroupKeys* pKey);
 
 static void setNotFillColumn(SFillInfo* pFillInfo, SColumnInfoData* pDstColInfo, int32_t rowIndex, int32_t colIdx) {
   SRowVal* p = NULL;
@@ -46,7 +47,11 @@ static void setNotFillColumn(SFillInfo* pFillInfo, SColumnInfoData* pDstColInfo,
   }
 
   SGroupKeys* pKey = taosArrayGet(p->pRowVal, colIdx);
-  doSetVal(pDstColInfo, rowIndex, pKey);
+  int32_t code = doSetVal(pDstColInfo, rowIndex, pKey);
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__,  __LINE__, tstrerror(code));
+    T_LONG_JMP(pFillInfo->pTaskInfo->env, code);
+  }
 }
 
 static void setNullRow(SSDataBlock* pBlock, SFillInfo* pFillInfo, int32_t rowIndex) {
@@ -65,39 +70,55 @@ static void setNullRow(SSDataBlock* pBlock, SFillInfo* pFillInfo, int32_t rowInd
   }
 }
 
-static void doSetUserSpecifiedValue(SColumnInfoData* pDst, SVariant* pVar, int32_t rowIndex, int64_t currentKey) {
+static int32_t doSetUserSpecifiedValue(SColumnInfoData* pDst, SVariant* pVar, int32_t rowIndex, int64_t currentKey) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
   bool    isNull = (TSDB_DATA_TYPE_NULL == pVar->nType) ? true : false;
   if (pDst->info.type == TSDB_DATA_TYPE_FLOAT) {
     float v = 0;
     GET_TYPED_DATA(v, float, pVar->nType, &pVar->f);
-    colDataSetVal(pDst, rowIndex, (char*)&v, isNull);
+    code = colDataSetVal(pDst, rowIndex, (char*)&v, isNull);
+    QUERY_CHECK_CODE(code, lino, _end);
   } else if (pDst->info.type == TSDB_DATA_TYPE_DOUBLE) {
     double v = 0;
     GET_TYPED_DATA(v, double, pVar->nType, &pVar->d);
-    colDataSetVal(pDst, rowIndex, (char*)&v, isNull);
+    code = colDataSetVal(pDst, rowIndex, (char*)&v, isNull);
+    QUERY_CHECK_CODE(code, lino, _end);
   } else if (IS_SIGNED_NUMERIC_TYPE(pDst->info.type) || pDst->info.type == TSDB_DATA_TYPE_BOOL) {
     int64_t v = 0;
     GET_TYPED_DATA(v, int64_t, pVar->nType, &pVar->i);
-    colDataSetVal(pDst, rowIndex, (char*)&v, isNull);
+    code = colDataSetVal(pDst, rowIndex, (char*)&v, isNull);
+    QUERY_CHECK_CODE(code, lino, _end);
   } else if (IS_UNSIGNED_NUMERIC_TYPE(pDst->info.type)) {
     uint64_t v = 0;
     GET_TYPED_DATA(v, uint64_t, pVar->nType, &pVar->u);
-    colDataSetVal(pDst, rowIndex, (char*)&v, isNull);
+    code = colDataSetVal(pDst, rowIndex, (char*)&v, isNull);
+    QUERY_CHECK_CODE(code, lino, _end);
   } else if (pDst->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
     int64_t v = 0;
     GET_TYPED_DATA(v, int64_t, pVar->nType, &pVar->u);
-    colDataSetVal(pDst, rowIndex, (const char*)&v, isNull);
+    code = colDataSetVal(pDst, rowIndex, (const char*)&v, isNull);
+    QUERY_CHECK_CODE(code, lino, _end);
   } else if (pDst->info.type == TSDB_DATA_TYPE_NCHAR || pDst->info.type == TSDB_DATA_TYPE_VARCHAR ||
              pDst->info.type == TSDB_DATA_TYPE_VARBINARY) {
-    colDataSetVal(pDst, rowIndex, pVar->pz, isNull);
+    code = colDataSetVal(pDst, rowIndex, pVar->pz, isNull);
+    QUERY_CHECK_CODE(code, lino, _end);
   } else {  // others data
     colDataSetNULL(pDst, rowIndex);
   }
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
+  return code;
 }
 
 // fill windows pseudo column, _wstart, _wend, _wduration and return true, otherwise return false
 bool fillIfWindowPseudoColumn(SFillInfo* pFillInfo, SFillColInfo* pCol, SColumnInfoData* pDstColInfoData,
                               int32_t rowIndex) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
   if (!pCol->notFillCol) {
     return false;
   }
@@ -106,26 +127,37 @@ bool fillIfWindowPseudoColumn(SFillInfo* pFillInfo, SFillColInfo* pCol, SColumnI
       return false;
     }
     if (pCol->pExpr->base.pParam[0].pCol->colType == COLUMN_TYPE_WINDOW_START) {
-      colDataSetVal(pDstColInfoData, rowIndex, (const char*)&pFillInfo->currentKey, false);
+      code = colDataSetVal(pDstColInfoData, rowIndex, (const char*)&pFillInfo->currentKey, false);
+      QUERY_CHECK_CODE(code, lino, _end);
       return true;
     } else if (pCol->pExpr->base.pParam[0].pCol->colType == COLUMN_TYPE_WINDOW_END) {
       // TODO: include endpoint
       SInterval* pInterval = &pFillInfo->interval;
       int64_t    windowEnd =
           taosTimeAdd(pFillInfo->currentKey, pInterval->interval, pInterval->intervalUnit, pInterval->precision);
-      colDataSetVal(pDstColInfoData, rowIndex, (const char*)&windowEnd, false);
+      code = colDataSetVal(pDstColInfoData, rowIndex, (const char*)&windowEnd, false);
+      QUERY_CHECK_CODE(code, lino, _end);
       return true;
     } else if (pCol->pExpr->base.pParam[0].pCol->colType == COLUMN_TYPE_WINDOW_DURATION) {
       // TODO: include endpoint
-      colDataSetVal(pDstColInfoData, rowIndex, (const char*)&pFillInfo->interval.sliding, false);
+      code = colDataSetVal(pDstColInfoData, rowIndex, (const char*)&pFillInfo->interval.sliding, false);
+      QUERY_CHECK_CODE(code, lino, _end);
       return true;
     }
   }
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    T_LONG_JMP(pFillInfo->pTaskInfo->env, code);
+  }
   return false;
 }
 
 static void doFillOneRow(SFillInfo* pFillInfo, SSDataBlock* pBlock, SSDataBlock* pSrcBlock, int64_t ts,
                          bool outOfBound) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
   SPoint  point1, point2, point;
   int32_t step = GET_FORWARD_DIRECTION_FACTOR(pFillInfo->order);
 
@@ -193,7 +225,8 @@ static void doFillOneRow(SFillInfo* pFillInfo, SSDataBlock* pBlock, SSDataBlock*
           point = (SPoint){.key = pFillInfo->currentKey, .val = &out};
           taosGetLinearInterpolationVal(&point, type, &point1, &point2, type);
 
-          colDataSetVal(pDstCol, index, (const char*)&out, false);
+          code = colDataSetVal(pDstCol, index, (const char*)&out, false);
+          QUERY_CHECK_CODE(code, lino, _end);
         }
       }
     }
@@ -213,7 +246,8 @@ static void doFillOneRow(SFillInfo* pFillInfo, SSDataBlock* pBlock, SSDataBlock*
         }
       } else {
         SVariant* pVar = &pFillInfo->pFillCol[i].fillVal;
-        doSetUserSpecifiedValue(pDst, pVar, index, pFillInfo->currentKey);
+        code = doSetUserSpecifiedValue(pDst, pVar, index, pFillInfo->currentKey);
+        QUERY_CHECK_CODE(code, lino, _end);
       }
     }
   }
@@ -224,19 +258,36 @@ static void doFillOneRow(SFillInfo* pFillInfo, SSDataBlock* pBlock, SSDataBlock*
       taosTimeAdd(pFillInfo->currentKey, pInterval->sliding * step, pInterval->slidingUnit, pInterval->precision);
   pBlock->info.rows += 1;
   pFillInfo->numOfCurrent++;
-}
 
-void doSetVal(SColumnInfoData* pDstCol, int32_t rowIndex, const SGroupKeys* pKey) {
+_end:
-  if (pKey->isNull) {
+  if (code != TSDB_CODE_SUCCESS) {
-    colDataSetNULL(pDstCol, rowIndex);
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
-  } else {
+    T_LONG_JMP(pFillInfo->pTaskInfo->env, code);
-    colDataSetVal(pDstCol, rowIndex, pKey->pData, false);
   }
 }
 
-static void initBeforeAfterDataBuf(SFillInfo* pFillInfo) {
+int32_t doSetVal(SColumnInfoData* pDstCol, int32_t rowIndex, const SGroupKeys* pKey) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
+  if (pKey->isNull) {
+    colDataSetNULL(pDstCol, rowIndex);
+  } else {
+    code = colDataSetVal(pDstCol, rowIndex, pKey->pData, false);
+    QUERY_CHECK_CODE(code, lino, _end);
+  }
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
+  return code;
+}
+
+static int32_t initBeforeAfterDataBuf(SFillInfo* pFillInfo) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
   if (taosArrayGetSize(pFillInfo->next.pRowVal) > 0) {
-    return;
+    goto _end;
   }
 
   for (int i = 0; i < pFillInfo->numOfCols; i++) {
@@ -245,15 +296,26 @@ static void initBeforeAfterDataBuf(SFillInfo* pFillInfo) {
     SGroupKeys  key = {0};
     SResSchema* pSchema = &pCol->pExpr->base.resSchema;
     key.pData = taosMemoryMalloc(pSchema->bytes);
+    QUERY_CHECK_NULL(key.pData, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
     key.isNull = true;
     key.bytes = pSchema->bytes;
     key.type = pSchema->type;
 
-    taosArrayPush(pFillInfo->next.pRowVal, &key);
+    void* tmp = taosArrayPush(pFillInfo->next.pRowVal, &key);
+    QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
 
     key.pData = taosMemoryMalloc(pSchema->bytes);
-    taosArrayPush(pFillInfo->prev.pRowVal, &key);
+    QUERY_CHECK_NULL(key.pData, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
+
+    tmp = taosArrayPush(pFillInfo->prev.pRowVal, &key);
+    QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
   }
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
+  return code;
 }
 
 static void saveColData(SArray* rowBuf, int32_t columnIndex, const char* src, bool isNull);
@@ -264,7 +326,7 @@ static void copyCurrentRowIntoBuf(SFillInfo* pFillInfo, int32_t rowIndex, SRowVa
 
   for (int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
     int32_t type = pFillInfo->pFillCol[i].pExpr->pExpr->nodeType;
-    if ( type == QUERY_NODE_COLUMN || type == QUERY_NODE_OPERATOR || type == QUERY_NODE_FUNCTION) {
+    if (type == QUERY_NODE_COLUMN || type == QUERY_NODE_OPERATOR || type == QUERY_NODE_FUNCTION) {
       if (!pFillInfo->pFillCol[i].notFillCol && pFillInfo->type != TSDB_FILL_NEXT) {
         continue;
       }
@@ -288,7 +350,8 @@ static void copyCurrentRowIntoBuf(SFillInfo* pFillInfo, int32_t rowIndex, SRowVa
 
 static int32_t fillResultImpl(SFillInfo* pFillInfo, SSDataBlock* pBlock, int32_t outputRows) {
   pFillInfo->numOfCurrent = 0;
-
+  int32_t          code = TSDB_CODE_SUCCESS;
+  int32_t          lino = 0;
   SColumnInfoData* pTsCol = taosArrayGet(pFillInfo->pSrcBlock->pDataBlock, pFillInfo->srcTsSlotId);
 
   int32_t step = GET_FORWARD_DIRECTION_FACTOR(pFillInfo->order);
@@ -321,7 +384,7 @@ static int32_t fillResultImpl(SFillInfo* pFillInfo, SSDataBlock* pBlock, int32_t
       // output buffer is full, abort
       if (pFillInfo->numOfCurrent == outputRows) {
         pFillInfo->numOfTotal += pFillInfo->numOfCurrent;
-        return outputRows;
+        goto _end;
       }
     } else {
       ASSERT(pFillInfo->currentKey == ts);
@@ -348,7 +411,8 @@ static int32_t fillResultImpl(SFillInfo* pFillInfo, SSDataBlock* pBlock, int32_t
 
         char* src = colDataGetData(pSrc, pFillInfo->index);
         if (!colDataIsNull_s(pSrc, pFillInfo->index)) {
-          colDataSetVal(pDst, index, src, false);
+          code = colDataSetVal(pDst, index, src, false);
+          QUERY_CHECK_CODE(code, lino, _end);
           SRowVal* pRVal = FILL_IS_ASC_FILL(pFillInfo) ? &pFillInfo->prev : &pFillInfo->next;
           saveColData(pRVal->pRowVal, i, src, false);
           if (pFillInfo->srcTsSlotId == dstSlotId) {
@@ -356,15 +420,19 @@ static int32_t fillResultImpl(SFillInfo* pFillInfo, SSDataBlock* pBlock, int32_t
           }
         } else {  // the value is null
           if (pDst->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
-            colDataSetVal(pDst, index, (const char*)&pFillInfo->currentKey, false);
+            code = colDataSetVal(pDst, index, (const char*)&pFillInfo->currentKey, false);
+            QUERY_CHECK_CODE(code, lino, _end);
           } else {  // i > 0 and data is null , do interpolation
             if (pFillInfo->type == TSDB_FILL_PREV) {
               SArray*     p = FILL_IS_ASC_FILL(pFillInfo) ? pFillInfo->prev.pRowVal : pFillInfo->next.pRowVal;
               SGroupKeys* pKey = taosArrayGet(p, i);
-              doSetVal(pDst, index, pKey);
+              code = doSetVal(pDst, index, pKey);
+              QUERY_CHECK_CODE(code, lino, _end);
             } else if (pFillInfo->type == TSDB_FILL_LINEAR) {
               bool isNull = colDataIsNull_s(pSrc, pFillInfo->index);
-              colDataSetVal(pDst, index, src, isNull);
+              code = colDataSetVal(pDst, index, src, isNull);
+              QUERY_CHECK_CODE(code, lino, _end);
+
               SArray* p = FILL_IS_ASC_FILL(pFillInfo) ? pFillInfo->prev.pRowVal : pFillInfo->next.pRowVal;
               saveColData(p, i, src, isNull);  // todo:
             } else if (pFillInfo->type == TSDB_FILL_NULL || pFillInfo->type == TSDB_FILL_NULL_F) {
@@ -372,10 +440,12 @@ static int32_t fillResultImpl(SFillInfo* pFillInfo, SSDataBlock* pBlock, int32_t
             } else if (pFillInfo->type == TSDB_FILL_NEXT) {
               SArray*     p = FILL_IS_ASC_FILL(pFillInfo) ? pFillInfo->next.pRowVal : pFillInfo->prev.pRowVal;
               SGroupKeys* pKey = taosArrayGet(p, i);
-              doSetVal(pDst, index, pKey);
+              code = doSetVal(pDst, index, pKey);
+              QUERY_CHECK_CODE(code, lino, _end);
             } else {
               SVariant* pVar = &pFillInfo->pFillCol[i].fillVal;
-              doSetUserSpecifiedValue(pDst, pVar, index, pFillInfo->currentKey);
+              code = doSetUserSpecifiedValue(pDst, pVar, index, pFillInfo->currentKey);
+              QUERY_CHECK_CODE(code, lino, _end);
             }
           }
         }
@@ -393,11 +463,15 @@ static int32_t fillResultImpl(SFillInfo* pFillInfo, SSDataBlock* pBlock, int32_t
 
     if (pFillInfo->index >= pFillInfo->numOfRows || pFillInfo->numOfCurrent >= outputRows) {
       pFillInfo->numOfTotal += pFillInfo->numOfCurrent;
-      return pFillInfo->numOfCurrent;
+      goto _end;
     }
   }
 
-  return pFillInfo->numOfCurrent;
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
+  return code;
 }
 
 static void saveColData(SArray* rowBuf, int32_t columnIndex, const char* src, bool isNull) {
@@ -414,7 +488,7 @@ static void saveColData(SArray* rowBuf, int32_t columnIndex, const char* src, bo
   }
 }
 
-static int64_t appendFilledResult(SFillInfo* pFillInfo, SSDataBlock* pBlock, int64_t resultCapacity) {
+static void appendFilledResult(SFillInfo* pFillInfo, SSDataBlock* pBlock, int64_t resultCapacity) {
   /*
    * These data are generated according to fill strategy, since the current timestamp is out of the time window of
    * real result set. Note that we need to keep the direct previous result rows, to generated the filled data.
@@ -427,7 +501,6 @@ static int64_t appendFilledResult(SFillInfo* pFillInfo, SSDataBlock* pBlock, int
   pFillInfo->numOfTotal += pFillInfo->numOfCurrent;
 
   ASSERT(pFillInfo->numOfCurrent == resultCapacity);
-  return resultCapacity;
 }
 
 static int32_t taosNumOfRemainRows(SFillInfo* pFillInfo) {
@@ -440,7 +513,9 @@ static int32_t taosNumOfRemainRows(SFillInfo* pFillInfo) {
 
 struct SFillInfo* taosCreateFillInfo(TSKEY skey, int32_t numOfFillCols, int32_t numOfNotFillCols, int32_t capacity,
                                      SInterval* pInterval, int32_t fillType, struct SFillColInfo* pCol,
-                                     int32_t primaryTsSlotId, int32_t order, const char* id) {
+                                     int32_t primaryTsSlotId, int32_t order, const char* id, SExecTaskInfo* pTaskInfo) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
   if (fillType == TSDB_FILL_NONE) {
     return NULL;
   }
@@ -473,9 +548,23 @@ struct SFillInfo* taosCreateFillInfo(TSKEY skey, int32_t numOfFillCols, int32_t
   pFillInfo->interval = *pInterval;
 
   pFillInfo->next.pRowVal = taosArrayInit(pFillInfo->numOfCols, sizeof(SGroupKeys));
-  pFillInfo->prev.pRowVal = taosArrayInit(pFillInfo->numOfCols, sizeof(SGroupKeys));
+  QUERY_CHECK_NULL(pFillInfo->next.pRowVal, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
 
-  initBeforeAfterDataBuf(pFillInfo);
+  pFillInfo->prev.pRowVal = taosArrayInit(pFillInfo->numOfCols, sizeof(SGroupKeys));
+  QUERY_CHECK_NULL(pFillInfo->prev.pRowVal, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
+
+  code = initBeforeAfterDataBuf(pFillInfo);
+  QUERY_CHECK_CODE(code, lino, _end);
+
+  pFillInfo->pTaskInfo = pTaskInfo;
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    taosArrayDestroy(pFillInfo->next.pRowVal);
+    taosArrayDestroy(pFillInfo->prev.pRowVal);
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return NULL;
+  }
   return pFillInfo;
 }
 
@@ -559,7 +648,7 @@ void taosFillUpdateStartTimestampInfo(SFillInfo* pFillInfo, int64_t ts) {
   pFillInfo->currentKey = ts;
 }
 
-bool taosFillNotStarted(const SFillInfo* pFillInfo) {return pFillInfo->start == pFillInfo->currentKey;}
+bool taosFillNotStarted(const SFillInfo* pFillInfo) { return pFillInfo->start == pFillInfo->currentKey; }
 
 bool taosFillHasMoreResults(SFillInfo* pFillInfo) {
   int32_t remain = taosNumOfRemainRows(pFillInfo);
@@ -586,7 +675,8 @@ int64_t getNumOfResultsAfterFillGap(SFillInfo* pFillInfo, TSKEY ekey, int32_t ma
     SColumnInfoData* pCol = taosArrayGet(pFillInfo->pSrcBlock->pDataBlock, pFillInfo->srcTsSlotId);
     int64_t*         tsList = (int64_t*)pCol->pData;
     TSKEY            lastKey = tsList[pFillInfo->numOfRows - 1];
-    numOfRes = taosTimeCountIntervalForFill(lastKey, pFillInfo->currentKey, pFillInfo->interval.sliding,
+    numOfRes =
+        taosTimeCountIntervalForFill(lastKey, pFillInfo->currentKey, pFillInfo->interval.sliding,
                                      pFillInfo->interval.slidingUnit, pFillInfo->interval.precision, pFillInfo->order);
     ASSERT(numOfRes >= numOfRows);
   } else {  // reach the end of data
@@ -595,7 +685,8 @@ int64_t getNumOfResultsAfterFillGap(SFillInfo* pFillInfo, TSKEY ekey, int32_t ma
       return 0;
     }
 
-    numOfRes = taosTimeCountIntervalForFill(ekey1, pFillInfo->currentKey, pFillInfo->interval.sliding,
+    numOfRes =
+        taosTimeCountIntervalForFill(ekey1, pFillInfo->currentKey, pFillInfo->interval.sliding,
                                      pFillInfo->interval.slidingUnit, pFillInfo->interval.precision, pFillInfo->order);
   }
 
@@ -617,7 +708,8 @@ void taosGetLinearInterpolationVal(SPoint* point, int32_t outputType, SPoint* po
   SET_TYPED_DATA(point->val, outputType, r);
 }
 
-void taosFillResultDataBlock(SFillInfo* pFillInfo, SSDataBlock* p, int32_t capacity) {
+int32_t taosFillResultDataBlock(SFillInfo* pFillInfo, SSDataBlock* p, int32_t capacity) {
+  int32_t code = TSDB_CODE_SUCCESS;
   int32_t remain = taosNumOfRemainRows(pFillInfo);
 
   int64_t numOfRes = getNumOfResultsAfterFillGap(pFillInfo, pFillInfo->end, capacity);
@@ -627,7 +719,7 @@ void taosFillResultDataBlock(SFillInfo* pFillInfo, SSDataBlock* p, int32_t capac
   if (remain == 0) {
     appendFilledResult(pFillInfo, p, numOfRes);
   } else {
-    fillResultImpl(pFillInfo, p, (int32_t)numOfRes);
+    code = fillResultImpl(pFillInfo, p, (int32_t)numOfRes);
     ASSERT(numOfRes == pFillInfo->numOfCurrent);
   }
 
@@ -635,6 +727,7 @@ void taosFillResultDataBlock(SFillInfo* pFillInfo, SSDataBlock* p, int32_t capac
          ", current : % d, total : % d, %s",
          pFillInfo, pFillInfo->numOfRows, pFillInfo->index, pFillInfo->start, pFillInfo->end, pFillInfo->currentKey,
          pFillInfo->numOfCurrent, pFillInfo->numOfTotal, pFillInfo->id);
+  return code;
 }
 
 int64_t getFillInfoStart(struct SFillInfo* pFillInfo) { return pFillInfo->start; }

source/libs/executor/src/timesliceoperator.c

@@ -163,18 +163,22 @@ static FORCE_INLINE int32_t timeSliceEnsureBlockCapacity(STimeSliceOperatorInfo*
 
   uint32_t winNum = (pSliceInfo->win.ekey - pSliceInfo->win.skey) / pSliceInfo->interval.interval;
   uint32_t newRowsNum = pBlock->info.rows + TMIN(winNum / 4 + 1, 1048576);
-  blockDataEnsureCapacity(pBlock, newRowsNum);
+  int32_t  code = blockDataEnsureCapacity(pBlock, newRowsNum);
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+    return code;
+  }
 
   return TSDB_CODE_SUCCESS;
 }
 
 static bool isIrowtsPseudoColumn(SExprInfo* pExprInfo) {
-  char *name = pExprInfo->pExpr->_function.functionName;
+  char* name = pExprInfo->pExpr->_function.functionName;
   return (IS_TIMESTAMP_TYPE(pExprInfo->base.resSchema.type) && strcasecmp(name, "_irowts") == 0);
 }
 
 static bool isIsfilledPseudoColumn(SExprInfo* pExprInfo) {
-  char *name = pExprInfo->pExpr->_function.functionName;
+  char* name = pExprInfo->pExpr->_function.functionName;
   return (IS_BOOLEAN_TYPE(pExprInfo->base.resSchema.type) && strcasecmp(name, "_isfilled") == 0);
 }
 
@@ -202,7 +206,7 @@ static bool checkDuplicateTimestamps(STimeSliceOperatorInfo* pSliceInfo, SColumn
     return false;
   }
 
-  SRowKey cur = {.ts = currentTs, .numOfPKs = (pPkCol != NULL)? 1:0};
+  SRowKey cur = {.ts = currentTs, .numOfPKs = (pPkCol != NULL) ? 1 : 0};
   if (pPkCol != NULL) {
     cur.pks[0].type = pPkCol->info.type;
     if (IS_VAR_DATA_TYPE(pPkCol->info.type)) {
@@ -244,7 +248,7 @@ static bool getIgoreNullRes(SExprSupp* pExprSup) {
 
     if (isInterpFunc(pExprInfo)) {
       for (int32_t j = 0; j < pExprInfo->base.numOfParams; ++j) {
-        SFunctParam *pFuncParam = &pExprInfo->base.pParam[j];
+        SFunctParam* pFuncParam = &pExprInfo->base.pParam[j];
         if (pFuncParam->type == FUNC_PARAM_TYPE_VALUE) {
           return pFuncParam->param.i ? true : false;
         }
@@ -276,14 +280,15 @@ static bool checkNullRow(SExprSupp* pExprSup, SSDataBlock* pSrcBlock, int32_t in
   return false;
 }
 
-
 static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp* pExprSup, SSDataBlock* pResBlock,
-                                   SSDataBlock* pSrcBlock, int32_t index, bool beforeTs) {
+                                   SSDataBlock* pSrcBlock, int32_t index, bool beforeTs, SExecTaskInfo* pTaskInfo) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
   int32_t rows = pResBlock->info.rows;
-  timeSliceEnsureBlockCapacity(pSliceInfo, pResBlock);
+  code = timeSliceEnsureBlockCapacity(pSliceInfo, pResBlock);
+  QUERY_CHECK_CODE(code, lino, _end);
   // todo set the correct primary timestamp column
 
-
   // output the result
   int32_t fillColIndex = 0;
   bool    hasInterp = true;
@@ -294,11 +299,13 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
     SColumnInfoData* pDst = taosArrayGet(pResBlock->pDataBlock, dstSlot);
 
     if (isIrowtsPseudoColumn(pExprInfo)) {
-      colDataSetVal(pDst, rows, (char*)&pSliceInfo->current, false);
+      code = colDataSetVal(pDst, rows, (char*)&pSliceInfo->current, false);
+      QUERY_CHECK_CODE(code, lino, _end);
       continue;
     } else if (isIsfilledPseudoColumn(pExprInfo)) {
       bool isFilled = true;
-      colDataSetVal(pDst, pResBlock->info.rows, (char*)&isFilled, false);
+      code = colDataSetVal(pDst, pResBlock->info.rows, (char*)&isFilled, false);
+      QUERY_CHECK_CODE(code, lino, _end);
       continue;
     } else if (!isInterpFunc(pExprInfo)) {
       if (isGroupKeyFunc(pExprInfo) || isSelectGroupConstValueFunc(pExprInfo)) {
@@ -312,12 +319,14 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
           }
 
           char* v = colDataGetData(pSrc, index);
-          colDataSetVal(pDst, pResBlock->info.rows, v, false);
+          code = colDataSetVal(pDst, pResBlock->info.rows, v, false);
+          QUERY_CHECK_CODE(code, lino, _end);
         } else if(!isSelectGroupConstValueFunc(pExprInfo)){
           // use stored group key
           SGroupKeys* pkey = pSliceInfo->pPrevGroupKey;
           if (pkey->isNull == false) {
-            colDataSetVal(pDst, rows, pkey->pData, false);
+            code = colDataSetVal(pDst, rows, pkey->pData, false);
+            QUERY_CHECK_CODE(code, lino, _end);
           } else {
             colDataSetNULL(pDst, rows);
           }
@@ -354,7 +363,8 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
           } else {
             v = taosStr2Float(varDataVal(pVar->pz), NULL);
           }
-          colDataSetVal(pDst, rows, (char*)&v, isNull);
+          code = colDataSetVal(pDst, rows, (char*)&v, isNull);
+          QUERY_CHECK_CODE(code, lino, _end);
         } else if (pDst->info.type == TSDB_DATA_TYPE_DOUBLE) {
           double v = 0;
           if (!IS_VAR_DATA_TYPE(pVar->nType)) {
@@ -362,7 +372,8 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
           } else {
             v = taosStr2Double(varDataVal(pVar->pz), NULL);
           }
-          colDataSetVal(pDst, rows, (char*)&v, isNull);
+          code = colDataSetVal(pDst, rows, (char*)&v, isNull);
+          QUERY_CHECK_CODE(code, lino, _end);
         } else if (IS_SIGNED_NUMERIC_TYPE(pDst->info.type)) {
           int64_t v = 0;
           if (!IS_VAR_DATA_TYPE(pVar->nType)) {
@@ -370,7 +381,8 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
           } else {
             v = taosStr2Int64(varDataVal(pVar->pz), NULL, 10);
           }
-          colDataSetVal(pDst, rows, (char*)&v, isNull);
+          code = colDataSetVal(pDst, rows, (char*)&v, isNull);
+          QUERY_CHECK_CODE(code, lino, _end);
         } else if (IS_UNSIGNED_NUMERIC_TYPE(pDst->info.type)) {
           uint64_t v = 0;
           if (!IS_VAR_DATA_TYPE(pVar->nType)) {
@@ -378,7 +390,8 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
           } else {
             v = taosStr2UInt64(varDataVal(pVar->pz), NULL, 10);
           }
-          colDataSetVal(pDst, rows, (char*)&v, isNull);
+          code = colDataSetVal(pDst, rows, (char*)&v, isNull);
+          QUERY_CHECK_CODE(code, lino, _end);
         } else if (IS_BOOLEAN_TYPE(pDst->info.type)) {
           bool v = false;
           if (!IS_VAR_DATA_TYPE(pVar->nType)) {
@@ -386,7 +399,8 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
           } else {
             v = taosStr2Int8(varDataVal(pVar->pz), NULL, 10);
           }
-          colDataSetVal(pDst, rows, (char*)&v, isNull);
+          code = colDataSetVal(pDst, rows, (char*)&v, isNull);
+          QUERY_CHECK_CODE(code, lino, _end);
         }
 
         ++fillColIndex;
@@ -421,8 +435,10 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
         }
 
         current.val = taosMemoryCalloc(pLinearInfo->bytes, 1);
+        QUERY_CHECK_NULL(current.val, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
         taosGetLinearInterpolationVal(&current, pLinearInfo->type, &start, &end, pLinearInfo->type);
-        colDataSetVal(pDst, rows, (char*)current.val, false);
+        code = colDataSetVal(pDst, rows, (char*)current.val, false);
+        QUERY_CHECK_CODE(code, lino, _end);
 
         taosMemoryFree(current.val);
         break;
@@ -435,7 +451,8 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
 
         SGroupKeys* pkey = taosArrayGet(pSliceInfo->pPrevRow, srcSlot);
         if (pkey->isNull == false) {
-          colDataSetVal(pDst, rows, pkey->pData, false);
+          code = colDataSetVal(pDst, rows, pkey->pData, false);
+          QUERY_CHECK_CODE(code, lino, _end);
         } else {
           colDataSetNULL(pDst, rows);
         }
@@ -450,7 +467,8 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
 
         SGroupKeys* pkey = taosArrayGet(pSliceInfo->pNextRow, srcSlot);
         if (pkey->isNull == false) {
-          colDataSetVal(pDst, rows, pkey->pData, false);
+          code = colDataSetVal(pDst, rows, pkey->pData, false);
+          QUERY_CHECK_CODE(code, lino, _end);
         } else {
           colDataSetNULL(pDst, rows);
         }
@@ -467,12 +485,21 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
     pResBlock->info.rows += 1;
   }
 
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
+  }
   return hasInterp;
 }
 
-static void addCurrentRowToResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp* pExprSup, SSDataBlock* pResBlock,
+static int32_t addCurrentRowToResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp* pExprSup, SSDataBlock* pResBlock,
                                      SSDataBlock* pSrcBlock, int32_t index) {
-  timeSliceEnsureBlockCapacity(pSliceInfo, pResBlock);
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
+  code = timeSliceEnsureBlockCapacity(pSliceInfo, pResBlock);
+  QUERY_CHECK_CODE(code, lino, _end);
   for (int32_t j = 0; j < pExprSup->numOfExprs; ++j) {
     SExprInfo* pExprInfo = &pExprSup->pExprInfo[j];
 
@@ -480,10 +507,12 @@ static void addCurrentRowToResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp*
     SColumnInfoData* pDst = taosArrayGet(pResBlock->pDataBlock, dstSlot);
 
     if (isIrowtsPseudoColumn(pExprInfo)) {
-      colDataSetVal(pDst, pResBlock->info.rows, (char*)&pSliceInfo->current, false);
+      code = colDataSetVal(pDst, pResBlock->info.rows, (char*)&pSliceInfo->current, false);
+      QUERY_CHECK_CODE(code, lino, _end);
     } else if (isIsfilledPseudoColumn(pExprInfo)) {
       bool isFilled = false;
-      colDataSetVal(pDst, pResBlock->info.rows, (char*)&isFilled, false);
+      code = colDataSetVal(pDst, pResBlock->info.rows, (char*)&isFilled, false);
+      QUERY_CHECK_CODE(code, lino, _end);
     } else {
       int32_t          srcSlot = pExprInfo->base.pParam[0].pCol->slotId;
       SColumnInfoData* pSrc = taosArrayGet(pSrcBlock->pDataBlock, srcSlot);
@@ -494,15 +523,23 @@ static void addCurrentRowToResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp*
       }
 
       char* v = colDataGetData(pSrc, index);
-      colDataSetVal(pDst, pResBlock->info.rows, v, false);
+      code = colDataSetVal(pDst, pResBlock->info.rows, v, false);
+      QUERY_CHECK_CODE(code, lino, _end);
     }
   }
 
   pResBlock->info.rows += 1;
-  return;
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
+  return code;
 }
 
 static int32_t initPrevRowsKeeper(STimeSliceOperatorInfo* pInfo, SSDataBlock* pBlock) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
   if (pInfo->pPrevRow != NULL) {
     return TSDB_CODE_SUCCESS;
   }
@@ -521,14 +558,23 @@ static int32_t initPrevRowsKeeper(STimeSliceOperatorInfo* pInfo, SSDataBlock* pB
     key.type = pColInfo->info.type;
     key.isNull = false;
     key.pData = taosMemoryCalloc(1, pColInfo->info.bytes);
-    taosArrayPush(pInfo->pPrevRow, &key);
+    QUERY_CHECK_NULL(key.pData, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
+    void* tmp = taosArrayPush(pInfo->pPrevRow, &key);
+    QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
   }
 
   pInfo->isPrevRowSet = false;
-  return TSDB_CODE_SUCCESS;
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
+  return code;
 }
 
 static int32_t initNextRowsKeeper(STimeSliceOperatorInfo* pInfo, SSDataBlock* pBlock) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
   if (pInfo->pNextRow != NULL) {
     return TSDB_CODE_SUCCESS;
   }
@@ -547,15 +593,24 @@ static int32_t initNextRowsKeeper(STimeSliceOperatorInfo* pInfo, SSDataBlock* pB
     key.type = pColInfo->info.type;
     key.isNull = false;
     key.pData = taosMemoryCalloc(1, pColInfo->info.bytes);
-    taosArrayPush(pInfo->pNextRow, &key);
+    QUERY_CHECK_NULL(key.pData, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
+
+    void* tmp = taosArrayPush(pInfo->pNextRow, &key);
+    QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
   }
 
   pInfo->isNextRowSet = false;
 
-  return TSDB_CODE_SUCCESS;
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
+  return code;
 }
 
 static int32_t initFillLinearInfo(STimeSliceOperatorInfo* pInfo, SSDataBlock* pBlock) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
   if (pInfo->pLinearInfo != NULL) {
     return TSDB_CODE_SUCCESS;
   }
@@ -573,15 +628,23 @@ static int32_t initFillLinearInfo(STimeSliceOperatorInfo* pInfo, SSDataBlock* pB
     linearInfo.start.key = INT64_MIN;
     linearInfo.end.key = INT64_MIN;
     linearInfo.start.val = taosMemoryCalloc(1, pColInfo->info.bytes);
+    QUERY_CHECK_NULL(linearInfo.start.val, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
+
     linearInfo.end.val = taosMemoryCalloc(1, pColInfo->info.bytes);
+    QUERY_CHECK_NULL(linearInfo.end.val, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
     linearInfo.isStartSet = false;
     linearInfo.isEndSet = false;
     linearInfo.type = pColInfo->info.type;
     linearInfo.bytes = pColInfo->info.bytes;
-    taosArrayPush(pInfo->pLinearInfo, &linearInfo);
+    void* tmp = taosArrayPush(pInfo->pLinearInfo, &linearInfo);
+    QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
   }
 
-  return TSDB_CODE_SUCCESS;
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
+  return code;
 }
 
 static int32_t initGroupKeyKeeper(STimeSliceOperatorInfo* pInfo, SExprSupp* pExprSup) {
@@ -630,62 +693,59 @@ static int32_t initKeeperInfo(STimeSliceOperatorInfo* pInfo, SSDataBlock* pBlock
     return TSDB_CODE_FAILED;
   }
 
-
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t resetPrevRowsKeeper(STimeSliceOperatorInfo* pInfo) {
+static void resetPrevRowsKeeper(STimeSliceOperatorInfo* pInfo) {
   if (pInfo->pPrevRow == NULL) {
-    return TSDB_CODE_SUCCESS;
+    return;
   }
 
   for (int32_t i = 0; i < taosArrayGetSize(pInfo->pLinearInfo); ++i) {
-    SGroupKeys *pKey = taosArrayGet(pInfo->pPrevRow, i);
+    SGroupKeys* pKey = taosArrayGet(pInfo->pPrevRow, i);
     pKey->isNull = false;
   }
 
   pInfo->isPrevRowSet = false;
 
-  return TSDB_CODE_SUCCESS;
+  return;
 }
 
-static int32_t resetNextRowsKeeper(STimeSliceOperatorInfo* pInfo) {
+static void resetNextRowsKeeper(STimeSliceOperatorInfo* pInfo) {
   if (pInfo->pNextRow == NULL) {
-    return TSDB_CODE_SUCCESS;
+    return;
   }
 
   for (int32_t i = 0; i < taosArrayGetSize(pInfo->pLinearInfo); ++i) {
-    SGroupKeys *pKey = taosArrayGet(pInfo->pPrevRow, i);
+    SGroupKeys* pKey = taosArrayGet(pInfo->pPrevRow, i);
     pKey->isNull = false;
   }
 
   pInfo->isNextRowSet = false;
 
-  return TSDB_CODE_SUCCESS;
+  return;
 }
 
-static int32_t resetFillLinearInfo(STimeSliceOperatorInfo* pInfo) {
+static void resetFillLinearInfo(STimeSliceOperatorInfo* pInfo) {
   if (pInfo->pLinearInfo == NULL) {
-    return TSDB_CODE_SUCCESS;
+    return;
   }
 
   for (int32_t i = 0; i < taosArrayGetSize(pInfo->pLinearInfo); ++i) {
-    SFillLinearInfo *pLinearInfo = taosArrayGet(pInfo->pLinearInfo, i);
+    SFillLinearInfo* pLinearInfo = taosArrayGet(pInfo->pLinearInfo, i);
     pLinearInfo->start.key = INT64_MIN;
     pLinearInfo->end.key = INT64_MIN;
     pLinearInfo->isStartSet = false;
     pLinearInfo->isEndSet = false;
   }
 
-  return TSDB_CODE_SUCCESS;
+  return;
 }
 
-static int32_t resetKeeperInfo(STimeSliceOperatorInfo* pInfo) {
+static void resetKeeperInfo(STimeSliceOperatorInfo* pInfo) {
   resetPrevRowsKeeper(pInfo);
   resetNextRowsKeeper(pInfo);
   resetFillLinearInfo(pInfo);
-
-  return TSDB_CODE_SUCCESS;
 }
 
 static bool checkThresholdReached(STimeSliceOperatorInfo* pSliceInfo, int32_t threshold) {
@@ -717,11 +777,12 @@ static void saveBlockStatus(STimeSliceOperatorInfo* pSliceInfo, SSDataBlock* pBl
 
   // all data in remaining block processed
   pSliceInfo->pRemainRes = NULL;
-
 }
 
 static void doTimesliceImpl(SOperatorInfo* pOperator, STimeSliceOperatorInfo* pSliceInfo, SSDataBlock* pBlock,
                             SExecTaskInfo* pTaskInfo, bool ignoreNull) {
+  int32_t        code = TSDB_CODE_SUCCESS;
+  int32_t        lino = 0;
   SSDataBlock*   pResBlock = pSliceInfo->pRes;
   SInterval*     pInterval = &pSliceInfo->interval;
 
@@ -746,7 +807,8 @@ static void doTimesliceImpl(SOperatorInfo* pOperator, STimeSliceOperatorInfo* pS
     }
 
     if (ts == pSliceInfo->current) {
-      addCurrentRowToResult(pSliceInfo, &pOperator->exprSupp, pResBlock, pBlock, i);
+      code = addCurrentRowToResult(pSliceInfo, &pOperator->exprSupp, pResBlock, pBlock, i);
+      QUERY_CHECK_CODE(code, lino, _end);
 
       doKeepPrevRows(pSliceInfo, pBlock, i);
       doKeepLinearInfo(pSliceInfo, pBlock, i);
@@ -773,12 +835,12 @@ static void doTimesliceImpl(SOperatorInfo* pOperator, STimeSliceOperatorInfo* pS
         int64_t nextTs = *(int64_t*)colDataGetData(pTsCol, i + 1);
         if (nextTs > pSliceInfo->current) {
           while (pSliceInfo->current < nextTs && pSliceInfo->current <= pSliceInfo->win.ekey) {
-            if (!genInterpolationResult(pSliceInfo, &pOperator->exprSupp, pResBlock, pBlock, i, false) &&
+            if (!genInterpolationResult(pSliceInfo, &pOperator->exprSupp, pResBlock, pBlock, i, false, pTaskInfo) &&
                 pSliceInfo->fillType == TSDB_FILL_LINEAR) {
               break;
             } else {
-              pSliceInfo->current = taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit,
+              pSliceInfo->current =
-                                                pInterval->precision);
+                  taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit, pInterval->precision);
             }
           }
 
@@ -801,7 +863,7 @@ static void doTimesliceImpl(SOperatorInfo* pOperator, STimeSliceOperatorInfo* pS
       doKeepLinearInfo(pSliceInfo, pBlock, i);
 
       while (pSliceInfo->current < ts && pSliceInfo->current <= pSliceInfo->win.ekey) {
-        if (!genInterpolationResult(pSliceInfo, &pOperator->exprSupp, pResBlock, pBlock, i, true) &&
+        if (!genInterpolationResult(pSliceInfo, &pOperator->exprSupp, pResBlock, pBlock, i, true, pTaskInfo) &&
             pSliceInfo->fillType == TSDB_FILL_LINEAR) {
           break;
         } else {
@@ -812,7 +874,8 @@ static void doTimesliceImpl(SOperatorInfo* pOperator, STimeSliceOperatorInfo* pS
 
       // add current row if timestamp match
       if (ts == pSliceInfo->current && pSliceInfo->current <= pSliceInfo->win.ekey) {
-        addCurrentRowToResult(pSliceInfo, &pOperator->exprSupp, pResBlock, pBlock, i);
+        code = addCurrentRowToResult(pSliceInfo, &pOperator->exprSupp, pResBlock, pBlock, i);
+        QUERY_CHECK_CODE(code, lino, _end);
 
         pSliceInfo->current =
             taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit, pInterval->precision);
@@ -832,6 +895,13 @@ static void doTimesliceImpl(SOperatorInfo* pOperator, STimeSliceOperatorInfo* pS
   // if reached here, meaning block processing finished naturally,
   // or interpolation reach window upper bound
   pSliceInfo->pRemainRes = NULL;
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
+  }
 }
 
 static void genInterpAfterDataBlock(STimeSliceOperatorInfo* pSliceInfo, SOperatorInfo* pOperator, int32_t index) {
@@ -844,7 +914,7 @@ static void genInterpAfterDataBlock(STimeSliceOperatorInfo* pSliceInfo, SOperato
   }
 
   while (pSliceInfo->current <= pSliceInfo->win.ekey) {
-    genInterpolationResult(pSliceInfo, &pOperator->exprSupp, pResBlock, NULL, index, false);
+    (void)genInterpolationResult(pSliceInfo, &pOperator->exprSupp, pResBlock, NULL, index, false, pOperator->pTaskInfo);
     pSliceInfo->current =
         taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit, pInterval->precision);
   }
@@ -901,16 +971,27 @@ static void doHandleTimeslice(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
 
   if (pSliceInfo->scalarSup.pExprInfo != NULL) {
     SExprSupp* pExprSup = &pSliceInfo->scalarSup;
-    projectApplyFunctions(pExprSup->pExprInfo, pBlock, pBlock, pExprSup->pCtx, pExprSup->numOfExprs, NULL);
+    code = projectApplyFunctions(pExprSup->pExprInfo, pBlock, pBlock, pExprSup->pCtx, pExprSup->numOfExprs, NULL);
+    if (code != TSDB_CODE_SUCCESS) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+      T_LONG_JMP(pTaskInfo->env, code);
+    }
   }
 
   // the pDataBlock are always the same one, no need to call this again
-  setInputDataBlock(pSup, pBlock, order, MAIN_SCAN, true);
+  code = setInputDataBlock(pSup, pBlock, order, MAIN_SCAN, true);
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+    T_LONG_JMP(pTaskInfo->env, code);
+  }
   doTimesliceImpl(pOperator, pSliceInfo, pBlock, pTaskInfo, ignoreNull);
   copyPrevGroupKey(&pOperator->exprSupp, pSliceInfo->pPrevGroupKey, pBlock);
 }
 
 static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
+  int32_t        code = TSDB_CODE_SUCCESS;
+  int32_t        lino = 0;
+  SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
   if (pOperator->status == OP_EXEC_DONE) {
     return NULL;
   }
@@ -924,7 +1005,8 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
     if (pSliceInfo->pNextGroupRes != NULL) {
       doHandleTimeslice(pOperator, pSliceInfo->pNextGroupRes);
       if (checkWindowBoundReached(pSliceInfo) || checkThresholdReached(pSliceInfo, pOperator->resultInfo.threshold)) {
-        doFilter(pResBlock, pOperator->exprSupp.pFilterInfo, NULL);
+        code = doFilter(pResBlock, pOperator->exprSupp.pFilterInfo, NULL);
+        QUERY_CHECK_CODE(code, lino, _finished);
         if (pSliceInfo->pRemainRes == NULL) {
           pSliceInfo->pNextGroupRes = NULL;
         }
@@ -959,7 +1041,8 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
 
       doHandleTimeslice(pOperator, pBlock);
       if (checkWindowBoundReached(pSliceInfo) || checkThresholdReached(pSliceInfo, pOperator->resultInfo.threshold)) {
-        doFilter(pResBlock, pOperator->exprSupp.pFilterInfo, NULL);
+        code = doFilter(pResBlock, pOperator->exprSupp.pFilterInfo, NULL);
+        QUERY_CHECK_CODE(code, lino, _finished);
         if (pResBlock->info.rows != 0) {
           goto _finished;
         }
@@ -971,7 +1054,8 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
     // except for fill(next), fill(linear)
     genInterpAfterDataBlock(pSliceInfo, pOperator, 0);
 
-    doFilter(pResBlock, pOperator->exprSupp.pFilterInfo, NULL);
+    code = doFilter(pResBlock, pOperator->exprSupp.pFilterInfo, NULL);
+    QUERY_CHECK_CODE(code, lino, _finished);
     if (pOperator->status == OP_EXEC_DONE) {
       break;
     }
@@ -989,6 +1073,11 @@ _finished:
   if (pResBlock->info.rows == 0) {
     pOperator->status = OP_EXEC_DONE;
   }
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
+  }
 
   return pResBlock->info.rows == 0 ? NULL : pResBlock;
 }
@@ -996,8 +1085,7 @@ _finished:
 static int32_t extractPkColumnFromFuncs(SNodeList* pFuncs, bool* pHasPk, SColumn* pPkColumn) {
   SNode* pNode;
   FOREACH(pNode, pFuncs) {
-    if ((nodeType(pNode) == QUERY_NODE_TARGET) && 
+    if ((nodeType(pNode) == QUERY_NODE_TARGET) && (nodeType(((STargetNode*)pNode)->pExpr) == QUERY_NODE_FUNCTION)) {
-        (nodeType(((STargetNode*)pNode)->pExpr) == QUERY_NODE_FUNCTION)) {
       SFunctionNode* pFunc = (SFunctionNode*)((STargetNode*)pNode)->pExpr;
       if (fmIsInterpFunc(pFunc->funcId) && pFunc->hasPk) {
         SNode* pNode2 = (pFunc->pParameterList->pTail->pNode);
@@ -1016,6 +1104,7 @@ int32_t createTimeSliceOperatorInfo(SOperatorInfo* downstream, SPhysiNode* pPhyN
   QRY_OPTR_CHECK(pOptrInfo);
 
   int32_t code = 0;
+  int32_t lino = 0;
   STimeSliceOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(STimeSliceOperatorInfo));
   SOperatorInfo*          pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
 
@@ -1030,26 +1119,22 @@ int32_t createTimeSliceOperatorInfo(SOperatorInfo* downstream, SPhysiNode* pPhyN
   int32_t    numOfExprs = 0;
   SExprInfo* pExprInfo = createExprInfo(pInterpPhyNode->pFuncs, NULL, &numOfExprs);
   code = initExprSupp(pSup, pExprInfo, numOfExprs, &pTaskInfo->storageAPI.functionStore);
-  if (code != TSDB_CODE_SUCCESS) {
+  QUERY_CHECK_CODE(code, lino, _error);
-    goto _error;
-  }
 
   if (pInterpPhyNode->pExprs != NULL) {
     int32_t    num = 0;
     SExprInfo* pScalarExprInfo = createExprInfo(pInterpPhyNode->pExprs, NULL, &num);
     code = initExprSupp(&pInfo->scalarSup, pScalarExprInfo, num, &pTaskInfo->storageAPI.functionStore);
-    if (code != TSDB_CODE_SUCCESS) {
+    QUERY_CHECK_CODE(code, lino, _error);
-      goto _error;
-    }
   }
 
   code = filterInitFromNode((SNode*)pInterpPhyNode->node.pConditions, &pOperator->exprSupp.pFilterInfo, 0);
-  if (code != TSDB_CODE_SUCCESS) {
+  QUERY_CHECK_CODE(code, lino, _error);
-    goto _error;
-  }
 
   pInfo->tsCol = extractColumnFromColumnNode((SColumnNode*)pInterpPhyNode->pTimeSeries);
-  extractPkColumnFromFuncs(pInterpPhyNode->pFuncs, &pInfo->hasPk, &pInfo->pkCol);
+  code = extractPkColumnFromFuncs(pInterpPhyNode->pFuncs, &pInfo->hasPk, &pInfo->pkCol);
+  QUERY_CHECK_CODE(code, lino, _error);
+
   pInfo->fillType = convertFillType(pInterpPhyNode->fillMode);
   initResultSizeInfo(&pOperator->resultInfo, 4096);
 
@@ -1085,12 +1170,13 @@ int32_t createTimeSliceOperatorInfo(SOperatorInfo* downstream, SPhysiNode* pPhyN
 
   setOperatorInfo(pOperator, "TimeSliceOperator", QUERY_NODE_PHYSICAL_PLAN_INTERP_FUNC, false, OP_NOT_OPENED, pInfo,
                   pTaskInfo);
-  pOperator->fpSet =
+  pOperator->fpSet = createOperatorFpSet(optrDummyOpenFn, doTimeslice, NULL, destroyTimeSliceOperatorInfo,
-      createOperatorFpSet(optrDummyOpenFn, doTimeslice, NULL, destroyTimeSliceOperatorInfo, optrDefaultBufFn, NULL, optrDefaultGetNextExtFn, NULL);
+                                         optrDefaultBufFn, NULL, optrDefaultGetNextExtFn, NULL);
 
-  blockDataEnsureCapacity(pInfo->pRes, pOperator->resultInfo.capacity);
+  code = blockDataEnsureCapacity(pInfo->pRes, pOperator->resultInfo.capacity);
+  QUERY_CHECK_CODE(code, lino, _error);
 
-//  int32_t code = initKeeperInfo(pSliceInfo, pBlock, &pOperator->exprSupp);
+  //  int32_t code = initKeeperInfo(pSliceInfo, pBlock, &pOperator->exprSupp);
 
   code = appendDownstream(pOperator, &downstream, 1);
 
@@ -1098,6 +1184,9 @@ int32_t createTimeSliceOperatorInfo(SOperatorInfo* downstream, SPhysiNode* pPhyN
   return code;
 
 _error:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+  }
   taosMemoryFree(pInfo);
   taosMemoryFree(pOperator);
   pTaskInfo->code = code;

source/libs/executor/src/timewindowoperator.c

@@ -62,10 +62,10 @@ typedef struct SOpenWindowInfo {
   uint64_t           groupId;
 } SOpenWindowInfo;
 
-static int64_t* extractTsCol(SSDataBlock* pBlock, const SIntervalAggOperatorInfo* pInfo);
+static int64_t* extractTsCol(SSDataBlock* pBlock, const SIntervalAggOperatorInfo* pInfo, SExecTaskInfo* pTaskInfo);
 
 static SResultRowPosition addToOpenWindowList(SResultRowInfo* pResultRowInfo, const SResultRow* pResult,
-                                              uint64_t groupId);
+                                              uint64_t groupId, SExecTaskInfo* pTaskInfo);
 static void doCloseWindow(SResultRowInfo* pResultRowInfo, const SIntervalAggOperatorInfo* pInfo, SResultRow* pResult);
 
 static int32_t setTimeWindowOutputBuf(SResultRowInfo* pResultRowInfo, STimeWindow* win, bool masterscan,
@@ -707,7 +707,7 @@ static bool hashIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResul
 
   int32_t     startPos = 0;
   int32_t     numOfOutput = pSup->numOfExprs;
-  int64_t*    tsCols = extractTsCol(pBlock, pInfo);
+  int64_t*    tsCols = extractTsCol(pBlock, pInfo, pTaskInfo);
   uint64_t    tableGroupId = pBlock->info.id.groupId;
   bool        ascScan = (pInfo->binfo.inputTsOrder == TSDB_ORDER_ASC);
   TSKEY       ts = getStartTsKey(&pBlock->info.window, tsCols);
@@ -740,7 +740,7 @@ static bool hashIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResul
 
   // prev time window not interpolation yet.
   if (pInfo->timeWindowInterpo) {
-    SResultRowPosition pos = addToOpenWindowList(pResultRowInfo, pResult, tableGroupId);
+    SResultRowPosition pos = addToOpenWindowList(pResultRowInfo, pResult, tableGroupId, pTaskInfo);
     doInterpUnclosedTimeWindow(pOperatorInfo, numOfOutput, pResultRowInfo, pBlock, scanFlag, tsCols, &pos);
 
     // restore current time window
@@ -811,26 +811,36 @@ void doCloseWindow(SResultRowInfo* pResultRowInfo, const SIntervalAggOperatorInf
   }
 }
 
-SResultRowPosition addToOpenWindowList(SResultRowInfo* pResultRowInfo, const SResultRow* pResult, uint64_t groupId) {
+SResultRowPosition addToOpenWindowList(SResultRowInfo* pResultRowInfo, const SResultRow* pResult, uint64_t groupId, SExecTaskInfo* pTaskInfo) {
+    int32_t        code = TSDB_CODE_SUCCESS;
+  int32_t        lino = 0;
   SOpenWindowInfo openWin = {0};
   openWin.pos.pageId = pResult->pageId;
   openWin.pos.offset = pResult->offset;
   openWin.groupId = groupId;
   SListNode* pn = tdListGetTail(pResultRowInfo->openWindow);
   if (pn == NULL) {
-    tdListAppend(pResultRowInfo->openWindow, &openWin);
+    code = tdListAppend(pResultRowInfo->openWindow, &openWin);
+    QUERY_CHECK_CODE(code, lino, _end);
     return openWin.pos;
   }
 
   SOpenWindowInfo* px = (SOpenWindowInfo*)pn->data;
   if (px->pos.pageId != openWin.pos.pageId || px->pos.offset != openWin.pos.offset || px->groupId != openWin.groupId) {
-    tdListAppend(pResultRowInfo->openWindow, &openWin);
+    code = tdListAppend(pResultRowInfo->openWindow, &openWin);
+    QUERY_CHECK_CODE(code, lino, _end);
   }
 
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
+  }
   return openWin.pos;
 }
 
-int64_t* extractTsCol(SSDataBlock* pBlock, const SIntervalAggOperatorInfo* pInfo) {
+int64_t* extractTsCol(SSDataBlock* pBlock, const SIntervalAggOperatorInfo* pInfo, SExecTaskInfo* pTaskInfo) {
   TSKEY* tsCols = NULL;
 
   if (pBlock->pDataBlock != NULL && pBlock->info.dataLoad) {
@@ -844,7 +854,12 @@ int64_t* extractTsCol(SSDataBlock* pBlock, const SIntervalAggOperatorInfo* pInfo
     }
 
     if (tsCols[0] != 0 && (pBlock->info.window.skey == 0 && pBlock->info.window.ekey == 0)) {
-      blockDataUpdateTsWindow(pBlock, pInfo->primaryTsIndex);
+      int32_t code = blockDataUpdateTsWindow(pBlock, pInfo->primaryTsIndex);
+      if (code != TSDB_CODE_SUCCESS) {
+        qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+        pTaskInfo->code = code;
+        T_LONG_JMP(pTaskInfo->env, code);
+      }
     }
   }
 
@@ -856,6 +871,8 @@ static int32_t doOpenIntervalAgg(SOperatorInfo* pOperator) {
     return TSDB_CODE_SUCCESS;
   }
 
+  int32_t        code = TSDB_CODE_SUCCESS;
+  int32_t        lino = 0;
   SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
   SOperatorInfo* downstream = pOperator->pDownstream[0];
 
@@ -875,11 +892,13 @@ static int32_t doOpenIntervalAgg(SOperatorInfo* pOperator) {
 
     if (pInfo->scalarSupp.pExprInfo != NULL) {
       SExprSupp* pExprSup = &pInfo->scalarSupp;
-      projectApplyFunctions(pExprSup->pExprInfo, pBlock, pBlock, pExprSup->pCtx, pExprSup->numOfExprs, NULL);
+      code = projectApplyFunctions(pExprSup->pExprInfo, pBlock, pBlock, pExprSup->pCtx, pExprSup->numOfExprs, NULL);
+      QUERY_CHECK_CODE(code, lino, _end);
     }
 
     // the pDataBlock are always the same one, no need to call this again
-    setInputDataBlock(pSup, pBlock, pInfo->binfo.inputTsOrder, scanFlag, true);
+    code = setInputDataBlock(pSup, pBlock, pInfo->binfo.inputTsOrder, scanFlag, true);
+    QUERY_CHECK_CODE(code, lino, _end);
     if (hashIntervalAgg(pOperator, &pInfo->binfo.resultRowInfo, pBlock, scanFlag)) break;
   }
 
@@ -887,7 +906,14 @@ static int32_t doOpenIntervalAgg(SOperatorInfo* pOperator) {
   OPTR_SET_OPENED(pOperator);
 
   pOperator->cost.openCost = (taosGetTimestampUs() - st) / 1000.0;
-  return TSDB_CODE_SUCCESS;
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
+  }
+  return code;
 }
 
 static void doStateWindowAggImpl(SOperatorInfo* pOperator, SStateWindowOperatorInfo* pInfo, SSDataBlock* pBlock) {
@@ -979,6 +1005,8 @@ static int32_t openStateWindowAggOptr(SOperatorInfo* pOperator) {
     return TSDB_CODE_SUCCESS;
   }
 
+  int32_t                   code = TSDB_CODE_SUCCESS;
+  int32_t                   lino = 0;
   SStateWindowOperatorInfo* pInfo = pOperator->info;
   SExecTaskInfo*            pTaskInfo = pOperator->pTaskInfo;
 
@@ -994,8 +1022,11 @@ static int32_t openStateWindowAggOptr(SOperatorInfo* pOperator) {
     }
 
     pInfo->binfo.pRes->info.scanFlag = pBlock->info.scanFlag;
-    setInputDataBlock(pSup, pBlock, order, MAIN_SCAN, true);
+    code = setInputDataBlock(pSup, pBlock, order, MAIN_SCAN, true);
-    blockDataUpdateTsWindow(pBlock, pInfo->tsSlotId);
+    QUERY_CHECK_CODE(code, lino, _end);
+
+    code = blockDataUpdateTsWindow(pBlock, pInfo->tsSlotId);
+    QUERY_CHECK_CODE(code, lino, _end);
 
     // there is an scalar expression that needs to be calculated right before apply the group aggregation.
     if (pInfo->scalarSup.pExprInfo != NULL) {
@@ -1013,7 +1044,13 @@ static int32_t openStateWindowAggOptr(SOperatorInfo* pOperator) {
   initGroupedResultInfo(&pInfo->groupResInfo, pInfo->aggSup.pResultRowHashTable, TSDB_ORDER_ASC);
   pOperator->status = OP_RES_TO_RETURN;
 
-  return TSDB_CODE_SUCCESS;
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
+  }
+  return code;
 }
 
 static SSDataBlock* doStateWindowAgg(SOperatorInfo* pOperator) {
@@ -1031,10 +1068,21 @@ static SSDataBlock* doStateWindowAgg(SOperatorInfo* pOperator) {
     return NULL;
   }
 
-  blockDataEnsureCapacity(pBInfo->pRes, pOperator->resultInfo.capacity);
+  int32_t code = blockDataEnsureCapacity(pBInfo->pRes, pOperator->resultInfo.capacity);
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
+  }
+
   while (1) {
     doBuildResultDatablock(pOperator, &pInfo->binfo, &pInfo->groupResInfo, pInfo->aggSup.pResultBuf);
-    doFilter(pBInfo->pRes, pOperator->exprSupp.pFilterInfo, NULL);
+    code = doFilter(pBInfo->pRes, pOperator->exprSupp.pFilterInfo, NULL);
+    if (code != TSDB_CODE_SUCCESS) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+      pTaskInfo->code = code;
+      T_LONG_JMP(pTaskInfo->env, code);
+    }
 
     bool hasRemain = hasRemainResults(&pInfo->groupResInfo);
     if (!hasRemain) {
@@ -1067,7 +1115,12 @@ static SSDataBlock* doBuildIntervalResult(SOperatorInfo* pOperator) {
 
   while (1) {
     doBuildResultDatablock(pOperator, &pInfo->binfo, &pInfo->groupResInfo, pInfo->aggSup.pResultBuf);
-    doFilter(pBlock, pOperator->exprSupp.pFilterInfo, NULL);
+    int32_t code = doFilter(pBlock, pOperator->exprSupp.pFilterInfo, NULL);
+    if (code != TSDB_CODE_SUCCESS) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+      pTaskInfo->code = code;
+      T_LONG_JMP(pTaskInfo->env, code);
+    }
 
     bool hasRemain = hasRemainResults(&pInfo->groupResInfo);
     if (!hasRemain) {
@@ -1086,32 +1139,6 @@ static SSDataBlock* doBuildIntervalResult(SOperatorInfo* pOperator) {
   return (rows == 0) ? NULL : pBlock;
 }
 
-static void doClearWindowImpl(SResultRowPosition* p1, SDiskbasedBuf* pResultBuf, SExprSupp* pSup, int32_t numOfOutput) {
-  SResultRow* pResult = getResultRowByPos(pResultBuf, p1, false);
-  if (NULL == pResult) {
-    return;
-  }
-
-  SqlFunctionCtx* pCtx = pSup->pCtx;
-  for (int32_t i = 0; i < numOfOutput; ++i) {
-    pCtx[i].resultInfo = getResultEntryInfo(pResult, i, pSup->rowEntryInfoOffset);
-    struct SResultRowEntryInfo* pResInfo = pCtx[i].resultInfo;
-    if (fmIsWindowPseudoColumnFunc(pCtx[i].functionId)) {
-      continue;
-    }
-    pResInfo->initialized = false;
-    if (pCtx[i].functionId != -1) {
-      pCtx[i].fpSet.init(&pCtx[i], pResInfo);
-    }
-  }
-  SFilePage* bufPage = getBufPage(pResultBuf, p1->pageId);
-  if (NULL == bufPage) {
-    return;
-  }
-  setBufPageDirty(bufPage, true);
-  releaseBufPage(pResultBuf, bufPage);
-}
-
 static void destroyStateWindowOperatorInfo(void* param) {
   SStateWindowOperatorInfo* pInfo = (SStateWindowOperatorInfo*)param;
   cleanupBasicInfo(&pInfo->binfo);
@@ -1135,7 +1162,7 @@ void destroyIntervalOperatorInfo(void* param) {
   cleanupAggSup(&pInfo->aggSup);
   cleanupExprSupp(&pInfo->scalarSupp);
 
-  tdListFree(pInfo->binfo.resultRowInfo.openWindow);
+  (void)tdListFree(pInfo->binfo.resultRowInfo.openWindow);
 
   taosArrayDestroy(pInfo->pInterpCols);
   pInfo->pInterpCols = NULL;
@@ -1148,9 +1175,13 @@ void destroyIntervalOperatorInfo(void* param) {
   taosMemoryFreeClear(param);
 }
 
-static bool timeWindowinterpNeeded(SqlFunctionCtx* pCtx, int32_t numOfCols, SIntervalAggOperatorInfo* pInfo) {
+static bool timeWindowinterpNeeded(SqlFunctionCtx* pCtx, int32_t numOfCols, SIntervalAggOperatorInfo* pInfo,
+                                   SExecTaskInfo* pTaskInfo) {
   // the primary timestamp column
   bool    needed = false;
+  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t lino = 0;
+  void*   tmp = NULL;
 
   for (int32_t i = 0; i < numOfCols; ++i) {
     SExprInfo* pExpr = pCtx[i].pExpr;
@@ -1162,7 +1193,10 @@ static bool timeWindowinterpNeeded(SqlFunctionCtx* pCtx, int32_t numOfCols, SInt
 
   if (needed) {
     pInfo->pInterpCols = taosArrayInit(4, sizeof(SColumn));
+    QUERY_CHECK_NULL(pInfo->pInterpCols, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
+
     pInfo->pPrevValues = taosArrayInit(4, sizeof(SGroupKeys));
+    QUERY_CHECK_NULL(pInfo->pPrevValues, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
 
     {  // ts column
       SColumn c = {0};
@@ -1170,14 +1204,18 @@ static bool timeWindowinterpNeeded(SqlFunctionCtx* pCtx, int32_t numOfCols, SInt
       c.slotId = pInfo->primaryTsIndex;
       c.type = TSDB_DATA_TYPE_TIMESTAMP;
       c.bytes = sizeof(int64_t);
-      taosArrayPush(pInfo->pInterpCols, &c);
+      tmp = taosArrayPush(pInfo->pInterpCols, &c);
+      QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
 
       SGroupKeys key;
       key.bytes = c.bytes;
       key.type = c.type;
       key.isNull = true;  // to denote no value is assigned yet
       key.pData = taosMemoryCalloc(1, c.bytes);
-      taosArrayPush(pInfo->pPrevValues, &key);
+      QUERY_CHECK_NULL(key.pData, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
+
+      tmp = taosArrayPush(pInfo->pPrevValues, &key);
+      QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
     }
   }
 
@@ -1188,17 +1226,27 @@ static bool timeWindowinterpNeeded(SqlFunctionCtx* pCtx, int32_t numOfCols, SInt
       SFunctParam* pParam = &pExpr->base.pParam[0];
 
       SColumn c = *pParam->pCol;
-      taosArrayPush(pInfo->pInterpCols, &c);
+      tmp = taosArrayPush(pInfo->pInterpCols, &c);
+      QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
 
       SGroupKeys key = {0};
       key.bytes = c.bytes;
       key.type = c.type;
       key.isNull = false;
       key.pData = taosMemoryCalloc(1, c.bytes);
-      taosArrayPush(pInfo->pPrevValues, &key);
+      QUERY_CHECK_NULL(key.pData, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
+
+      tmp = taosArrayPush(pInfo->pPrevValues, &key);
+      QUERY_CHECK_NULL(tmp, code, lino, _end, TSDB_CODE_OUT_OF_MEMORY);
     }
   }
 
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
+  }
   return needed;
 }
 
@@ -1225,15 +1273,14 @@ int32_t createIntervalOperatorInfo(SOperatorInfo* downstream, SIntervalPhysiNode
 
   size_t keyBufSize = sizeof(int64_t) + sizeof(int64_t) + POINTER_BYTES;
   initResultSizeInfo(&pOperator->resultInfo, 512);
-  blockDataEnsureCapacity(pInfo->binfo.pRes, pOperator->resultInfo.capacity);
+  code = blockDataEnsureCapacity(pInfo->binfo.pRes, pOperator->resultInfo.capacity);
+  QUERY_CHECK_CODE(code, lino, _error);
 
   int32_t    num = 0;
   SExprInfo* pExprInfo = createExprInfo(pPhyNode->window.pFuncs, NULL, &num);
   code = initAggSup(pSup, &pInfo->aggSup, pExprInfo, num, keyBufSize, pTaskInfo->id.str, pTaskInfo->streamInfo.pState,
                     &pTaskInfo->storageAPI.functionStore);
-  if (code != TSDB_CODE_SUCCESS) {
+  QUERY_CHECK_CODE(code, lino, _error);
-    goto _error;
-  }
 
   SInterval interval = {.interval = pPhyNode->interval,
                         .sliding = pPhyNode->sliding,
@@ -1282,7 +1329,7 @@ int32_t createIntervalOperatorInfo(SOperatorInfo* downstream, SIntervalPhysiNode
 
   code = initExecTimeWindowInfo(&pInfo->twAggSup.timeWindowData, &pInfo->win);
   QUERY_CHECK_CODE(code, lino, _error);
-  pInfo->timeWindowInterpo = timeWindowinterpNeeded(pSup->pCtx, num, pInfo);
+  pInfo->timeWindowInterpo = timeWindowinterpNeeded(pSup->pCtx, num, pInfo, pTaskInfo);
   if (pInfo->timeWindowInterpo) {
     pInfo->binfo.resultRowInfo.openWindow = tdListNew(sizeof(SOpenWindowInfo));
     if (pInfo->binfo.resultRowInfo.openWindow == NULL) {
@@ -1391,6 +1438,9 @@ static SSDataBlock* doSessionWindowAgg(SOperatorInfo* pOperator) {
     return NULL;
   }
 
+  int32_t                  code = TSDB_CODE_SUCCESS;
+  int32_t                  lino = 0;
+  SExecTaskInfo*           pTaskInfo = pOperator->pTaskInfo;
   SSessionAggOperatorInfo* pInfo = pOperator->info;
   SOptrBasicInfo*          pBInfo = &pInfo->binfo;
   SExprSupp*               pSup = &pOperator->exprSupp;
@@ -1398,7 +1448,8 @@ static SSDataBlock* doSessionWindowAgg(SOperatorInfo* pOperator) {
   if (pOperator->status == OP_RES_TO_RETURN) {
     while (1) {
       doBuildResultDatablock(pOperator, &pInfo->binfo, &pInfo->groupResInfo, pInfo->aggSup.pResultBuf);
-      doFilter(pBInfo->pRes, pOperator->exprSupp.pFilterInfo, NULL);
+      code = doFilter(pBInfo->pRes, pOperator->exprSupp.pFilterInfo, NULL);
+      QUERY_CHECK_CODE(code, lino, _end);
 
       bool hasRemain = hasRemainResults(&pInfo->groupResInfo);
       if (!hasRemain) {
@@ -1428,11 +1479,15 @@ static SSDataBlock* doSessionWindowAgg(SOperatorInfo* pOperator) {
     pBInfo->pRes->info.scanFlag = pBlock->info.scanFlag;
     if (pInfo->scalarSupp.pExprInfo != NULL) {
       SExprSupp* pExprSup = &pInfo->scalarSupp;
-      projectApplyFunctions(pExprSup->pExprInfo, pBlock, pBlock, pExprSup->pCtx, pExprSup->numOfExprs, NULL);
+      code = projectApplyFunctions(pExprSup->pExprInfo, pBlock, pBlock, pExprSup->pCtx, pExprSup->numOfExprs, NULL);
+      QUERY_CHECK_CODE(code, lino, _end);
     }
     // the pDataBlock are always the same one, no need to call this again
-    setInputDataBlock(pSup, pBlock, order, MAIN_SCAN, true);
+    code = setInputDataBlock(pSup, pBlock, order, MAIN_SCAN, true);
-    blockDataUpdateTsWindow(pBlock, pInfo->tsSlotId);
+    QUERY_CHECK_CODE(code, lino, _end);
+
+    code = blockDataUpdateTsWindow(pBlock, pInfo->tsSlotId);
+    QUERY_CHECK_CODE(code, lino, _end);
 
     doSessionWindowAggImpl(pOperator, pInfo, pBlock);
   }
@@ -1443,10 +1498,12 @@ static SSDataBlock* doSessionWindowAgg(SOperatorInfo* pOperator) {
   pOperator->status = OP_RES_TO_RETURN;
 
   initGroupedResultInfo(&pInfo->groupResInfo, pInfo->aggSup.pResultRowHashTable, TSDB_ORDER_ASC);
-  blockDataEnsureCapacity(pBInfo->pRes, pOperator->resultInfo.capacity);
+  code = blockDataEnsureCapacity(pBInfo->pRes, pOperator->resultInfo.capacity);
+  QUERY_CHECK_CODE(code, lino, _end);
   while (1) {
     doBuildResultDatablock(pOperator, &pInfo->binfo, &pInfo->groupResInfo, pInfo->aggSup.pResultBuf);
-    doFilter(pBInfo->pRes, pOperator->exprSupp.pFilterInfo, NULL);
+    code = doFilter(pBInfo->pRes, pOperator->exprSupp.pFilterInfo, NULL);
+    QUERY_CHECK_CODE(code, lino, _end);
 
     bool hasRemain = hasRemainResults(&pInfo->groupResInfo);
     if (!hasRemain) {
@@ -1459,6 +1516,13 @@ static SSDataBlock* doSessionWindowAgg(SOperatorInfo* pOperator) {
     }
   }
   pOperator->resultInfo.totalRows += pBInfo->pRes->info.rows;
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
+  }
   return (pBInfo->pRes->info.rows == 0) ? NULL : pBInfo->pRes;
 }
 
@@ -1684,7 +1748,7 @@ static void doMergeAlignedIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultR
   SInterval*     pInterval = &iaInfo->interval;
 
   int32_t  startPos = 0;
-  int64_t* tsCols = extractTsCol(pBlock, iaInfo);
+  int64_t* tsCols = extractTsCol(pBlock, iaInfo, pTaskInfo);
 
   TSKEY ts = getStartTsKey(&pBlock->info.window, tsCols);
 
@@ -1749,7 +1813,8 @@ static void cleanupAfterGroupResultGen(SMergeAlignedIntervalAggOperatorInfo* pMi
 
 static void doMergeAlignedIntervalAgg(SOperatorInfo* pOperator) {
   SExecTaskInfo*                        pTaskInfo = pOperator->pTaskInfo;
-
+  int32_t                               code = TSDB_CODE_SUCCESS;
+  int32_t                               lino = 0;
   SMergeAlignedIntervalAggOperatorInfo* pMiaInfo = pOperator->info;
   SIntervalAggOperatorInfo*             pIaInfo = pMiaInfo->intervalAggOperatorInfo;
 
@@ -1776,7 +1841,8 @@ static void doMergeAlignedIntervalAgg(SOperatorInfo* pOperator) {
         finalizeResultRows(pIaInfo->aggSup.pResultBuf, &pResultRowInfo->cur, pSup, pRes, pTaskInfo);
         resetResultRow(pMiaInfo->pResultRow, pIaInfo->aggSup.resultRowSize - sizeof(SResultRow));
         cleanupAfterGroupResultGen(pMiaInfo, pRes);
-        doFilter(pRes, pOperator->exprSupp.pFilterInfo, NULL);
+        code = doFilter(pRes, pOperator->exprSupp.pFilterInfo, NULL);
+        QUERY_CHECK_CODE(code, lino, _end);
       }
 
       setOperatorCompleted(pOperator);
@@ -1797,7 +1863,8 @@ static void doMergeAlignedIntervalAgg(SOperatorInfo* pOperator) {
 
         pMiaInfo->prefetchedBlock = pBlock;
         cleanupAfterGroupResultGen(pMiaInfo, pRes);
-        doFilter(pRes, pOperator->exprSupp.pFilterInfo, NULL);
+        code = doFilter(pRes, pOperator->exprSupp.pFilterInfo, NULL);
+        QUERY_CHECK_CODE(code, lino, _end);
         break;
       } else {
         // continue
@@ -1806,14 +1873,25 @@ static void doMergeAlignedIntervalAgg(SOperatorInfo* pOperator) {
     }
 
     pRes->info.scanFlag = pBlock->info.scanFlag;
-    setInputDataBlock(pSup, pBlock, pIaInfo->binfo.inputTsOrder, pBlock->info.scanFlag, true);
+    code = setInputDataBlock(pSup, pBlock, pIaInfo->binfo.inputTsOrder, pBlock->info.scanFlag, true);
+    QUERY_CHECK_CODE(code, lino, _end);
+
     doMergeAlignedIntervalAggImpl(pOperator, &pIaInfo->binfo.resultRowInfo, pBlock, pRes);
 
-    doFilter(pRes, pOperator->exprSupp.pFilterInfo, NULL);
+    code = doFilter(pRes, pOperator->exprSupp.pFilterInfo, NULL);
+    QUERY_CHECK_CODE(code, lino, _end);
+
     if (pRes->info.rows >= pOperator->resultInfo.capacity) {
       break;
     }
   }
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
+  }
 }
 
 static SSDataBlock* mergeAlignedIntervalAgg(SOperatorInfo* pOperator) {
@@ -1880,9 +1958,7 @@ int32_t createMergeAlignedIntervalOperatorInfo(SOperatorInfo* downstream, SMerge
   pSup->hasWindowOrGroup = true;
 
   code = filterInitFromNode((SNode*)pNode->window.node.pConditions, &pOperator->exprSupp.pFilterInfo, 0);
-  if (code != TSDB_CODE_SUCCESS) {
+  QUERY_CHECK_CODE(code, lino, _error);
-    goto _error;
-  }
 
   miaInfo->curTs = INT64_MIN;
   iaInfo->win = pTaskInfo->window;
@@ -1900,22 +1976,21 @@ int32_t createMergeAlignedIntervalOperatorInfo(SOperatorInfo* downstream, SMerge
 
   code = initAggSup(&pOperator->exprSupp, &iaInfo->aggSup, pExprInfo, num, keyBufSize, pTaskInfo->id.str,
                     pTaskInfo->streamInfo.pState, &pTaskInfo->storageAPI.functionStore);
-  if (code != TSDB_CODE_SUCCESS) {
+  QUERY_CHECK_CODE(code, lino, _error);
-    goto _error;
-  }
 
   SSDataBlock* pResBlock = createDataBlockFromDescNode(pNode->window.node.pOutputDataBlockDesc);
   initBasicInfo(&iaInfo->binfo, pResBlock);
   code = initExecTimeWindowInfo(&iaInfo->twAggSup.timeWindowData, &iaInfo->win);
   QUERY_CHECK_CODE(code, lino, _error);
 
-  iaInfo->timeWindowInterpo = timeWindowinterpNeeded(pSup->pCtx, num, iaInfo);
+  iaInfo->timeWindowInterpo = timeWindowinterpNeeded(pSup->pCtx, num, iaInfo, pTaskInfo);
   if (iaInfo->timeWindowInterpo) {
     iaInfo->binfo.resultRowInfo.openWindow = tdListNew(sizeof(SOpenWindowInfo));
   }
 
   initResultRowInfo(&iaInfo->binfo.resultRowInfo);
-  blockDataEnsureCapacity(iaInfo->binfo.pRes, pOperator->resultInfo.capacity);
+  code = blockDataEnsureCapacity(iaInfo->binfo.pRes, pOperator->resultInfo.capacity);
+  QUERY_CHECK_CODE(code, lino, _error);
   setOperatorInfo(pOperator, "TimeMergeAlignedIntervalAggOperator", QUERY_NODE_PHYSICAL_PLAN_MERGE_ALIGNED_INTERVAL,
                   false, OP_NOT_OPENED, miaInfo, pTaskInfo);
 
@@ -1923,9 +1998,7 @@ int32_t createMergeAlignedIntervalOperatorInfo(SOperatorInfo* downstream, SMerge
                                          optrDefaultBufFn, NULL, optrDefaultGetNextExtFn, NULL);
 
   code = appendDownstream(pOperator, &downstream, 1);
-  if (code != TSDB_CODE_SUCCESS) {
+  QUERY_CHECK_CODE(code, lino, _error);
-    goto _error;
-  }
 
   *pOptrInfo = pOperator;
   return code;
@@ -1956,7 +2029,7 @@ typedef struct SGroupTimeWindow {
 
 void destroyMergeIntervalOperatorInfo(void* param) {
   SMergeIntervalAggOperatorInfo* miaInfo = (SMergeIntervalAggOperatorInfo*)param;
-  tdListFree(miaInfo->groupIntervals);
+  (void)tdListFree(miaInfo->groupIntervals);
   destroyIntervalOperatorInfo(&miaInfo->intervalAggOperatorInfo);
 
   taosMemoryFreeClear(param);
@@ -1969,7 +2042,11 @@ static int32_t outputPrevIntervalResult(SOperatorInfo* pOperatorInfo, uint64_t t
   bool                           ascScan = (iaInfo->binfo.inputTsOrder == TSDB_ORDER_ASC);
 
   SGroupTimeWindow groupTimeWindow = {.groupId = tableGroupId, .window = *newWin};
-  tdListAppend(miaInfo->groupIntervals, &groupTimeWindow);
+  int32_t          code = tdListAppend(miaInfo->groupIntervals, &groupTimeWindow);
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+    return code;
+  }
 
   SListIter iter = {0};
   tdListInitIter(miaInfo->groupIntervals, &iter, TD_LIST_FORWARD);
@@ -1982,11 +2059,11 @@ static int32_t outputPrevIntervalResult(SOperatorInfo* pOperatorInfo, uint64_t t
 
     STimeWindow* prevWin = &prevGrpWin->window;
     if ((ascScan && newWin->skey > prevWin->ekey) || ((!ascScan) && newWin->skey < prevWin->ekey)) {
-      tdListPopNode(miaInfo->groupIntervals, listNode);
+      (void)tdListPopNode(miaInfo->groupIntervals, listNode);
     }
   }
 
-  return 0;
+  return TSDB_CODE_SUCCESS;
 }
 
 static void doMergeIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResultRowInfo, SSDataBlock* pBlock,
@@ -1999,7 +2076,7 @@ static void doMergeIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultRowInfo*
 
   int32_t     startPos = 0;
   int32_t     numOfOutput = pExprSup->numOfExprs;
-  int64_t*    tsCols = extractTsCol(pBlock, iaInfo);
+  int64_t*    tsCols = extractTsCol(pBlock, iaInfo, pTaskInfo);
   uint64_t    tableGroupId = pBlock->info.id.groupId;
   bool        ascScan = (iaInfo->binfo.inputTsOrder == TSDB_ORDER_ASC);
   TSKEY       blockStartTs = getStartTsKey(&pBlock->info.window, tsCols);
@@ -2022,7 +2099,7 @@ static void doMergeIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultRowInfo*
 
   // prev time window not interpolation yet.
   if (iaInfo->timeWindowInterpo) {
-    SResultRowPosition pos = addToOpenWindowList(pResultRowInfo, pResult, tableGroupId);
+    SResultRowPosition pos = addToOpenWindowList(pResultRowInfo, pResult, tableGroupId, pTaskInfo);
     doInterpUnclosedTimeWindow(pOperatorInfo, numOfOutput, pResultRowInfo, pBlock, scanFlag, tsCols, &pos);
 
     // restore current time window
@@ -2042,7 +2119,11 @@ static void doMergeIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultRowInfo*
   doCloseWindow(pResultRowInfo, iaInfo, pResult);
 
   // output previous interval results after this interval (&win) is closed
-  outputPrevIntervalResult(pOperatorInfo, tableGroupId, pResultBlock, &win);
+  int32_t code = outputPrevIntervalResult(pOperatorInfo, tableGroupId, pResultBlock, &win);
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+    T_LONG_JMP(pTaskInfo->env, TSDB_CODE_OUT_OF_MEMORY);
+  }
 
   STimeWindow nextWin = win;
   while (1) {
@@ -2054,7 +2135,7 @@ static void doMergeIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultRowInfo*
     }
 
     // null data, failed to allocate more memory buffer
-    int32_t code =
+    code =
         setTimeWindowOutputBuf(pResultRowInfo, &nextWin, (scanFlag == MAIN_SCAN), &pResult, tableGroupId,
                                pExprSup->pCtx, numOfOutput, pExprSup->rowEntryInfoOffset, &iaInfo->aggSup, pTaskInfo);
     if (code != TSDB_CODE_SUCCESS || pResult == NULL) {
@@ -2074,7 +2155,11 @@ static void doMergeIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultRowInfo*
     doCloseWindow(pResultRowInfo, iaInfo, pResult);
 
     // output previous interval results after this interval (&nextWin) is closed
-    outputPrevIntervalResult(pOperatorInfo, tableGroupId, pResultBlock, &nextWin);
+    code = outputPrevIntervalResult(pOperatorInfo, tableGroupId, pResultBlock, &nextWin);
+    if (code != TSDB_CODE_SUCCESS) {
+      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
+      T_LONG_JMP(pTaskInfo->env, TSDB_CODE_OUT_OF_MEMORY);
+    }
   }
 
   if (iaInfo->timeWindowInterpo) {
@@ -2083,6 +2168,8 @@ static void doMergeIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultRowInfo*
 }
 
 static SSDataBlock* doMergeIntervalAgg(SOperatorInfo* pOperator) {
+  int32_t        code = TSDB_CODE_SUCCESS;
+  int32_t        lino = 0;
   SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
 
   SMergeIntervalAggOperatorInfo* miaInfo = pOperator->info;
@@ -2095,7 +2182,8 @@ static SSDataBlock* doMergeIntervalAgg(SOperatorInfo* pOperator) {
 
   SSDataBlock* pRes = iaInfo->binfo.pRes;
   blockDataCleanup(pRes);
-  blockDataEnsureCapacity(pRes, pOperator->resultInfo.capacity);
+  code = blockDataEnsureCapacity(pRes, pOperator->resultInfo.capacity);
+  QUERY_CHECK_CODE(code, lino, _end);
 
   if (!miaInfo->inputBlocksFinished) {
     SOperatorInfo* downstream = pOperator->pDownstream[0];
@@ -2124,7 +2212,9 @@ static SSDataBlock* doMergeIntervalAgg(SOperatorInfo* pOperator) {
       }
 
       pRes->info.scanFlag = pBlock->info.scanFlag;
-      setInputDataBlock(pExpSupp, pBlock, iaInfo->binfo.inputTsOrder, pBlock->info.scanFlag, true);
+      code = setInputDataBlock(pExpSupp, pBlock, iaInfo->binfo.inputTsOrder, pBlock->info.scanFlag, true);
+      QUERY_CHECK_CODE(code, lino, _end);
+
       doMergeIntervalAggImpl(pOperator, &iaInfo->binfo.resultRowInfo, pBlock, pBlock->info.scanFlag, pRes);
 
       if (pRes->info.rows >= pOperator->resultInfo.threshold) {
@@ -2150,6 +2240,13 @@ static SSDataBlock* doMergeIntervalAgg(SOperatorInfo* pOperator) {
 
   size_t rows = pRes->info.rows;
   pOperator->resultInfo.totalRows += rows;
+
+_end:
+  if (code != TSDB_CODE_SUCCESS) {
+    qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
+    pTaskInfo->code = code;
+    T_LONG_JMP(pTaskInfo->env, code);
+  }
   return (rows == 0) ? NULL : pRes;
 }
 
@@ -2203,7 +2300,7 @@ int32_t createMergeIntervalOperatorInfo(SOperatorInfo* downstream, SMergeInterva
   code = initExecTimeWindowInfo(&pIntervalInfo->twAggSup.timeWindowData, &pIntervalInfo->win);
   QUERY_CHECK_CODE(code, lino, _error);
 
-  pIntervalInfo->timeWindowInterpo = timeWindowinterpNeeded(pExprSupp->pCtx, num, pIntervalInfo);
+  pIntervalInfo->timeWindowInterpo = timeWindowinterpNeeded(pExprSupp->pCtx, num, pIntervalInfo, pTaskInfo);
   if (pIntervalInfo->timeWindowInterpo) {
     pIntervalInfo->binfo.resultRowInfo.openWindow = tdListNew(sizeof(SOpenWindowInfo));
     if (pIntervalInfo->binfo.resultRowInfo.openWindow == NULL) {

source/libs/executor/test/timewindowTest.cpp

@@ -52,7 +52,7 @@ void printTimeWindow(STimeWindow* pWindow, int8_t precision, int64_t ts) {
   taosFormatUtcTime(bufs, tListLen(bufs), pWindow->skey, precision);
   taosFormatUtcTime(bufe, tListLen(bufe), pWindow->ekey, precision);
 
-  printf("%s [%s - %s]\n", buf, bufs, bufe);
+  (void)printf("%s [%s - %s]\n", buf, bufs, bufe);
 }
 }  // namespace
 
@@ -71,26 +71,26 @@ TEST(testCase, timewindow_gen) {
   printTimeWindow(&w, precision, key);
 
   getNextTimeWindow(&interval, &w, TSDB_ORDER_ASC);
-  printf("next\n");
+  (void)printf("next\n");
   printTimeWindow(&w, precision, key);
 
-  printf("---------------------------------------------------\n");
+  (void)printf("---------------------------------------------------\n");
   SInterval monthInterval =
       createInterval(1, 1, 0, 'n', 'n', 'd', TSDB_TIME_PRECISION_MILLI);
   getInitialStartTimeWindow(&monthInterval, key, &w, true);
   printTimeWindow(&w, precision, key);
 
   getNextTimeWindow(&monthInterval, &w, TSDB_ORDER_ASC);
-  printf("next\n");
+  (void)printf("next\n");
   printTimeWindow(&w, precision, key);
 
-  printf("----------------------------------------------------------\n");
+  (void)printf("----------------------------------------------------------\n");
   SInterval slidingInterval = createInterval(1, 10*86400*1000, 0, 'n', 'd', 'd', TSDB_TIME_PRECISION_MILLI);
   getInitialStartTimeWindow(&slidingInterval, key, &w, true);
   printTimeWindow(&w, precision, key);
 
   getNextTimeWindow(&slidingInterval, &w, TSDB_ORDER_ASC);
-  printf("next\n");
+  (void)printf("next\n");
   printTimeWindow(&w, precision, key);
 
   getNextTimeWindow(&slidingInterval, &w, TSDB_ORDER_ASC);
@@ -114,13 +114,13 @@ TEST(testCase, timewindow_gen) {
   getNextTimeWindow(&slidingInterval, &w, TSDB_ORDER_ASC);
   printTimeWindow(&w, precision, key);
 
-  printf("-----------------calendar_interval_1n_sliding_1d-------\n");
+  (void)printf("-----------------calendar_interval_1n_sliding_1d-------\n");
   SInterval calendar_interval_1n = createInterval(1, 1*86400*1000, 0, 'n', 'd', 'd', TSDB_TIME_PRECISION_MILLI);
   int64_t k1 = 1664409600 * 1000L;
   getInitialStartTimeWindow(&calendar_interval_1n, k1, &w, true);
   printTimeWindow(&w, precision, k1);
 
-  printf("next\n");
+  (void)printf("next\n");
 
   getNextTimeWindow(&calendar_interval_1n, &w, TSDB_ORDER_ASC);
   printTimeWindow(&w, precision, key);
@@ -134,14 +134,14 @@ TEST(testCase, timewindow_gen) {
   getNextTimeWindow(&calendar_interval_1n, &w, TSDB_ORDER_ASC);
   printTimeWindow(&w, precision, key);
 
-  printf("----------------interval_1d_clendar_sliding_1n---------\n");
+  (void)printf("----------------interval_1d_clendar_sliding_1n---------\n");
   SInterval interval_1d_calendar_sliding_1n = createInterval(1*86400*1000L, 1, 0, 'd', 'n', 'd', TSDB_TIME_PRECISION_MILLI);
 
   k1 = 1664409600 * 1000L;
   getInitialStartTimeWindow(&interval_1d_calendar_sliding_1n, k1, &w, true);
   printTimeWindow(&w, precision, k1);
 
-  printf("next time window:\n");
+  (void)printf("next time window:\n");
   getNextTimeWindow(&interval_1d_calendar_sliding_1n, &w, TSDB_ORDER_ASC);
   printTimeWindow(&w, precision, k1);
 
@@ -151,7 +151,7 @@ TEST(testCase, timewindow_gen) {
   getNextTimeWindow(&interval_1d_calendar_sliding_1n, &w, TSDB_ORDER_ASC);
   printTimeWindow(&w, precision, k1);
 
-  printf("----------------interval_1d_sliding_1d_calendar_offset_1n---------\n");
+  (void)printf("----------------interval_1d_sliding_1d_calendar_offset_1n---------\n");
   SInterval offset_1n = createInterval(10*86400*1000L, 10*86400*1000L, 1, 'd', 'd', 'n', TSDB_TIME_PRECISION_MILLI);
     getInitialStartTimeWindow(&offset_1n, k1, &w, true);
     printTimeWindow(&w, precision, k1);
@@ -175,14 +175,14 @@ TEST(testCase, timewindow_natural) {
   getInitialStartTimeWindow(&interval2, key1, &w1, true);
   printTimeWindow(&w1, precision, key1);
   STimeWindow w3 = getAlignQueryTimeWindow(&interval2, key1);
-  printf("%ld win %ld, %ld\n", key1, w3.skey, w3.ekey);  
+  (void)printf("%ld win %ld, %ld\n", key1, w3.skey, w3.ekey);  
 
   int64_t key2 = 1648758398208;
   STimeWindow w2 = {0};
   getInitialStartTimeWindow(&interval2, key2, &w2, true);
   printTimeWindow(&w2, precision, key2);
   STimeWindow w4 = getAlignQueryTimeWindow(&interval2, key2);
-  printf("%ld win %ld, %ld\n", key2, w3.skey, w3.ekey);
+  (void)printf("%ld win %ld, %ld\n", key2, w3.skey, w3.ekey);
 
   ASSERT_EQ(w3.skey, w4.skey);
   ASSERT_EQ(w3.ekey, w4.ekey);  
@@ -199,7 +199,7 @@ TEST(testCase, timewindow_active) {
   int64_t key = (int64_t)1609430400*1000; // 2021-01-01
   STimeWindow win = getActiveTimeWindow(NULL, &dumyInfo, key, &interval, TSDB_ORDER_ASC);
   printTimeWindow(&win, precision, key);
-  printf("%ld win %ld, %ld\n", key, win.skey, win.ekey);
+  (void)printf("%ld win %ld, %ld\n", key, win.skey, win.ekey);
   ASSERT_EQ(win.skey, 1325376000000);
   ASSERT_EQ(win.ekey, 1640908799999);
 }

source/libs/function/inc/builtinsimpl.h

@@ -49,9 +49,9 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc, int32_t* nElems)
 
 int32_t     saveTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock, STuplePos* pPos);
 int32_t     updateTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock, STuplePos* pPos);
-const char* loadTupleData(SqlFunctionCtx* pCtx, const STuplePos* pPos);
+int32_t     loadTupleData(SqlFunctionCtx* pCtx, const STuplePos* pPos, char** value);
 
-bool    functionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t functionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t functionFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
 int32_t functionFinalizeWithResultBuf(SqlFunctionCtx* pCtx, SSDataBlock* pBlock, char* finalResult);
 int32_t combineFunction(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx);
@@ -74,7 +74,7 @@ int32_t           sumInvertFunction(SqlFunctionCtx* pCtx);
 
 int32_t           sumCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx);
 
-bool    minmaxFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t minmaxFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 bool    getMinmaxFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
 int32_t minFunction(SqlFunctionCtx* pCtx);
 int32_t maxFunction(SqlFunctionCtx* pCtx);
@@ -83,7 +83,7 @@ int32_t minCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx);
 int32_t maxCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx);
 
 bool    getAvgFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    avgFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t avgFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t avgFunction(SqlFunctionCtx* pCtx);
 int32_t avgFunctionMerge(SqlFunctionCtx* pCtx);
 int32_t avgFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
@@ -97,7 +97,7 @@ int32_t avgCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx);
 int32_t getAvgInfoSize();
 
 bool    getStddevFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    stddevFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t stddevFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t stddevFunction(SqlFunctionCtx* pCtx);
 int32_t stddevFunctionMerge(SqlFunctionCtx* pCtx);
 int32_t stddevFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
@@ -111,18 +111,18 @@ int32_t stddevCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx);
 int32_t getStddevInfoSize();
 
 bool    getLeastSQRFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    leastSQRFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t leastSQRFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t leastSQRFunction(SqlFunctionCtx* pCtx);
 int32_t leastSQRFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
 int32_t leastSQRCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx);
 
 bool    getPercentileFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    percentileFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t  percentileFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t percentileFunction(SqlFunctionCtx* pCtx);
 int32_t percentileFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
 
 bool    getApercentileFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    apercentileFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t apercentileFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t apercentileFunction(SqlFunctionCtx* pCtx);
 int32_t apercentileFunctionMerge(SqlFunctionCtx* pCtx);
 int32_t apercentileFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
@@ -131,16 +131,16 @@ int32_t apercentileCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx)
 int32_t getApercentileMaxSize();
 
 bool    getDiffFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    diffFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResInfo);
+int32_t diffFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResInfo);
 int32_t diffFunction(SqlFunctionCtx* pCtx);
 int32_t diffFunctionByRow(SArray* pCtx);
 
 bool    getDerivativeFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    derivativeFuncSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResInfo);
+int32_t derivativeFuncSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResInfo);
 int32_t derivativeFunction(SqlFunctionCtx* pCtx);
 
 bool    getIrateFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    irateFuncSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResInfo);
+int32_t irateFuncSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResInfo);
 int32_t irateFunction(SqlFunctionCtx* pCtx);
 int32_t irateFunctionMerge(SqlFunctionCtx* pCtx);
 int32_t irateFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
@@ -165,7 +165,7 @@ EFuncDataRequired lastDynDataReq(void* pRes, SDataBlockInfo* pBlockInfo);
 int32_t lastRowFunction(SqlFunctionCtx* pCtx);
 
 bool    getTopBotFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv);
-bool    topBotFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t topBotFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t topFunction(SqlFunctionCtx* pCtx);
 int32_t bottomFunction(SqlFunctionCtx* pCtx);
 int32_t topBotFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
@@ -174,7 +174,7 @@ int32_t bottomCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx);
 int32_t getTopBotInfoSize(int64_t numOfItems);
 
 bool    getSpreadFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    spreadFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t spreadFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t spreadFunction(SqlFunctionCtx* pCtx);
 int32_t spreadFunctionMerge(SqlFunctionCtx* pCtx);
 int32_t spreadFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
@@ -183,7 +183,7 @@ int32_t getSpreadInfoSize();
 int32_t spreadCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx);
 
 bool    getElapsedFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    elapsedFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t elapsedFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t elapsedFunction(SqlFunctionCtx* pCtx);
 int32_t elapsedFunctionMerge(SqlFunctionCtx* pCtx);
 int32_t elapsedFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
@@ -192,7 +192,7 @@ int32_t getElapsedInfoSize();
 int32_t elapsedCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx);
 
 bool    getHistogramFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    histogramFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t histogramFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t histogramFunction(SqlFunctionCtx* pCtx);
 int32_t histogramFunctionPartial(SqlFunctionCtx* pCtx);
 int32_t histogramFunctionMerge(SqlFunctionCtx* pCtx);
@@ -210,7 +210,7 @@ int32_t getHLLInfoSize();
 int32_t hllCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx);
 
 bool    getStateFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    stateFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t stateFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t stateCountFunction(SqlFunctionCtx* pCtx);
 int32_t stateDurationFunction(SqlFunctionCtx* pCtx);
 
@@ -218,35 +218,35 @@ bool    getCsumFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
 int32_t csumFunction(SqlFunctionCtx* pCtx);
 
 bool    getMavgFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    mavgFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t mavgFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t mavgFunction(SqlFunctionCtx* pCtx);
 
 bool    getSampleFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    sampleFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t  sampleFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t sampleFunction(SqlFunctionCtx* pCtx);
 int32_t sampleFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
 
 bool    getTailFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    tailFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t tailFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t tailFunction(SqlFunctionCtx* pCtx);
 
 bool    getUniqueFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    uniqueFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t uniqueFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t uniqueFunction(SqlFunctionCtx* pCtx);
 
 bool    getModeFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    modeFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t modeFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t modeFunction(SqlFunctionCtx* pCtx);
 int32_t modeFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
 
 bool    getTwaFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
-bool    twaFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t  twaFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t twaFunction(SqlFunctionCtx* pCtx);
 int32_t twaFinalize(struct SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
 
 bool getSelectivityFuncEnv(SFunctionNode* pFunc, SFuncExecEnv* pEnv);
 
-bool    blockDistSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
+int32_t blockDistSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo);
 int32_t blockDistFunction(SqlFunctionCtx* pCtx);
 int32_t blockDistFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock);
 

source/libs/function/inc/tfunctionInt.h

@@ -37,7 +37,7 @@ static FORCE_INLINE void initResultRowEntry(SResultRowEntryInfo *pResInfo, int32
 
   pResInfo->complete = false;
   pResInfo->numOfRes = 0;
-  memset(GET_ROWCELL_INTERBUF(pResInfo), 0, bufLen);
+  (void)memset(GET_ROWCELL_INTERBUF(pResInfo), 0, bufLen);
 }
 
 #ifdef __cplusplus

source/libs/function/inc/thistogram.h

@@ -55,14 +55,15 @@ typedef struct SHistogramInfo {
 #endif
 } SHistogramInfo;
 
-SHistogramInfo* tHistogramCreate(int32_t numOfBins);
+int32_t tHistogramCreate(int32_t numOfEntries, SHistogramInfo** pHisto);
 SHistogramInfo* tHistogramCreateFrom(void* pBuf, int32_t numOfBins);
 
 int32_t tHistogramAdd(SHistogramInfo** pHisto, double val);
 int64_t tHistogramSum(SHistogramInfo* pHisto, double v);
 
-double*         tHistogramUniform(SHistogramInfo* pHisto, double* ratio, int32_t num);
+int32_t         tHistogramUniform(SHistogramInfo* pHisto, double* ratio, int32_t num, double** pVal);
-SHistogramInfo* tHistogramMerge(SHistogramInfo* pHisto1, SHistogramInfo* pHisto2, int32_t numOfEntries);
+int32_t         tHistogramMerge(SHistogramInfo* pHisto1, SHistogramInfo* pHisto2, int32_t numOfEntries,
+                                SHistogramInfo** pResHistogram);
 void            tHistogramDestroy(SHistogramInfo** pHisto);
 
 void tHistogramPrint(SHistogramInfo* pHisto);

source/libs/function/inc/tpercentile.h

@@ -67,7 +67,8 @@ typedef struct tMemBucket {
   SHashObj          *groupPagesMap;  // disk page map for different groups;
 } tMemBucket;
 
-tMemBucket *tMemBucketCreate(int32_t nElemSize, int16_t dataType, double minval, double maxval, bool hasWindowOrGroup);
+int32_t tMemBucketCreate(int32_t nElemSize, int16_t dataType, double minval, double maxval, bool hasWindowOrGroup,
+                         tMemBucket **pBucket);
 
 void tMemBucketDestroy(tMemBucket *pBucket);
 

source/libs/function/src/builtins.c

@@ -25,7 +25,7 @@
 static int32_t buildFuncErrMsg(char* pErrBuf, int32_t len, int32_t errCode, const char* pFormat, ...) {
   va_list vArgList;
   va_start(vArgList, pFormat);
-  vsnprintf(pErrBuf, len, pFormat, vArgList);
+  (void)vsnprintf(pErrBuf, len, pFormat, vArgList);
   va_end(vArgList);
   return errCode;
 }
@@ -42,27 +42,24 @@ static int32_t invaildFuncParaValueErrMsg(char* pErrBuf, int32_t len, const char
   return buildFuncErrMsg(pErrBuf, len, TSDB_CODE_FUNC_FUNTION_PARA_VALUE, "Invalid parameter value : %s", pFuncName);
 }
 
-#define TIME_UNIT_INVALID   1
-#define TIME_UNIT_TOO_SMALL 2
-
 static int32_t validateTimeUnitParam(uint8_t dbPrec, const SValueNode* pVal) {
   if (!IS_DURATION_VAL(pVal->flag)) {
-    return TIME_UNIT_INVALID;
+    return TSDB_CODE_FUNC_TIME_UNIT_INVALID;
   }
 
   if (TSDB_TIME_PRECISION_MILLI == dbPrec &&
       (0 == strcasecmp(pVal->literal, "1u") || 0 == strcasecmp(pVal->literal, "1b"))) {
-    return TIME_UNIT_TOO_SMALL;
+    return TSDB_CODE_FUNC_TIME_UNIT_TOO_SMALL;
   }
 
   if (TSDB_TIME_PRECISION_MICRO == dbPrec && 0 == strcasecmp(pVal->literal, "1b")) {
-    return TIME_UNIT_TOO_SMALL;
+    return TSDB_CODE_FUNC_TIME_UNIT_TOO_SMALL;
   }
 
   if (pVal->literal[0] != '1' ||
       (pVal->literal[1] != 'u' && pVal->literal[1] != 'a' && pVal->literal[1] != 's' && pVal->literal[1] != 'm' &&
        pVal->literal[1] != 'h' && pVal->literal[1] != 'd' && pVal->literal[1] != 'w' && pVal->literal[1] != 'b')) {
-    return TIME_UNIT_INVALID;
+    return TSDB_CODE_FUNC_TIME_UNIT_INVALID;
   }
 
   return TSDB_CODE_SUCCESS;
@@ -138,13 +135,13 @@ static bool validateTimezoneFormat(const SValueNode* pVal) {
           }
 
           if (i == 2) {
-            memcpy(buf, &tz[i - 1], 2);
+            (void)memcpy(buf, &tz[i - 1], 2);
             hour = taosStr2Int8(buf, NULL, 10);
             if (!validateHourRange(hour)) {
               return false;
             }
           } else if (i == 4) {
-            memcpy(buf, &tz[i - 1], 2);
+            (void)memcpy(buf, &tz[i - 1], 2);
             minute = taosStr2Int8(buf, NULL, 10);
             if (!validateMinuteRange(hour, minute, tz[0])) {
               return false;
@@ -167,13 +164,13 @@ static bool validateTimezoneFormat(const SValueNode* pVal) {
           }
 
           if (i == 2) {
-            memcpy(buf, &tz[i - 1], 2);
+            (void)memcpy(buf, &tz[i - 1], 2);
             hour = taosStr2Int8(buf, NULL, 10);
             if (!validateHourRange(hour)) {
               return false;
             }
           } else if (i == 5) {
-            memcpy(buf, &tz[i - 1], 2);
+            (void)memcpy(buf, &tz[i - 1], 2);
             minute = taosStr2Int8(buf, NULL, 10);
             if (!validateMinuteRange(hour, minute, tz[0])) {
               return false;
@@ -215,7 +212,7 @@ static int32_t addTimezoneParam(SNodeList* pList) {
   time_t    t = taosTime(NULL);
   struct tm tmInfo;
   if (taosLocalTime(&t, &tmInfo, buf) != NULL) {
-    strftime(buf, sizeof(buf), "%z", &tmInfo);
+    (void)strftime(buf, sizeof(buf), "%z", &tmInfo);
   }
   int32_t len = (int32_t)strlen(buf);
 
@@ -225,15 +222,27 @@ static int32_t addTimezoneParam(SNodeList* pList) {
   }
 
   pVal->literal = strndup(buf, len);
+  if (pVal->literal == NULL) {
+    nodesDestroyNode((SNode*)pVal);
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
   pVal->translate = true;
   pVal->node.resType.type = TSDB_DATA_TYPE_BINARY;
   pVal->node.resType.bytes = len + VARSTR_HEADER_SIZE;
   pVal->node.resType.precision = TSDB_TIME_PRECISION_MILLI;
   pVal->datum.p = taosMemoryCalloc(1, len + VARSTR_HEADER_SIZE + 1);
+  if (pVal->datum.p == NULL) {
+    nodesDestroyNode((SNode*)pVal);
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
   varDataSetLen(pVal->datum.p, len);
-  strncpy(varDataVal(pVal->datum.p), pVal->literal, len);
+  (void)strncpy(varDataVal(pVal->datum.p), pVal->literal, len);
 
-  nodesListAppend(pList, (SNode*)pVal);
+  int32_t code = nodesListAppend(pList, (SNode*)pVal);
+  if (TSDB_CODE_SUCCESS != code) {
+    nodesDestroyNode((SNode*)pVal);
+    return code;
+  }
   return TSDB_CODE_SUCCESS;
 }
 
@@ -252,7 +261,11 @@ static int32_t addDbPrecisonParam(SNodeList** pList, uint8_t precision) {
   pVal->datum.i = (int64_t)precision;
   pVal->typeData = (int64_t)precision;
 
-  nodesListMakeAppend(pList, (SNode*)pVal);
+  int32_t code = nodesListMakeAppend(pList, (SNode*)pVal);
+  if (TSDB_CODE_SUCCESS != code) {
+    nodesDestroyNode((SNode*)pVal);
+    return code;
+  }
   return TSDB_CODE_SUCCESS;
 }
 
@@ -936,13 +949,13 @@ static int32_t translateElapsed(SFunctionNode* pFunc, char* pErrBuf, int32_t len
 
     uint8_t dbPrec = pFunc->node.resType.precision;
 
-    int32_t ret = validateTimeUnitParam(dbPrec, (SValueNode*)nodesListGetNode(pFunc->pParameterList, 1));
+    int32_t code = validateTimeUnitParam(dbPrec, (SValueNode*)nodesListGetNode(pFunc->pParameterList, 1));
-    if (ret == TIME_UNIT_TOO_SMALL) {
+    if (code == TSDB_CODE_FUNC_TIME_UNIT_TOO_SMALL) {
-      return buildFuncErrMsg(pErrBuf, len, TSDB_CODE_FUNC_FUNTION_ERROR,
+      return buildFuncErrMsg(pErrBuf, len, code,
                              "ELAPSED function time unit parameter should be greater than db precision");
-    } else if (ret == TIME_UNIT_INVALID) {
+    } else if (code == TSDB_CODE_FUNC_TIME_UNIT_INVALID) {
       return buildFuncErrMsg(
-          pErrBuf, len, TSDB_CODE_FUNC_FUNTION_ERROR,
+          pErrBuf, len, code,
           "ELAPSED function time unit parameter should be one of the following: [1b, 1u, 1a, 1s, 1m, 1h, 1d, 1w]");
     }
   }
@@ -1062,7 +1075,7 @@ static int8_t validateHistogramBinType(char* binTypeStr) {
   return binType;
 }
 
-static bool validateHistogramBinDesc(char* binDescStr, int8_t binType, char* errMsg, int32_t msgLen) {
+static int32_t validateHistogramBinDesc(char* binDescStr, int8_t binType, char* errMsg, int32_t msgLen) {
   const char* msg1 = "HISTOGRAM function requires four parameters";
   const char* msg3 = "HISTOGRAM function invalid format for binDesc parameter";
   const char* msg4 = "HISTOGRAM function binDesc parameter \"count\" should be in range [1, 1000]";
@@ -1070,6 +1083,7 @@ static bool validateHistogramBinDesc(char* binDescStr, int8_t binType, char* err
   const char* msg6 = "HISTOGRAM function binDesc parameter \"width\" cannot be 0";
   const char* msg7 = "HISTOGRAM function binDesc parameter \"start\" cannot be 0 with \"log_bin\" type";
   const char* msg8 = "HISTOGRAM function binDesc parameter \"factor\" cannot be negative or equal to 0/1";
+  const char* msg9 = "HISTOGRAM function out of memory";
 
   cJSON*  binDesc = cJSON_Parse(binDescStr);
   int32_t numOfBins;
@@ -1078,9 +1092,9 @@ static bool validateHistogramBinDesc(char* binDescStr, int8_t binType, char* err
     int32_t numOfParams = cJSON_GetArraySize(binDesc);
     int32_t startIndex;
     if (numOfParams != 4) {
-      snprintf(errMsg, msgLen, "%s", msg1);
+      (void)snprintf(errMsg, msgLen, "%s", msg1);
       cJSON_Delete(binDesc);
-      return false;
+      return TSDB_CODE_FAILED;
     }
 
     cJSON* start = cJSON_GetObjectItem(binDesc, "start");
@@ -1090,22 +1104,22 @@ static bool validateHistogramBinDesc(char* binDescStr, int8_t binType, char* err
     cJSON* infinity = cJSON_GetObjectItem(binDesc, "infinity");
 
     if (!cJSON_IsNumber(start) || !cJSON_IsNumber(count) || !cJSON_IsBool(infinity)) {
-      snprintf(errMsg, msgLen, "%s", msg3);
+      (void)snprintf(errMsg, msgLen, "%s", msg3);
       cJSON_Delete(binDesc);
-      return false;
+      return TSDB_CODE_FAILED;
     }
 
     if (count->valueint <= 0 || count->valueint > 1000) {  // limit count to 1000
-      snprintf(errMsg, msgLen, "%s", msg4);
+      (void)snprintf(errMsg, msgLen, "%s", msg4);
       cJSON_Delete(binDesc);
-      return false;
+      return TSDB_CODE_FAILED;
     }
 
     if (isinf(start->valuedouble) || (width != NULL && isinf(width->valuedouble)) ||
         (factor != NULL && isinf(factor->valuedouble)) || (count != NULL && isinf(count->valuedouble))) {
-      snprintf(errMsg, msgLen, "%s", msg5);
+      (void)snprintf(errMsg, msgLen, "%s", msg5);
       cJSON_Delete(binDesc);
-      return false;
+      return TSDB_CODE_FAILED;
     }
 
     int32_t counter = (int32_t)count->valueint;
@@ -1118,53 +1132,58 @@ static bool validateHistogramBinDesc(char* binDescStr, int8_t binType, char* err
     }
 
     intervals = taosMemoryCalloc(numOfBins, sizeof(double));
+    if (intervals == NULL) {
+      (void)snprintf(errMsg, msgLen, "%s", msg9);
+      cJSON_Delete(binDesc);
+      return TSDB_CODE_FAILED;
+    }
     if (cJSON_IsNumber(width) && factor == NULL && binType == LINEAR_BIN) {
       // linear bin process
       if (width->valuedouble == 0) {
-        snprintf(errMsg, msgLen, "%s", msg6);
+        (void)snprintf(errMsg, msgLen, "%s", msg6);
         taosMemoryFree(intervals);
         cJSON_Delete(binDesc);
-        return false;
+        return TSDB_CODE_FAILED;
       }
       for (int i = 0; i < counter + 1; ++i) {
         intervals[startIndex] = start->valuedouble + i * width->valuedouble;
         if (isinf(intervals[startIndex])) {
-          snprintf(errMsg, msgLen, "%s", msg5);
+          (void)snprintf(errMsg, msgLen, "%s", msg5);
           taosMemoryFree(intervals);
           cJSON_Delete(binDesc);
-          return false;
+          return TSDB_CODE_FAILED;
         }
         startIndex++;
       }
     } else if (cJSON_IsNumber(factor) && width == NULL && binType == LOG_BIN) {
       // log bin process
       if (start->valuedouble == 0) {
-        snprintf(errMsg, msgLen, "%s", msg7);
+        (void)snprintf(errMsg, msgLen, "%s", msg7);
         taosMemoryFree(intervals);
         cJSON_Delete(binDesc);
-        return false;
+        return TSDB_CODE_FAILED;
       }
       if (factor->valuedouble < 0 || factor->valuedouble == 0 || factor->valuedouble == 1) {
-        snprintf(errMsg, msgLen, "%s", msg8);
+        (void)snprintf(errMsg, msgLen, "%s", msg8);
         taosMemoryFree(intervals);
         cJSON_Delete(binDesc);
-        return false;
+        return TSDB_CODE_FAILED;
       }
       for (int i = 0; i < counter + 1; ++i) {
         intervals[startIndex] = start->valuedouble * pow(factor->valuedouble, i * 1.0);
         if (isinf(intervals[startIndex])) {
-          snprintf(errMsg, msgLen, "%s", msg5);
+          (void)snprintf(errMsg, msgLen, "%s", msg5);
           taosMemoryFree(intervals);
           cJSON_Delete(binDesc);
-          return false;
+          return TSDB_CODE_FAILED;
         }
         startIndex++;
       }
     } else {
-      snprintf(errMsg, msgLen, "%s", msg3);
+      (void)snprintf(errMsg, msgLen, "%s", msg3);
       taosMemoryFree(intervals);
       cJSON_Delete(binDesc);
-      return false;
+      return TSDB_CODE_FAILED;
     }
 
     if (infinity->valueint == true) {
@@ -1172,7 +1191,7 @@ static bool validateHistogramBinDesc(char* binDescStr, int8_t binType, char* err
       intervals[numOfBins - 1] = INFINITY;
       // in case of desc bin orders, -inf/inf should be swapped
       if (numOfBins < 4) {
-        return false;
+        return TSDB_CODE_FAILED;
       }
 
       if (intervals[1] > intervals[numOfBins - 2]) {
@@ -1181,46 +1200,51 @@ static bool validateHistogramBinDesc(char* binDescStr, int8_t binType, char* err
     }
   } else if (cJSON_IsArray(binDesc)) { /* user input bins */
     if (binType != USER_INPUT_BIN) {
-      snprintf(errMsg, msgLen, "%s", msg3);
+      (void)snprintf(errMsg, msgLen, "%s", msg3);
       cJSON_Delete(binDesc);
-      return false;
+      return TSDB_CODE_FAILED;
     }
     numOfBins = cJSON_GetArraySize(binDesc);
     intervals = taosMemoryCalloc(numOfBins, sizeof(double));
+    if (intervals == NULL) {
+      (void)snprintf(errMsg, msgLen, "%s", msg9);
+      cJSON_Delete(binDesc);
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
     cJSON* bin = binDesc->child;
     if (bin == NULL) {
-      snprintf(errMsg, msgLen, "%s", msg3);
+      (void)snprintf(errMsg, msgLen, "%s", msg3);
       taosMemoryFree(intervals);
       cJSON_Delete(binDesc);
-      return false;
+      return TSDB_CODE_FAILED;
     }
     int i = 0;
     while (bin) {
       intervals[i] = bin->valuedouble;
       if (!cJSON_IsNumber(bin)) {
-        snprintf(errMsg, msgLen, "%s", msg3);
+        (void)snprintf(errMsg, msgLen, "%s", msg3);
         taosMemoryFree(intervals);
         cJSON_Delete(binDesc);
-        return false;
+        return TSDB_CODE_FAILED;
       }
       if (i != 0 && intervals[i] <= intervals[i - 1]) {
-        snprintf(errMsg, msgLen, "%s", msg3);
+        (void)snprintf(errMsg, msgLen, "%s", msg3);
         taosMemoryFree(intervals);
         cJSON_Delete(binDesc);
-        return false;
+        return TSDB_CODE_FAILED;
       }
       bin = bin->next;
       i++;
     }
   } else {
-    snprintf(errMsg, msgLen, "%s", msg3);
+    (void)snprintf(errMsg, msgLen, "%s", msg3);
     cJSON_Delete(binDesc);
-    return false;
+    return TSDB_CODE_FAILED;
   }
 
   cJSON_Delete(binDesc);
   taosMemoryFree(intervals);
-  return true;
+  return TSDB_CODE_SUCCESS;
 }
 
 static int32_t translateHistogram(SFunctionNode* pFunc, char* pErrBuf, int32_t len) {
@@ -1265,7 +1289,7 @@ static int32_t translateHistogram(SFunctionNode* pFunc, char* pErrBuf, int32_t l
     if (i == 2) {
       char errMsg[128] = {0};
       binDesc = varDataVal(pValue->datum.p);
-      if (!validateHistogramBinDesc(binDesc, binType, errMsg, (int32_t)sizeof(errMsg))) {
+      if (TSDB_CODE_SUCCESS != validateHistogramBinDesc(binDesc, binType, errMsg, (int32_t)sizeof(errMsg))) {
         return buildFuncErrMsg(pErrBuf, len, TSDB_CODE_FUNC_FUNTION_ERROR, errMsg);
       }
     }
@@ -1323,7 +1347,7 @@ static int32_t translateHistogramImpl(SFunctionNode* pFunc, char* pErrBuf, int32
       if (i == 2) {
         char errMsg[128] = {0};
         binDesc = varDataVal(pValue->datum.p);
-        if (!validateHistogramBinDesc(binDesc, binType, errMsg, (int32_t)sizeof(errMsg))) {
+        if (TSDB_CODE_SUCCESS != validateHistogramBinDesc(binDesc, binType, errMsg, (int32_t)sizeof(errMsg))) {
           return buildFuncErrMsg(pErrBuf, len, TSDB_CODE_FUNC_FUNTION_ERROR, errMsg);
         }
       }
@@ -1507,12 +1531,12 @@ static int32_t translateStateDuration(SFunctionNode* pFunc, char* pErrBuf, int32
   if (numOfParams == 4) {
     uint8_t dbPrec = pFunc->node.resType.precision;
 
-    int32_t ret = validateTimeUnitParam(dbPrec, (SValueNode*)nodesListGetNode(pFunc->pParameterList, 3));
+    int32_t code = validateTimeUnitParam(dbPrec, (SValueNode*)nodesListGetNode(pFunc->pParameterList, 3));
-    if (ret == TIME_UNIT_TOO_SMALL) {
+    if (code == TSDB_CODE_FUNC_TIME_UNIT_TOO_SMALL) {
-      return buildFuncErrMsg(pErrBuf, len, TSDB_CODE_FUNC_FUNTION_ERROR,
+      return buildFuncErrMsg(pErrBuf, len, code,
                              "STATEDURATION function time unit parameter should be greater than db precision");
-    } else if (ret == TIME_UNIT_INVALID) {
+    } else if (code == TSDB_CODE_FUNC_TIME_UNIT_INVALID) {
-      return buildFuncErrMsg(pErrBuf, len, TSDB_CODE_FUNC_FUNTION_ERROR,
+      return buildFuncErrMsg(pErrBuf, len, code,
                              "STATEDURATION function time unit parameter should be one of the following: [1b, 1u, 1a, "
                              "1s, 1m, 1h, 1d, 1w]");
     }
@@ -2268,13 +2292,13 @@ static int32_t translateTimeTruncate(SFunctionNode* pFunc, char* pErrBuf, int32_
   }
 
   uint8_t dbPrec = pFunc->node.resType.precision;
-  int32_t ret = validateTimeUnitParam(dbPrec, (SValueNode*)nodesListGetNode(pFunc->pParameterList, 1));
+  int32_t code = validateTimeUnitParam(dbPrec, (SValueNode*)nodesListGetNode(pFunc->pParameterList, 1));
-  if (ret == TIME_UNIT_TOO_SMALL) {
+  if (code == TSDB_CODE_FUNC_TIME_UNIT_TOO_SMALL) {
-    return buildFuncErrMsg(pErrBuf, len, TSDB_CODE_FUNC_FUNTION_ERROR,
+    return buildFuncErrMsg(pErrBuf, len, code,
                            "TIMETRUNCATE function time unit parameter should be greater than db precision");
-  } else if (ret == TIME_UNIT_INVALID) {
+  } else if (code == TSDB_CODE_FUNC_TIME_UNIT_INVALID) {
     return buildFuncErrMsg(
-        pErrBuf, len, TSDB_CODE_FUNC_FUNTION_ERROR,
+        pErrBuf, len, code,
         "TIMETRUNCATE function time unit parameter should be one of the following: [1b, 1u, 1a, 1s, 1m, 1h, 1d, 1w]");
   }
 
@@ -2291,7 +2315,7 @@ static int32_t translateTimeTruncate(SFunctionNode* pFunc, char* pErrBuf, int32_
 
   // add database precision as param
 
-  int32_t code = addDbPrecisonParam(&pFunc->pParameterList, dbPrec);
+  code = addDbPrecisonParam(&pFunc->pParameterList, dbPrec);
   if (code != TSDB_CODE_SUCCESS) {
     return code;
   }
@@ -2330,13 +2354,13 @@ static int32_t translateTimeDiff(SFunctionNode* pFunc, char* pErrBuf, int32_t le
   uint8_t dbPrec = pFunc->node.resType.precision;
 
   if (3 == numOfParams) {
-    int32_t ret = validateTimeUnitParam(dbPrec, (SValueNode*)nodesListGetNode(pFunc->pParameterList, 2));
+    int32_t code = validateTimeUnitParam(dbPrec, (SValueNode*)nodesListGetNode(pFunc->pParameterList, 2));
-    if (ret == TIME_UNIT_TOO_SMALL) {
+    if (code == TSDB_CODE_FUNC_TIME_UNIT_TOO_SMALL) {
-      return buildFuncErrMsg(pErrBuf, len, TSDB_CODE_FUNC_FUNTION_ERROR,
+      return buildFuncErrMsg(pErrBuf, len, code,
                              "TIMEDIFF function time unit parameter should be greater than db precision");
-    } else if (ret == TIME_UNIT_INVALID) {
+    } else if (code == TSDB_CODE_FUNC_TIME_UNIT_INVALID) {
       return buildFuncErrMsg(
-          pErrBuf, len, TSDB_CODE_FUNC_FUNTION_ERROR,
+          pErrBuf, len, code,
           "TIMEDIFF function time unit parameter should be one of the following: [1b, 1u, 1a, 1s, 1m, 1h, 1d, 1w]");
     }
   }

source/libs/function/src/detail/tavgfunction.c

@@ -354,14 +354,17 @@ bool getAvgFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv) {
   return true;
 }
 
-bool avgFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo) {
+int32_t avgFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo) {
-  if (!functionSetup(pCtx, pResultInfo)) {
+  if (pResultInfo->initialized) {
-    return false;
+    return TSDB_CODE_SUCCESS;
+  }
+  if (TSDB_CODE_SUCCESS != functionSetup(pCtx, pResultInfo)) {
+    return TSDB_CODE_FUNC_SETUP_ERROR;
   }
 
   SAvgRes* pRes = GET_ROWCELL_INTERBUF(pResultInfo);
-  memset(pRes, 0, sizeof(SAvgRes));
+  (void)memset(pRes, 0, sizeof(SAvgRes));
-  return true;
+  return TSDB_CODE_SUCCESS;
 }
 
 static int32_t calculateAvgBySMAInfo(SAvgRes* pRes, int32_t numOfRows, int32_t type, const SColumnDataAgg* pAgg) {
@@ -849,15 +852,23 @@ int32_t avgPartialFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
   SAvgRes*             pInfo = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
   int32_t              resultBytes = getAvgInfoSize();
   char*                res = taosMemoryCalloc(resultBytes + VARSTR_HEADER_SIZE, sizeof(char));
-
+  int32_t              code = TSDB_CODE_SUCCESS;
-  memcpy(varDataVal(res), pInfo, resultBytes);
+  if (NULL == res) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
+  (void)memcpy(varDataVal(res), pInfo, resultBytes);
   varDataSetLen(res, resultBytes);
 
   int32_t          slotId = pCtx->pExpr->base.resSchema.slotId;
   SColumnInfoData* pCol = taosArrayGet(pBlock->pDataBlock, slotId);
+  if(NULL == pCol) {
+    code = TSDB_CODE_OUT_OF_RANGE;
+    goto _exit;
+  }
 
-  colDataSetVal(pCol, pBlock->info.rows, res, false);
+  code = colDataSetVal(pCol, pBlock->info.rows, res, false);
 
+_exit:
   taosMemoryFree(res);
-  return pResInfo->numOfRes;
+  return code;
 }

source/libs/function/src/detail/tminmax.c

@@ -20,6 +20,7 @@
 #include "tglobal.h"
 
 #define __COMPARE_ACQUIRED_MAX(i, end, bm, _data, ctx, val, pos) \
+  int32_t code = TSDB_CODE_SUCCESS;                              \
   for (; i < (end); ++i) {                                       \
     if (colDataIsNull_f(bm, i)) {                                \
       continue;                                                  \
@@ -28,12 +29,16 @@
     if ((val) < (_data)[i]) {                                    \
       (val) = (_data)[i];                                        \
       if ((ctx)->subsidiaries.num > 0) {                         \
-        updateTupleData((ctx), i, (ctx)->pSrcBlock, pos);        \
+        code = updateTupleData((ctx), i, (ctx)->pSrcBlock, pos); \
+        if (TSDB_CODE_SUCCESS != code) {                         \
+          return code;                                           \
+        }                                                        \
       }                                                          \
     }                                                            \
   }
 
 #define __COMPARE_ACQUIRED_MIN(i, end, bm, _data, ctx, val, pos) \
+  int32_t code = TSDB_CODE_SUCCESS;                              \
   for (; i < (end); ++i) {                                       \
     if (colDataIsNull_f(bm, i)) {                                \
       continue;                                                  \
@@ -42,7 +47,10 @@
     if ((val) > (_data)[i]) {                                    \
       (val) = (_data)[i];                                        \
       if ((ctx)->subsidiaries.num > 0) {                         \
-        updateTupleData((ctx), i, (ctx)->pSrcBlock, pos);        \
+        code = updateTupleData((ctx), i, (ctx)->pSrcBlock, pos); \
+        if (TSDB_CODE_SUCCESS != code) {                         \
+          return code;                                           \
+        }                                                        \
       }                                                          \
     }                                                            \
   }
@@ -571,7 +579,7 @@ static int32_t findRowIndex(int32_t start, int32_t num, SColumnInfoData* pCol, c
   return -1;
 }
 
-static void doExtractVal(SColumnInfoData* pCol, int32_t i, int32_t end, SqlFunctionCtx* pCtx, SMinmaxResInfo* pBuf,
+static int32_t doExtractVal(SColumnInfoData* pCol, int32_t i, int32_t end, SqlFunctionCtx* pCtx, SMinmaxResInfo* pBuf,
                          bool isMinFunc) {
   if (isMinFunc) {
     switch (pCol->info.type) {
@@ -700,6 +708,7 @@ static void doExtractVal(SColumnInfoData* pCol, int32_t i, int32_t end, SqlFunct
       }
     }
   }
+  return TSDB_CODE_SUCCESS;
 }
 
 static int32_t saveRelatedTupleTag(SqlFunctionCtx* pCtx, SInputColumnInfoData* pInput, void* tval) {
@@ -840,7 +849,7 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc, int32_t* nElems)
           break;
         }
         default:
-          memcpy(&pBuf->v, p, pCol->info.bytes);
+          (void)memcpy(&pBuf->v, p, pCol->info.bytes);
           break;
       }
 
@@ -858,7 +867,7 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc, int32_t* nElems)
       goto _over;
     }
 
-    doExtractVal(pCol, i, end, pCtx, pBuf, isMinFunc);
+    code = doExtractVal(pCol, i, end, pCtx, pBuf, isMinFunc);
   } else {
     numOfElems = numOfRows;
 

source/libs/function/src/functionMgt.c

@@ -35,14 +35,14 @@ static void doInitFunctionTable() {
   gFunMgtService.pFuncNameHashTable =
       taosHashInit(funcMgtBuiltinsNum, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
   if (NULL == gFunMgtService.pFuncNameHashTable) {
-    initFunctionCode = TSDB_CODE_FAILED;
+    initFunctionCode = terrno;
     return;
   }
 
   for (int32_t i = 0; i < funcMgtBuiltinsNum; ++i) {
     if (TSDB_CODE_SUCCESS != taosHashPut(gFunMgtService.pFuncNameHashTable, funcMgtBuiltins[i].name,
                                          strlen(funcMgtBuiltins[i].name), &i, sizeof(int32_t))) {
-      initFunctionCode = TSDB_CODE_FAILED;
+      initFunctionCode = terrno;
       return;
     }
   }
@@ -61,7 +61,7 @@ static bool isSpecificClassifyFunc(int32_t funcId, uint64_t classification) {
 }
 
 int32_t fmFuncMgtInit() {
-  taosThreadOnce(&functionHashTableInit, doInitFunctionTable);
+  (void)taosThreadOnce(&functionHashTableInit, doInitFunctionTable);
   return initFunctionCode;
 }
 
@@ -115,20 +115,24 @@ EFuncDataRequired fmFuncDataRequired(SFunctionNode* pFunc, STimeWindow* pTimeWin
   return funcMgtBuiltins[pFunc->funcId].dataRequiredFunc(pFunc, pTimeWindow);
 }
 
-EFuncDataRequired fmFuncDynDataRequired(int32_t funcId, void* pRes, SDataBlockInfo* pBlockInfo) {
+int32_t fmFuncDynDataRequired(int32_t funcId, void* pRes, SDataBlockInfo* pBlockInfo, int32_t *reqStatus) {
   if (fmIsUserDefinedFunc(funcId) || funcId < 0 || funcId >= funcMgtBuiltinsNum) {
+    *reqStatus = -1;
     return TSDB_CODE_FAILED;
   }
 
   const char* name = funcMgtBuiltins[funcId].name;
   if ((strcmp(name, "_group_key") == 0) || (strcmp(name, "_select_value") == 0)) {
-    return FUNC_DATA_REQUIRED_NOT_LOAD;
+    *reqStatus = FUNC_DATA_REQUIRED_NOT_LOAD;
+    return TSDB_CODE_SUCCESS;;
   }
 
   if (funcMgtBuiltins[funcId].dynDataRequiredFunc == NULL) {
-    return FUNC_DATA_REQUIRED_DATA_LOAD;
+    *reqStatus = FUNC_DATA_REQUIRED_DATA_LOAD;
+    return TSDB_CODE_SUCCESS;
   } else {
-    return funcMgtBuiltins[funcId].dynDataRequiredFunc(pRes, pBlockInfo);
+    *reqStatus = funcMgtBuiltins[funcId].dynDataRequiredFunc(pRes, pBlockInfo);
+    return TSDB_CODE_SUCCESS;
   }
 }
 
@@ -378,29 +382,30 @@ static int32_t getFuncInfo(SFunctionNode* pFunc) {
   return fmGetFuncInfo(pFunc, msg, sizeof(msg));
 }
 
-SFunctionNode* createFunction(const char* pName, SNodeList* pParameterList) {
+int32_t createFunction(const char* pName, SNodeList* pParameterList, SFunctionNode** pFunc) {
-  SFunctionNode* pFunc = (SFunctionNode*)nodesMakeNode(QUERY_NODE_FUNCTION);
+  *pFunc = (SFunctionNode*)nodesMakeNode(QUERY_NODE_FUNCTION);
-  if (NULL == pFunc) {
+  if (NULL == *pFunc) {
-    return NULL;
+    return TSDB_CODE_OUT_OF_MEMORY;
   }
-  snprintf(pFunc->functionName, sizeof(pFunc->functionName), "%s", pName);
+  (void)snprintf((*pFunc)->functionName, sizeof((*pFunc)->functionName), "%s", pName);
-  pFunc->pParameterList = pParameterList;
+  (*pFunc)->pParameterList = pParameterList;
-  if (TSDB_CODE_SUCCESS != getFuncInfo(pFunc)) {
+  int32_t code = getFuncInfo((*pFunc));
-    pFunc->pParameterList = NULL;
+  if (TSDB_CODE_SUCCESS != code) {
-    nodesDestroyNode((SNode*)pFunc);
+    (*pFunc)->pParameterList = NULL;
-    return NULL;
+    nodesDestroyNode((SNode*)*pFunc);
+    return code;
   }
-  return pFunc;
+  return code;
 }
 
-static SNode* createColumnByFunc(const SFunctionNode* pFunc) {
+static int32_t createColumnByFunc(const SFunctionNode* pFunc, SColumnNode** pCol) {
-  SColumnNode* pCol = (SColumnNode*)nodesMakeNode(QUERY_NODE_COLUMN);
+  *pCol = (SColumnNode*)nodesMakeNode(QUERY_NODE_COLUMN);
-  if (NULL == pCol) {
+  if (NULL == *pCol) {
-    return NULL;
+    return TSDB_CODE_OUT_OF_MEMORY;
   }
-  strcpy(pCol->colName, pFunc->node.aliasName);
+  (void)strcpy((*pCol)->colName, pFunc->node.aliasName);
-  pCol->node.resType = pFunc->node.resType;
+  (*pCol)->node.resType = pFunc->node.resType;
-  return (SNode*)pCol;
+  return TSDB_CODE_SUCCESS;
 }
 
 bool fmIsDistExecFunc(int32_t funcId) {
@@ -418,17 +423,17 @@ static int32_t createPartialFunction(const SFunctionNode* pSrcFunc, SFunctionNod
   if (NULL == pParameterList) {
     return TSDB_CODE_OUT_OF_MEMORY;
   }
-  *pPartialFunc = createFunction(funcMgtBuiltins[pSrcFunc->funcId].pPartialFunc, pParameterList);
+  int32_t code = createFunction(funcMgtBuiltins[pSrcFunc->funcId].pPartialFunc, pParameterList,pPartialFunc );
-  if (NULL == *pPartialFunc) {
+  if (TSDB_CODE_SUCCESS != code) {
     nodesDestroyList(pParameterList);
-    return TSDB_CODE_OUT_OF_MEMORY;
+    return code;
   }
   (*pPartialFunc)->hasOriginalFunc = true;
   (*pPartialFunc)->originalFuncId = pSrcFunc->hasOriginalFunc ? pSrcFunc->originalFuncId : pSrcFunc->funcId;
   char name[TSDB_FUNC_NAME_LEN + TSDB_NAME_DELIMITER_LEN + TSDB_POINTER_PRINT_BYTES + 1] = {0};
   int32_t len = snprintf(name, sizeof(name) - 1, "%s.%p", (*pPartialFunc)->functionName, pSrcFunc);
-  taosCreateMD5Hash(name, len);
+  (void)taosCreateMD5Hash(name, len);
-  strncpy((*pPartialFunc)->node.aliasName, name, TSDB_COL_NAME_LEN - 1);
+  (void)strncpy((*pPartialFunc)->node.aliasName, name, TSDB_COL_NAME_LEN - 1);
   (*pPartialFunc)->hasPk = pSrcFunc->hasPk;
   (*pPartialFunc)->pkBytes = pSrcFunc->pkBytes;
   return TSDB_CODE_SUCCESS;
@@ -436,7 +441,11 @@ static int32_t createPartialFunction(const SFunctionNode* pSrcFunc, SFunctionNod
 
 static int32_t createMergeFuncPara(const SFunctionNode* pSrcFunc, const SFunctionNode* pPartialFunc,
                                    SNodeList** pParameterList) {
-  SNode* pRes = createColumnByFunc(pPartialFunc);
+  SNode *pRes = NULL;
+  int32_t code = createColumnByFunc(pPartialFunc, (SColumnNode**)&pRes);
+  if (TSDB_CODE_SUCCESS != code) {
+    return code;
+  }
   if (NULL != funcMgtBuiltins[pSrcFunc->funcId].createMergeParaFuc) {
     return funcMgtBuiltins[pSrcFunc->funcId].createMergeParaFuc(pSrcFunc->pParameterList, pRes, pParameterList);
   } else {
@@ -452,16 +461,13 @@ static int32_t createMidFunction(const SFunctionNode* pSrcFunc, const SFunctionN
   int32_t code = createMergeFuncPara(pSrcFunc, pPartialFunc, &pParameterList);
   if (TSDB_CODE_SUCCESS == code) {
     if(funcMgtBuiltins[pSrcFunc->funcId].pMiddleFunc != NULL){
-      pFunc = createFunction(funcMgtBuiltins[pSrcFunc->funcId].pMiddleFunc, pParameterList);
+      code = createFunction(funcMgtBuiltins[pSrcFunc->funcId].pMiddleFunc, pParameterList, &pFunc);
     }else{
-      pFunc = createFunction(funcMgtBuiltins[pSrcFunc->funcId].pMergeFunc, pParameterList);
+      code = createFunction(funcMgtBuiltins[pSrcFunc->funcId].pMergeFunc, pParameterList, &pFunc);
-    }
-    if (NULL == pFunc) {
-      code = TSDB_CODE_OUT_OF_MEMORY;
     }
   }
   if (TSDB_CODE_SUCCESS == code) {
-    strcpy(pFunc->node.aliasName, pPartialFunc->node.aliasName);
+    (void)strcpy(pFunc->node.aliasName, pPartialFunc->node.aliasName);
   }
 
   if (TSDB_CODE_SUCCESS == code) {
@@ -481,10 +487,7 @@ static int32_t createMergeFunction(const SFunctionNode* pSrcFunc, const SFunctio
 
   int32_t code = createMergeFuncPara(pSrcFunc, pPartialFunc, &pParameterList);
   if (TSDB_CODE_SUCCESS == code) {
-    pFunc = createFunction(funcMgtBuiltins[pSrcFunc->funcId].pMergeFunc, pParameterList);
+    code = createFunction(funcMgtBuiltins[pSrcFunc->funcId].pMergeFunc, pParameterList, &pFunc);
-    if (NULL == pFunc) {
-      code = TSDB_CODE_OUT_OF_MEMORY;
-    }
   }
   if (TSDB_CODE_SUCCESS == code) {
     pFunc->hasOriginalFunc = true;
@@ -493,7 +496,7 @@ static int32_t createMergeFunction(const SFunctionNode* pSrcFunc, const SFunctio
     if (fmIsSameInOutType(pSrcFunc->funcId)) {
       pFunc->node.resType = pSrcFunc->node.resType;
     }
-    strcpy(pFunc->node.aliasName, pSrcFunc->node.aliasName);
+    (void)strcpy(pFunc->node.aliasName, pSrcFunc->node.aliasName);
   }
 
   if (TSDB_CODE_SUCCESS == code) {
@@ -541,13 +544,13 @@ static int32_t fmCreateStateFunc(const SFunctionNode* pFunc, SFunctionNode** pSt
   if (funcMgtBuiltins[pFunc->funcId].pStateFunc) {
     SNodeList* pParams = nodesCloneList(pFunc->pParameterList);
     if (!pParams) return TSDB_CODE_OUT_OF_MEMORY;
-    *pStateFunc = createFunction(funcMgtBuiltins[pFunc->funcId].pStateFunc, pParams);
+    int32_t code = createFunction(funcMgtBuiltins[pFunc->funcId].pStateFunc, pParams, pStateFunc);
-    if (!*pStateFunc) {
+    if (TSDB_CODE_SUCCESS != code) {
       nodesDestroyList(pParams);
       return TSDB_CODE_FUNC_FUNTION_ERROR;
     }
-    strcpy((*pStateFunc)->node.aliasName, pFunc->node.aliasName);
+    (void)strcpy((*pStateFunc)->node.aliasName, pFunc->node.aliasName);
-    strcpy((*pStateFunc)->node.userAlias, pFunc->node.userAlias);
+    (void)strcpy((*pStateFunc)->node.userAlias, pFunc->node.userAlias);
   }
   return TSDB_CODE_SUCCESS;
 }
@@ -587,13 +590,13 @@ static int32_t fmCreateStateMergeFunc(SFunctionNode* pFunc, SFunctionNode** pSta
   if (funcMgtBuiltins[pFunc->funcId].pMergeFunc) {
     SNodeList* pParams = nodesCloneList(pFunc->pParameterList);
     if (!pParams) return TSDB_CODE_OUT_OF_MEMORY;
-    *pStateMergeFunc = createFunction(funcMgtBuiltins[pFunc->funcId].pMergeFunc, pParams);
+    int32_t code = createFunction(funcMgtBuiltins[pFunc->funcId].pMergeFunc, pParams, pStateMergeFunc);
-    if (!*pStateMergeFunc) {
+    if (TSDB_CODE_SUCCESS != code) {
       nodesDestroyList(pParams);
-      return TSDB_CODE_FUNC_FUNTION_ERROR;
+      return code;
     }
-    strcpy((*pStateMergeFunc)->node.aliasName, pFunc->node.aliasName);
+    (void)strcpy((*pStateMergeFunc)->node.aliasName, pFunc->node.aliasName);
-    strcpy((*pStateMergeFunc)->node.userAlias, pFunc->node.userAlias);
+    (void)strcpy((*pStateMergeFunc)->node.userAlias, pFunc->node.userAlias);
   }
   return TSDB_CODE_SUCCESS;
 }
@@ -646,6 +649,9 @@ bool fmIsMyStateFunc(int32_t funcId, int32_t stateFuncId) {
   }
   if (strcmp(pFunc->pStateFunc, pStateFunc->name) == 0) return true;
   int32_t stateMergeFuncId = fmGetFuncId(pFunc->pStateFunc);
+  if (stateMergeFuncId == -1) {
+    return false;
+  }
   const SBuiltinFuncDefinition* pStateMergeFunc = &funcMgtBuiltins[stateMergeFuncId];
   return strcmp(pStateFunc->name, pStateMergeFunc->pMergeFunc) == 0;
 }

source/libs/function/src/thistogram.c

@@ -32,9 +32,12 @@
  */
 static int32_t histogramCreateBin(SHistogramInfo* pHisto, int32_t index, double val);
 
-SHistogramInfo* tHistogramCreate(int32_t numOfEntries) {
+int32_t tHistogramCreate(int32_t numOfEntries, SHistogramInfo** pHisto) {
   /* need one redundant slot */
-  SHistogramInfo* pHisto = taosMemoryMalloc(sizeof(SHistogramInfo) + sizeof(SHistBin) * (numOfEntries + 1));
+  *pHisto = taosMemoryMalloc(sizeof(SHistogramInfo) + sizeof(SHistBin) * (numOfEntries + 1));
+  if (NULL == *pHisto) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
 
 #if !defined(USE_ARRAYLIST)
   pHisto->pList = SSkipListCreate(MAX_SKIP_LIST_LEVEL, TSDB_DATA_TYPE_DOUBLE, sizeof(double));
@@ -46,11 +49,12 @@ SHistogramInfo* tHistogramCreate(int32_t numOfEntries) {
   pss->pTree = pHisto->pLoserTree;
 #endif
 
-  return tHistogramCreateFrom(pHisto, numOfEntries);
+  *pHisto = tHistogramCreateFrom(*pHisto, numOfEntries);
+  return TSDB_CODE_SUCCESS;
 }
 
 SHistogramInfo* tHistogramCreateFrom(void* pBuf, int32_t numOfBins) {
-  memset(pBuf, 0, sizeof(SHistogramInfo) + sizeof(SHistBin) * (numOfBins + 1));
+  (void)memset(pBuf, 0, sizeof(SHistogramInfo) + sizeof(SHistBin) * (numOfBins + 1));
 
   SHistogramInfo* pHisto = (SHistogramInfo*)pBuf;
   pHisto->elems = (SHistBin*)((char*)pBuf + sizeof(SHistogramInfo));
@@ -67,15 +71,19 @@ SHistogramInfo* tHistogramCreateFrom(void* pBuf, int32_t numOfBins) {
 }
 
 int32_t tHistogramAdd(SHistogramInfo** pHisto, double val) {
+  int32_t code = TSDB_CODE_SUCCESS;
   if (*pHisto == NULL) {
-    *pHisto = tHistogramCreate(MAX_HISTOGRAM_BIN);
+    code = tHistogramCreate(MAX_HISTOGRAM_BIN, pHisto);
+    if (TSDB_CODE_SUCCESS != code) {
+      return code;
+    }
   }
 
 #if defined(USE_ARRAYLIST)
   int32_t idx = histoBinarySearch((*pHisto)->elems, (*pHisto)->numOfEntries, val);
   if (ASSERTS(idx >= 0 && idx <= (*pHisto)->maxEntries && (*pHisto)->elems != NULL, "tHistogramAdd Error, idx:%d, maxEntries:%d, elems:%p",
               idx, (*pHisto)->maxEntries, (*pHisto)->elems)) {
-    return -1;
+    return TSDB_CODE_FAILED;
   }
 
   if ((*pHisto)->elems[idx].val == val && idx >= 0) {
@@ -89,23 +97,23 @@ int32_t tHistogramAdd(SHistogramInfo** pHisto, double val) {
       if (idx > 0) {
         if (ASSERTS((*pHisto)->elems[idx - 1].val <= val, "tHistogramAdd Error, elems[%d].val:%lf, val:%lf",
                     idx - 1, (*pHisto)->elems[idx - 1].val, val)) {
-          return -1;
+          return TSDB_CODE_FAILED;
         }
       } else {
         if (ASSERTS((*pHisto)->elems[idx].val > val, "tHistogramAdd Error, elems[%d].val:%lf, val:%lf",
                     idx, (*pHisto)->elems[idx].val, val)) {
-          return -1;
+          return TSDB_CODE_FAILED;
         }
       }
     } else if ((*pHisto)->numOfElems > 0) {
       if (ASSERTS((*pHisto)->elems[(*pHisto)->numOfEntries].val <= val, "tHistogramAdd Error, elems[%d].val:%lf, val:%lf",
                   (*pHisto)->numOfEntries, (*pHisto)->elems[idx].val, val)) {
-        return -1;
+        return TSDB_CODE_FAILED;
       }
     }
 
-    int32_t code = histogramCreateBin(*pHisto, idx, val);
+    code = histogramCreateBin(*pHisto, idx, val);
-    if (code != 0) {
+    if (code != TSDB_CODE_SUCCESS) {
       return code;
     }
   }
@@ -286,7 +294,7 @@ int32_t tHistogramAdd(SHistogramInfo** pHisto, double val) {
   }
 
   (*pHisto)->numOfElems += 1;
-  return 0;
+  return code;
 }
 
 int32_t histoBinarySearch(SHistBin* pEntry, int32_t len, double val) {
@@ -335,7 +343,7 @@ static void histogramMergeImpl(SHistBin* pHistBin, int32_t* size) {
   s1->val = newVal;
   s1->num = s1->num + s2->num;
 
-  memmove(&pHistBin[index + 1], &pHistBin[index + 2], (oldSize - index - 2) * sizeof(SHistBin));
+  (void)memmove(&pHistBin[index + 1], &pHistBin[index + 2], (oldSize - index - 2) * sizeof(SHistBin));
   (*size) -= 1;
 #endif
 }
@@ -345,12 +353,12 @@ int32_t histogramCreateBin(SHistogramInfo* pHisto, int32_t index, double val) {
 #if defined(USE_ARRAYLIST)
   int32_t remain = pHisto->numOfEntries - index;
   if (remain > 0) {
-    memmove(&pHisto->elems[index + 1], &pHisto->elems[index], sizeof(SHistBin) * remain);
+    (void)memmove(&pHisto->elems[index + 1], &pHisto->elems[index], sizeof(SHistBin) * remain);
   }
 
   if (ASSERTS(index >= 0 && index <= pHisto->maxEntries, "histogramCreateBin Error, index:%d, maxEntries:%d",
               index, pHisto->maxEntries)) {
-    return -1;
+    return TSDB_CODE_FAILED;
   }
 
   pHisto->elems[index].num = 1;
@@ -367,10 +375,10 @@ int32_t histogramCreateBin(SHistogramInfo* pHisto, int32_t index, double val) {
 #endif
   if (ASSERTS(pHisto->numOfEntries <= pHisto->maxEntries, "histogramCreateBin Error, numOfEntries:%d, maxEntries:%d",
               pHisto->numOfEntries, pHisto->maxEntries)) {
-    return -1;
+    return TSDB_CODE_FAILED;
   }
 
-  return 0;
+  return TSDB_CODE_SUCCESS;
 }
 
 void tHistogramDestroy(SHistogramInfo** pHisto) {
@@ -383,17 +391,17 @@ void tHistogramDestroy(SHistogramInfo** pHisto) {
 }
 
 void tHistogramPrint(SHistogramInfo* pHisto) {
-  printf("total entries: %d, elements: %" PRId64 "\n", pHisto->numOfEntries, pHisto->numOfElems);
+  (void)printf("total entries: %d, elements: %" PRId64 "\n", pHisto->numOfEntries, pHisto->numOfElems);
 #if defined(USE_ARRAYLIST)
   for (int32_t i = 0; i < pHisto->numOfEntries; ++i) {
-    printf("%d: (%f, %" PRId64 ")\n", i + 1, pHisto->elems[i].val, pHisto->elems[i].num);
+    (void)printf("%d: (%f, %" PRId64 ")\n", i + 1, pHisto->elems[i].val, pHisto->elems[i].num);
   }
 #else
   tSkipListNode* pNode = pHisto->pList->pHead.pForward[0];
 
   for (int32_t i = 0; i < pHisto->numOfEntries; ++i) {
     SHistBin* pEntry = (SHistBin*)pNode->pData;
-    printf("%d: (%f, %" PRId64 ")\n", i + 1, pEntry->val, pEntry->num);
+    (void)printf("%d: (%f, %" PRId64 ")\n", i + 1, pEntry->val, pEntry->num);
     pNode = pNode->pForward[0];
   }
 #endif
@@ -443,21 +451,24 @@ int64_t tHistogramSum(SHistogramInfo* pHisto, double v) {
 #endif
 }
 
-double* tHistogramUniform(SHistogramInfo* pHisto, double* ratio, int32_t num) {
+int32_t tHistogramUniform(SHistogramInfo* pHisto, double* ratio, int32_t num, double** pVal) {
 #if defined(USE_ARRAYLIST)
-  double* pVal = taosMemoryMalloc(num * sizeof(double));
+  *pVal = taosMemoryMalloc(num * sizeof(double));
+  if (NULL == *pVal) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
 
   for (int32_t i = 0; i < num; ++i) {
     double numOfElem = (ratio[i] / 100) * pHisto->numOfElems;
 
     if (numOfElem == 0) {
-      pVal[i] = pHisto->min;
+      (*pVal)[i] = pHisto->min;
       continue;
     } else if (numOfElem <= pHisto->elems[0].num) {
-      pVal[i] = pHisto->elems[0].val;
+      (*pVal)[i] = pHisto->elems[0].val;
       continue;
     } else if (numOfElem == pHisto->numOfElems) {
-      pVal[i] = pHisto->max;
+      (*pVal)[i] = pHisto->max;
       continue;
     }
 
@@ -479,37 +490,39 @@ double* tHistogramUniform(SHistogramInfo* pHisto, double* ratio, int32_t num) {
 
     double delta = numOfElem - total;
     if (fabs(delta) < FLT_EPSILON) {
-      pVal[i] = pHisto->elems[j].val;
+      (*pVal)[i] = pHisto->elems[j].val;
     }
 
     double start = (double)pHisto->elems[j].num;
     double range = pHisto->elems[j + 1].num - start;
 
     if (range == 0) {
-      pVal[i] = (pHisto->elems[j + 1].val - pHisto->elems[j].val) * delta / start + pHisto->elems[j].val;
+      (*pVal)[i] = (pHisto->elems[j + 1].val - pHisto->elems[j].val) * delta / start + pHisto->elems[j].val;
     } else {
       double factor = (-2 * start + sqrt(4 * start * start - 4 * range * (-2 * delta))) / (2 * range);
-      pVal[i] = pHisto->elems[j].val + (pHisto->elems[j + 1].val - pHisto->elems[j].val) * factor;
+      (*pVal)[i] = pHisto->elems[j].val + (pHisto->elems[j + 1].val - pHisto->elems[j].val) * factor;
     }
   }
 #else
   double* pVal = taosMemoryMalloc(num * sizeof(double));
-
+  if (NULL == *pVal) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
   for (int32_t i = 0; i < num; ++i) {
     double numOfElem = ratio[i] * pHisto->numOfElems;
 
     tSkipListNode* pFirst = pHisto->pList->pHead.pForward[0];
     SHistBin*      pEntry = (SHistBin*)pFirst->pData;
     if (numOfElem == 0) {
-      pVal[i] = pHisto->min;
+      (*pVal)[i] = pHisto->min;
       printf("i/numofSlot: %f, v:%f, %f\n", ratio[i], numOfElem, pVal[i]);
       continue;
     } else if (numOfElem <= pEntry->num) {
-      pVal[i] = pEntry->val;
+      (*pVal)[i] = pEntry->val;
       printf("i/numofSlot: %f, v:%f, %f\n", ratio[i], numOfElem, pVal[i]);
       continue;
     } else if (numOfElem == pHisto->numOfElems) {
-      pVal[i] = pHisto->max;
+      (*pVal)[i] = pHisto->max;
       printf("i/numofSlot: %f, v:%f, %f\n", ratio[i], numOfElem, pVal[i]);
       continue;
     }
@@ -540,34 +553,40 @@ double* tHistogramUniform(SHistogramInfo* pHisto, double* ratio, int32_t num) {
     if (fabs(delta) < FLT_EPSILON) {
       //                printf("i/numofSlot: %f, v:%f, %f\n",
       //                (double)i/numOfSlots, numOfElem, pHisto->elems[j].val);
-      pVal[i] = pPrev->val;
+      (*pVal)[i] = pPrev->val;
     }
 
     double start = pPrev->num;
     double range = pEntry->num - start;
 
     if (range == 0) {
-      pVal[i] = (pEntry->val - pPrev->val) * delta / start + pPrev->val;
+      (*pVal)[i] = (pEntry->val - pPrev->val) * delta / start + pPrev->val;
     } else {
       double factor = (-2 * start + sqrt(4 * start * start - 4 * range * (-2 * delta))) / (2 * range);
-      pVal[i] = pPrev->val + (pEntry->val - pPrev->val) * factor;
+      (*pVal)[i] = pPrev->val + (pEntry->val - pPrev->val) * factor;
     }
     //            printf("i/numofSlot: %f, v:%f, %f\n", (double)i/numOfSlots,
     //            numOfElem, val);
   }
 #endif
-  return pVal;
+  return TSDB_CODE_SUCCESS;
 }
 
-SHistogramInfo* tHistogramMerge(SHistogramInfo* pHisto1, SHistogramInfo* pHisto2, int32_t numOfEntries) {
+int32_t tHistogramMerge(SHistogramInfo* pHisto1, SHistogramInfo* pHisto2, int32_t numOfEntries, SHistogramInfo** pResHistogram) {
-  SHistogramInfo* pResHistogram = tHistogramCreate(numOfEntries);
+  int32_t code = tHistogramCreate(numOfEntries, pResHistogram);
+  if (TSDB_CODE_SUCCESS != code) {
+    return code;
+  }
 
   // error in histogram info
   if (pHisto1->numOfEntries > MAX_HISTOGRAM_BIN || pHisto2->numOfEntries > MAX_HISTOGRAM_BIN) {
-    return pResHistogram;
+    return code;
   }
 
   SHistBin* pHistoBins = taosMemoryCalloc(1, sizeof(SHistBin) * (pHisto1->numOfEntries + pHisto2->numOfEntries));
+  if (NULL == pHistoBins) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
   int32_t   i = 0, j = 0, k = 0;
 
   while (i < pHisto1->numOfEntries && j < pHisto2->numOfEntries) {
@@ -583,28 +602,28 @@ SHistogramInfo* tHistogramMerge(SHistogramInfo* pHisto1, SHistogramInfo* pHisto2
 
   if (i < pHisto1->numOfEntries) {
     int32_t remain = pHisto1->numOfEntries - i;
-    memcpy(&pHistoBins[k], &pHisto1->elems[i], sizeof(SHistBin) * remain);
+    (void)memcpy(&pHistoBins[k], &pHisto1->elems[i], sizeof(SHistBin) * remain);
     k += remain;
   }
 
   if (j < pHisto2->numOfEntries) {
     int32_t remain = pHisto2->numOfEntries - j;
-    memcpy(&pHistoBins[k], &pHisto2->elems[j], sizeof(SHistBin) * remain);
+    (void)memcpy(&pHistoBins[k], &pHisto2->elems[j], sizeof(SHistBin) * remain);
     k += remain;
   }
 
   /* update other information */
-  pResHistogram->numOfElems = pHisto1->numOfElems + pHisto2->numOfElems;
+  (*pResHistogram)->numOfElems = pHisto1->numOfElems + pHisto2->numOfElems;
-  pResHistogram->min = (pHisto1->min < pHisto2->min) ? pHisto1->min : pHisto2->min;
+  (*pResHistogram)->min = (pHisto1->min < pHisto2->min) ? pHisto1->min : pHisto2->min;
-  pResHistogram->max = (pHisto1->max > pHisto2->max) ? pHisto1->max : pHisto2->max;
+  (*pResHistogram)->max = (pHisto1->max > pHisto2->max) ? pHisto1->max : pHisto2->max;
 
   while (k > numOfEntries) {
     histogramMergeImpl(pHistoBins, &k);
   }
 
-  pResHistogram->numOfEntries = k;
+  (*pResHistogram)->numOfEntries = k;
-  memcpy(pResHistogram->elems, pHistoBins, sizeof(SHistBin) * k);
+  (void)memcpy((*pResHistogram)->elems, pHistoBins, sizeof(SHistBin) * k);
 
   taosMemoryFree(pHistoBins);
-  return pResHistogram;
+  return TSDB_CODE_SUCCESS;
 }

source/libs/function/src/tpercentile.c

@@ -28,9 +28,12 @@
 
 int32_t getGroupId(int32_t numOfSlots, int32_t slotIndex, int32_t times) { return (times * numOfSlots) + slotIndex; }
 
-static SFilePage *loadDataFromFilePage(tMemBucket *pMemBucket, int32_t slotIdx) {
+static int32_t loadDataFromFilePage(tMemBucket *pMemBucket, int32_t slotIdx, SFilePage ** buffer) {
-  SFilePage *buffer =
+  *buffer =
       (SFilePage *)taosMemoryCalloc(1, pMemBucket->bytes * pMemBucket->pSlots[slotIdx].info.size + sizeof(SFilePage));
+  if (NULL == *buffer) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
 
   int32_t groupId = getGroupId(pMemBucket->numOfSlots, slotIdx, pMemBucket->times);
 
@@ -39,26 +42,30 @@ static SFilePage *loadDataFromFilePage(tMemBucket *pMemBucket, int32_t slotIdx)
   if (p != NULL) {
     pIdList = *(SArray **)p;
   } else {
-    taosMemoryFree(buffer);
+    taosMemoryFree(*buffer);
-    return NULL;
+    return TSDB_CODE_OUT_OF_MEMORY;
   }
 
   int32_t offset = 0;
   for (int32_t i = 0; i < taosArrayGetSize(pIdList); ++i) {
     int32_t *pageId = taosArrayGet(pIdList, i);
+    if (pageId == NULL) {
+      taosMemoryFree(*buffer);
+      return TSDB_CODE_OUT_OF_RANGE;
+    }
 
     SFilePage *pg = getBufPage(pMemBucket->pBuffer, *pageId);
     if (pg == NULL) {
-      taosMemoryFree(buffer);
+      taosMemoryFree(*buffer);
-      return NULL;
+      return terrno;
     }
 
-    memcpy(buffer->data + offset, pg->data, (size_t)(pg->num * pMemBucket->bytes));
+    (void)memcpy((*buffer)->data + offset, pg->data, (size_t)(pg->num * pMemBucket->bytes));
     offset += (int32_t)(pg->num * pMemBucket->bytes);
   }
 
-  taosSort(buffer->data, pMemBucket->pSlots[slotIdx].info.size, pMemBucket->bytes, pMemBucket->comparFn);
+  taosSort((*buffer)->data, pMemBucket->pSlots[slotIdx].info.size, pMemBucket->bytes, pMemBucket->comparFn);
-  return buffer;
+  return TSDB_CODE_SUCCESS;
 }
 
 static void resetBoundingBox(MinMaxEntry *range, int32_t type) {
@@ -116,6 +123,9 @@ int32_t findOnlyResult(tMemBucket *pMemBucket, double *result) {
       ASSERT(list->size == 1);
 
       int32_t   *pageId = taosArrayGet(list, 0);
+      if (NULL == pageId) {
+        return TSDB_CODE_OUT_OF_RANGE;
+      }
       SFilePage *pPage = getBufPage(pMemBucket->pBuffer, *pageId);
       if (pPage == NULL) {
         return terrno;
@@ -238,67 +248,71 @@ static void resetSlotInfo(tMemBucket *pBucket) {
   }
 }
 
-tMemBucket *tMemBucketCreate(int32_t nElemSize, int16_t dataType, double minval, double maxval, bool hasWindowOrGroup) {
+int32_t tMemBucketCreate(int32_t nElemSize, int16_t dataType, double minval, double maxval, bool hasWindowOrGroup,
-  tMemBucket *pBucket = (tMemBucket *)taosMemoryCalloc(1, sizeof(tMemBucket));
+                         tMemBucket **pBucket) {
-  if (pBucket == NULL) {
+  *pBucket = (tMemBucket *)taosMemoryCalloc(1, sizeof(tMemBucket));
-    return NULL;
+  if (*pBucket == NULL) {
+    return TSDB_CODE_OUT_OF_MEMORY;
   }
 
   if (hasWindowOrGroup) {
     // With window or group by, we need to shrink page size and reduce page num to save memory.
-    pBucket->numOfSlots = DEFAULT_NUM_OF_SLOT / 8 ;  // 128 bucket
+    (*pBucket)->numOfSlots = DEFAULT_NUM_OF_SLOT / 8 ;  // 128 bucket
-    pBucket->bufPageSize = 4096;  // 4k per page
+    (*pBucket)->bufPageSize = 4096;  // 4k per page
   } else {
-    pBucket->numOfSlots = DEFAULT_NUM_OF_SLOT;
+    (*pBucket)->numOfSlots = DEFAULT_NUM_OF_SLOT;
-    pBucket->bufPageSize = 16384 * 4;  // 16k per page
+    (*pBucket)->bufPageSize = 16384 * 4;  // 16k per page
   }
 
-  pBucket->type = dataType;
+  (*pBucket)->type = dataType;
-  pBucket->bytes = nElemSize;
+  (*pBucket)->bytes = nElemSize;
-  pBucket->total = 0;
+  (*pBucket)->total = 0;
-  pBucket->times = 1;
+  (*pBucket)->times = 1;
 
-  pBucket->maxCapacity = 200000;
+  (*pBucket)->maxCapacity = 200000;
-  pBucket->groupPagesMap = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false, HASH_NO_LOCK);
+  (*pBucket)->groupPagesMap = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false, HASH_NO_LOCK);
-  if (setBoundingBox(&pBucket->range, pBucket->type, minval, maxval) != 0) {
+  if ((*pBucket)->groupPagesMap == NULL) {
+    tMemBucketDestroy(*pBucket);
+    return terrno;
+  }
+  if (setBoundingBox(&(*pBucket)->range, (*pBucket)->type, minval, maxval) != 0) {
     //    qError("MemBucket:%p, invalid value range: %f-%f", pBucket, minval, maxval);
-    taosMemoryFree(pBucket);
+    tMemBucketDestroy(*pBucket);
-    return NULL;
+    return TSDB_CODE_FUNC_INVALID_VALUE_RANGE;
   }
 
-  pBucket->elemPerPage = (pBucket->bufPageSize - sizeof(SFilePage)) / pBucket->bytes;
+  (*pBucket)->elemPerPage = ((*pBucket)->bufPageSize - sizeof(SFilePage)) / (*pBucket)->bytes;
-  pBucket->comparFn = getKeyComparFunc(pBucket->type, TSDB_ORDER_ASC);
+  (*pBucket)->comparFn = getKeyComparFunc((*pBucket)->type, TSDB_ORDER_ASC);
 
-  pBucket->hashFunc = getHashFunc(pBucket->type);
+  (*pBucket)->hashFunc = getHashFunc((*pBucket)->type);
-  if (pBucket->hashFunc == NULL) {
+  if ((*pBucket)->hashFunc == NULL) {
     //    qError("MemBucket:%p, not support data type %d, failed", pBucket, pBucket->type);
-    taosMemoryFree(pBucket);
+    tMemBucketDestroy(*pBucket);
-    return NULL;
+    return TSDB_CODE_FUNC_FUNTION_PARA_TYPE;
   }
 
-  pBucket->pSlots = (tMemBucketSlot *)taosMemoryCalloc(pBucket->numOfSlots, sizeof(tMemBucketSlot));
+  (*pBucket)->pSlots = (tMemBucketSlot *)taosMemoryCalloc((*pBucket)->numOfSlots, sizeof(tMemBucketSlot));
-  if (pBucket->pSlots == NULL) {
+  if ((*pBucket)->pSlots == NULL) {
-    taosMemoryFree(pBucket);
+    tMemBucketDestroy(*pBucket);
-    return NULL;
+    return TSDB_CODE_OUT_OF_MEMORY;
   }
 
-  resetSlotInfo(pBucket);
+  resetSlotInfo((*pBucket));
 
   if (!osTempSpaceAvailable()) {
-    terrno = TSDB_CODE_NO_DISKSPACE;
     // qError("MemBucket create disk based Buf failed since %s", terrstr(terrno));
-    tMemBucketDestroy(pBucket);
+    tMemBucketDestroy(*pBucket);
-    return NULL;
+    return TSDB_CODE_NO_DISKSPACE;
   }
 
-  int32_t ret = createDiskbasedBuf(&pBucket->pBuffer, pBucket->bufPageSize, pBucket->bufPageSize * 1024, "1", tsTempDir);
+  int32_t ret = createDiskbasedBuf(&(*pBucket)->pBuffer, (*pBucket)->bufPageSize, (*pBucket)->bufPageSize * 1024, "1", tsTempDir);
   if (ret != 0) {
-    tMemBucketDestroy(pBucket);
+    tMemBucketDestroy(*pBucket);
-    return NULL;
+    return ret;
   }
 
   //  qDebug("MemBucket:%p, elem size:%d", pBucket, pBucket->bytes);
-  return pBucket;
+  return TSDB_CODE_SUCCESS;
 }
 
 void tMemBucketDestroy(tMemBucket *pBucket) {
@@ -394,7 +408,14 @@ int32_t tMemBucketPut(tMemBucket *pBucket, const void *data, size_t size) {
       void *p = taosHashGet(pBucket->groupPagesMap, &groupId, sizeof(groupId));
       if (p == NULL) {
         pPageIdList = taosArrayInit(4, sizeof(int32_t));
-        taosHashPut(pBucket->groupPagesMap, &groupId, sizeof(groupId), &pPageIdList, POINTER_BYTES);
+        if (NULL == pPageIdList) {
+          return terrno;
+        }
+        int32_t code = taosHashPut(pBucket->groupPagesMap, &groupId, sizeof(groupId), &pPageIdList, POINTER_BYTES);
+        if (TSDB_CODE_SUCCESS != code) {
+          taosArrayDestroy(pPageIdList);
+          return code;
+        }
       } else {
         pPageIdList = *(SArray **)p;
       }
@@ -404,10 +425,13 @@ int32_t tMemBucketPut(tMemBucket *pBucket, const void *data, size_t size) {
         return terrno;
       }
       pSlot->info.pageId = pageId;
-      taosArrayPush(pPageIdList, &pageId);
+      if (taosArrayPush(pPageIdList, &pageId) == NULL) {
+        taosArrayDestroy(pPageIdList);
+        return TSDB_CODE_OUT_OF_MEMORY;
+      }
     }
 
-    memcpy(pSlot->info.data->data + pSlot->info.data->num * pBucket->bytes, d, pBucket->bytes);
+    (void)memcpy(pSlot->info.data->data + pSlot->info.data->num * pBucket->bytes, d, pBucket->bytes);
 
     pSlot->info.data->num += 1;
     pSlot->info.size += 1;
@@ -493,9 +517,10 @@ int32_t getPercentileImpl(tMemBucket *pMemBucket, int32_t count, double fraction
 
       if (pSlot->info.size <= pMemBucket->maxCapacity) {
         // data in buffer and file are merged together to be processed.
-        SFilePage *buffer = loadDataFromFilePage(pMemBucket, i);
+        SFilePage *buffer = NULL;
-        if (buffer == NULL) {
+        int32_t code = loadDataFromFilePage(pMemBucket, i, &buffer);
-          return terrno;
+        if (TSDB_CODE_SUCCESS != code) {
+          return code;
         }
 
         int32_t    currentIdx = count - num;
@@ -541,6 +566,9 @@ int32_t getPercentileImpl(tMemBucket *pMemBucket, int32_t count, double fraction
 
         for (int32_t f = 0; f < list->size; ++f) {
           int32_t *pageId = taosArrayGet(list, f);
+          if (NULL == pageId) {
+            return TSDB_CODE_OUT_OF_RANGE;
+          }
           SFilePage *pg = getBufPage(pMemBucket->pBuffer, *pageId);
           if (pg == NULL) {
             return terrno;

source/libs/function/src/tudf.c

@@ -1011,7 +1011,7 @@ void    releaseUdfFuncHandle(char *udfName, UdfcFuncHandle handle);
 int32_t cleanUpUdfs();
 
 bool    udfAggGetEnv(struct SFunctionNode *pFunc, SFuncExecEnv *pEnv);
-bool    udfAggInit(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo *pResultCellInfo);
+int32_t udfAggInit(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo *pResultCellInfo);
 int32_t udfAggProcess(struct SqlFunctionCtx *pCtx);
 int32_t udfAggFinalize(struct SqlFunctionCtx *pCtx, SSDataBlock *pBlock);
 
@@ -1196,15 +1196,18 @@ bool udfAggGetEnv(struct SFunctionNode *pFunc, SFuncExecEnv *pEnv) {
   return true;
 }
 
-bool udfAggInit(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo *pResultCellInfo) {
+int32_t udfAggInit(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo *pResultCellInfo) {
-  if (functionSetup(pCtx, pResultCellInfo) != true) {
+  if (pResultCellInfo->initialized) {
-    return false;
+    return TSDB_CODE_SUCCESS;
+  }
+  if (functionSetup(pCtx, pResultCellInfo) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_FUNC_SETUP_ERROR;
   }
   UdfcFuncHandle handle;
   int32_t        udfCode = 0;
   if ((udfCode = acquireUdfFuncHandle((char *)pCtx->udfName, &handle)) != 0) {
     fnError("udfAggInit error. step doSetupUdf. udf code: %d", udfCode);
-    return false;
+    return TSDB_CODE_FUNC_SETUP_ERROR;
   }
   SUdfcUvSession *session = (SUdfcUvSession *)handle;
   SUdfAggRes     *udfRes = (SUdfAggRes *)GET_ROWCELL_INTERBUF(pResultCellInfo);
@@ -1218,7 +1221,7 @@ bool udfAggInit(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo *pResult
   if ((udfCode = doCallUdfAggInit(handle, &buf)) != 0) {
     fnError("udfAggInit error. step doCallUdfAggInit. udf code: %d", udfCode);
     releaseUdfFuncHandle(pCtx->udfName, handle);
-    return false;
+    return TSDB_CODE_FUNC_SETUP_ERROR;
   }
   if (buf.bufLen <= session->bufSize) {
     memcpy(udfRes->interResBuf, buf.buf, buf.bufLen);
@@ -1227,11 +1230,11 @@ bool udfAggInit(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo *pResult
   } else {
     fnError("udfc inter buf size %d is greater than function bufSize %d", buf.bufLen, session->bufSize);
     releaseUdfFuncHandle(pCtx->udfName, handle);
-    return false;
+    return TSDB_CODE_FUNC_SETUP_ERROR;
   }
   releaseUdfFuncHandle(pCtx->udfName, handle);
   freeUdfInterBuf(&buf);
-  return true;
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t udfAggProcess(struct SqlFunctionCtx *pCtx) {

source/libs/parser/src/parTranslater.c

@@ -10420,8 +10420,9 @@ static int32_t createLastTsSelectStmt(char* pDb, const char* pTable, const char*
     return code;
   }
 
-  SNode* pFunc = (SNode*)createFunction("last", pParameterList);
+  SNode* pFunc = NULL;
-  if (NULL == pFunc) {
+  code = createFunction("last", pParameterList, (SFunctionNode**)&pFunc);
+  if (code) {
     nodesDestroyList(pParameterList);
     return TSDB_CODE_OUT_OF_MEMORY;
   }
@@ -10438,8 +10439,9 @@ static int32_t createLastTsSelectStmt(char* pDb, const char* pTable, const char*
     return code;
   }
 
-  SFunctionNode* pFunc1 = createFunction("_vgid", NULL);
+  SFunctionNode* pFunc1 = NULL;
-  if (NULL == pFunc1) {
+  code = createFunction("_vgid", NULL, &pFunc1);
+  if (code) {
     nodesDestroyList(pProjectionList);
     return TSDB_CODE_OUT_OF_MEMORY;
   }
@@ -10451,8 +10453,9 @@ static int32_t createLastTsSelectStmt(char* pDb, const char* pTable, const char*
     return code;
   }
 
-  SFunctionNode* pFunc2 = createFunction("_vgver", NULL);
+  SFunctionNode* pFunc2 = NULL;
-  if (NULL == pFunc2) {
+  code = createFunction("_vgver", NULL, &pFunc2);
+  if (code) {
     nodesDestroyList(pProjectionList);
     return TSDB_CODE_OUT_OF_MEMORY;
   }

source/libs/parser/test/parTestMain.cpp

@@ -35,7 +35,8 @@ namespace ParserTest {
 class ParserEnv : public testing::Environment {
  public:
   virtual void SetUp() {
-    fmFuncMgtInit();
+    // TODO(smj) : How to handle return value of fmFuncMgtInit
+    (void)fmFuncMgtInit();
     initMetaDataEnv();
     generateMetaData();
     initLog(TD_TMP_DIR_PATH "td");

source/libs/planner/src/planOptimizer.c

@@ -5336,9 +5336,13 @@ static bool stbJoinOptShouldBeOptimized(SLogicNode* pNode) {
 }
 
 int32_t stbJoinOptAddFuncToScanNode(char* funcName, SScanLogicNode* pScan) {
-  SFunctionNode* pUidFunc = createFunction(funcName, NULL);
+  SFunctionNode* pUidFunc = NULL;
+  int32_t code = createFunction(funcName, NULL, &pUidFunc);
+  if (TSDB_CODE_SUCCESS != code) {
+    return code;
+  }
   snprintf(pUidFunc->node.aliasName, sizeof(pUidFunc->node.aliasName), "%s.%p", pUidFunc->functionName, pUidFunc);
-  int32_t code = nodesListStrictAppend(pScan->pScanPseudoCols, (SNode*)pUidFunc);
+  code = nodesListStrictAppend(pScan->pScanPseudoCols, (SNode*)pUidFunc);
   if (TSDB_CODE_SUCCESS == code) {
     code = createColumnByRewriteExpr((SNode*)pUidFunc, &pScan->node.pTargets);
   }

source/libs/planner/test/planTestMain.cpp

@@ -27,7 +27,8 @@
 class PlannerEnv : public testing::Environment {
  public:
   virtual void SetUp() {
-    fmFuncMgtInit();
+    // TODO(smj) : How to handle return value of fmFuncMgtInit
+    (void)fmFuncMgtInit();
     initMetaDataEnv();
     generateMetaData();
     initLog(TD_TMP_DIR_PATH "td");

source/libs/scalar/src/filter.c

@@ -997,9 +997,15 @@ int32_t filterDetachCnfGroups(SArray *group, SArray *left, SArray *right) {
 
   for (int32_t l = 0; l < leftSize; ++l) {
     SFilterGroup *gp1 = taosArrayGet(left, l);
+    if (NULL == gp1) {
+      FLT_ERR_RET(TSDB_CODE_OUT_OF_RANGE);
+    }
 
     for (int32_t r = 0; r < rightSize; ++r) {
       SFilterGroup *gp2 = taosArrayGet(right, r);
+      if (NULL == gp2) {
+        FLT_ERR_RET(TSDB_CODE_OUT_OF_RANGE);
+      }
 
       FLT_ERR_RET(filterDetachCnfGroup(gp1, gp2, group));
     }
@@ -1212,7 +1218,7 @@ int32_t filterAddUnitImpl(SFilterInfo *info, uint8_t optr, SFilterFieldId *left,
     FLT_PACKAGE_UNIT_HASH_KEY(&v, optr, optr2, left->idx, (right ? right->idx : -1), (right2 ? right2->idx : -1));
     if (taosHashPut(info->pctx.unitHash, v, sizeof(v), uidx, sizeof(*uidx))) {
       fltError("taosHashPut to set failed");
-      FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY);
+      FLT_ERR_RET(terrno);
     }
 
   }
@@ -2157,7 +2163,7 @@ int32_t fltInitValFieldData(SFilterInfo *info) {
       int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(fi->data), varDataLen(fi->data), varDataVal(newValData));
       if (len < 0) {
         qError("filterInitValFieldData taosUcs4ToMbs error 1");
-        return TSDB_CODE_APP_ERROR;
+        return TSDB_CODE_SCALAR_CONVERT_ERROR;
       }
       varDataSetLen(newValData, len);
       (void)varDataCopy(fi->data, newValData);
@@ -2307,6 +2313,9 @@ int32_t filterMergeUnits(SFilterInfo *info, SFilterGroupCtx *gRes, uint32_t colI
 
   for (uint32_t i = 0; i < size; ++i) {
     SFilterUnit *u = taosArrayGetP(colArray, i);
+    if (NULL == u) {
+      FLT_ERR_JRET(TSDB_CODE_OUT_OF_RANGE);
+    }
     uint8_t      optr = FILTER_UNIT_OPTR(u);
 
     FLT_ERR_RET(filterAddRangeOptr(ctx, optr, LOGIC_COND_TYPE_AND, empty, NULL));
@@ -2637,6 +2646,9 @@ int32_t filterMergeTwoGroups(SFilterInfo *info, SFilterGroupCtx **gRes1, SFilter
 
   for (int32_t i = 0; i < ctxSize; ++i) {
     pctx = taosArrayGet(colCtxs, i);
+    if (NULL == pctx) {
+      FLT_ERR_JRET(TSDB_CODE_OUT_OF_RANGE);
+    }
     colInfo = &(*gRes1)->colInfo[pctx->colIdx];
 
     filterFreeColInfo(colInfo);
@@ -2763,6 +2775,9 @@ int32_t filterConvertGroupFromArray(SFilterInfo *info, SArray *group) {
 
   for (size_t i = 0; i < groupSize; ++i) {
     SFilterGroup *pg = taosArrayGet(group, i);
+    if (NULL == pg) {
+      FLT_ERR_RET(TSDB_CODE_OUT_OF_RANGE);
+    }
     pg->unitFlags = taosMemoryCalloc(pg->unitNum, sizeof(*pg->unitFlags));
     if (pg->unitFlags == NULL) {
       FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY);
@@ -2819,7 +2834,9 @@ int32_t filterRewrite(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t gResNum
 
         for (int32_t n = 0; n < usize; ++n) {
           SFilterUnit *u = (SFilterUnit *)taosArrayGetP((SArray *)colInfo->info, n);
-
+          if (NULL == u) {
+            FLT_ERR_JRET(TSDB_CODE_OUT_OF_RANGE);
+          }
           FLT_ERR_JRET(filterAddUnitFromUnit(info, &oinfo, u, &uidx));
           FLT_ERR_JRET(filterAddUnitToGroup(&ng, uidx));
         }
@@ -3425,7 +3442,7 @@ int32_t filterExecuteImplMisc(void *pinfo, int32_t numOfRows, SColumnInfoData *p
       if (len < 0) {
         qError("castConvert1 taosUcs4ToMbs error");
         taosMemoryFreeClear(newColData);
-        FLT_ERR_RET(TSDB_CODE_APP_ERROR);
+        FLT_ERR_RET(TSDB_CODE_SCALAR_CONVERT_ERROR);
       } else {
         varDataSetLen(newColData, len);
         p[i] = filterDoCompare(gDataCompare[info->cunits[uidx].func], info->cunits[uidx].optr, newColData,
@@ -3500,7 +3517,7 @@ int32_t filterExecuteImpl(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes,
               if (len < 0) {
                 qError("castConvert1 taosUcs4ToMbs error");
                 taosMemoryFreeClear(newColData);
-                FLT_ERR_RET(TSDB_CODE_APP_ERROR);
+                FLT_ERR_RET(TSDB_CODE_SCALAR_CONVERT_ERROR);
               } else {
                 varDataSetLen(newColData, len);
                 p[i] = filterDoCompare(gDataCompare[cunit->func], cunit->optr, newColData, cunit->valData);
@@ -3814,6 +3831,9 @@ int32_t fltSclMergeSort(SArray *pts1, SArray *pts2, SArray *result) {
   while (i < len1 && j < len2) {
     SFltSclPoint *pt1 = taosArrayGet(pts1, i);
     SFltSclPoint *pt2 = taosArrayGet(pts2, j);
+    if (NULL == pt1 || NULL == pt2) {
+      FLT_ERR_RET(TSDB_CODE_OUT_OF_RANGE);
+    }
     bool          less = fltSclLessPoint(pt1, pt2);
     if (less) {
       if (NULL == taosArrayPush(result, pt1)) {
@@ -3830,6 +3850,9 @@ int32_t fltSclMergeSort(SArray *pts1, SArray *pts2, SArray *result) {
   if (i < len1) {
     for (; i < len1; ++i) {
       SFltSclPoint *pt1 = taosArrayGet(pts1, i);
+      if (NULL == pt1) {
+        FLT_ERR_RET(TSDB_CODE_OUT_OF_RANGE);
+      }
       if (NULL == taosArrayPush(result, pt1)) {
         FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY);
       }
@@ -3838,6 +3861,9 @@ int32_t fltSclMergeSort(SArray *pts1, SArray *pts2, SArray *result) {
   if (j < len2) {
     for (; j < len2; ++j) {
       SFltSclPoint *pt2 = taosArrayGet(pts2, j);
+      if (NULL == pt2) {
+        FLT_ERR_RET(TSDB_CODE_OUT_OF_RANGE);
+      }
       if (NULL == taosArrayPush(result, pt2)) {
         FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY);
       }
@@ -3859,6 +3885,9 @@ int32_t fltSclMerge(SArray *pts1, SArray *pts2, bool isUnion, SArray *merged) {
   int32_t count = 0;
   for (int32_t i = 0; i < taosArrayGetSize(all); ++i) {
     SFltSclPoint *pt = taosArrayGet(all, i);
+    if (NULL == pt) {
+      FLT_ERR_RET(TSDB_CODE_OUT_OF_RANGE);
+    }
     if (pt->start) {
       ++count;
       if (count == countRequired) {
@@ -3893,6 +3922,9 @@ typedef struct {
 int32_t fltSclGetOrCreateColumnRange(SColumnNode *colNode, SArray *colRangeList, SFltSclColumnRange **colRange) {
   for (int32_t i = 0; i < taosArrayGetSize(colRangeList); ++i) {
     *colRange = taosArrayGet(colRangeList, i);
+    if (NULL == colRange) {
+      return TSDB_CODE_OUT_OF_RANGE;
+    }
     if (nodesEqualNode((SNode *)(*colRange)->colNode, (SNode *)colNode)) {
       return TSDB_CODE_SUCCESS;
     }
@@ -4044,6 +4076,9 @@ int32_t filterRangeExecute(SFilterInfo *info, SColumnDataAgg *pDataStatis, int32
     SArray *colRanges = info->sclCtx.fltSclRange;
     for (int32_t i = 0; i < taosArrayGetSize(colRanges); ++i) {
       SFltSclColumnRange *colRange = taosArrayGet(colRanges, i);
+      if (NULL == colRange) {
+        FLT_ERR_RET(TSDB_CODE_OUT_OF_RANGE);
+      }
       bool                foundCol = false;
       int32_t             j = 0;
       for (; j < numOfCols; ++j) {
@@ -4332,11 +4367,17 @@ int32_t filterGetTimeRange(SNode *pNode, STimeWindow *win, bool *isStrict) {
     SArray *colRanges = info->sclCtx.fltSclRange;
     if (taosArrayGetSize(colRanges) == 1) {
       SFltSclColumnRange *colRange = taosArrayGet(colRanges, 0);
+      if (NULL == colRange) {
+        FLT_ERR_JRET(TSDB_CODE_OUT_OF_RANGE);
+      }
       SArray             *points = colRange->points;
       if (taosArrayGetSize(points) == 2) {
         *win = TSWINDOW_DESC_INITIALIZER;
         SFltSclPoint *startPt = taosArrayGet(points, 0);
         SFltSclPoint *endPt = taosArrayGet(points, 1);
+        if (NULL == startPt || NULL == endPt) {
+          FLT_ERR_JRET(TSDB_CODE_OUT_OF_RANGE);
+        }
         SFltSclDatum  start;
         SFltSclDatum  end;
         FLT_ERR_JRET(fltSclGetTimeStampDatum(startPt, &start));
@@ -4398,7 +4439,7 @@ int32_t filterConverNcharColumns(SFilterInfo *info, int32_t rows, bool *gotNchar
         bool ret = taosMbsToUcs4(varDataVal(src), varDataLen(src), (TdUcs4 *)varDataVal(dst), bufSize, &len);
         if (!ret) {
           qError("filterConverNcharColumns taosMbsToUcs4 error");
-          return TSDB_CODE_FAILED;
+          return TSDB_CODE_SCALAR_CONVERT_ERROR;
         }
         varDataLen(dst) = len;
       }
@@ -4432,7 +4473,7 @@ int32_t fltAddValueNodeToConverList(SFltTreeStat *stat, SValueNode *pNode) {
   if (NULL == stat->nodeList) {
     stat->nodeList = taosArrayInit(10, POINTER_BYTES);
     if (NULL == stat->nodeList) {
-      FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY);
+      FLT_ERR_RET(terrno);
     }
   }
 
@@ -4816,6 +4857,9 @@ int32_t fltSclProcessCNF(SArray *sclOpListCNF, SArray *colRangeList) {
   size_t sz = taosArrayGetSize(sclOpListCNF);
   for (int32_t i = 0; i < sz; ++i) {
     SFltSclOperator    *sclOper = taosArrayGet(sclOpListCNF, i);
+    if (NULL == sclOper) {
+      FLT_ERR_RET(TSDB_CODE_OUT_OF_RANGE);
+    }
     SFltSclColumnRange *colRange = NULL;
     FLT_ERR_RET(fltSclGetOrCreateColumnRange(sclOper->colNode, colRangeList, &colRange));
     SArray             *points = taosArrayInit(4, sizeof(SFltSclPoint));
@@ -4920,22 +4964,27 @@ static int32_t fltSclCollectOperators(SNode *pNode, SArray *sclOpList) {
 
 int32_t fltOptimizeNodes(SFilterInfo *pInfo, SNode **pNode, SFltTreeStat *pStat) {
   SArray *sclOpList = taosArrayInit(16, sizeof(SFltSclOperator));
+  int32_t code = TSDB_CODE_SUCCESS;
   if (NULL == sclOpList) {
     FLT_ERR_RET(terrno);
   }
-  FLT_ERR_RET(fltSclCollectOperators(*pNode, sclOpList));
+  FLT_ERR_JRET(fltSclCollectOperators(*pNode, sclOpList));
   SArray *colRangeList = taosArrayInit(16, sizeof(SFltSclColumnRange));
   if (NULL == colRangeList) {
     FLT_ERR_RET(terrno);
   }
-  FLT_ERR_RET(fltSclProcessCNF(sclOpList, colRangeList));
+  FLT_ERR_JRET(fltSclProcessCNF(sclOpList, colRangeList));
   pInfo->sclCtx.fltSclRange = colRangeList;
 
   for (int32_t i = 0; i < taosArrayGetSize(sclOpList); ++i) {
     SFltSclOperator *sclOp = taosArrayGet(sclOpList, i);
+    if (NULL == sclOp) {
+      FLT_ERR_JRET(TSDB_CODE_OUT_OF_RANGE);
+    }
     nodesDestroyNode((SNode *)sclOp->colNode);
     nodesDestroyNode((SNode *)sclOp->valNode);
   }
+_return:
   taosArrayDestroy(sclOpList);
   return TSDB_CODE_SUCCESS;
 }
@@ -4946,6 +4995,9 @@ int32_t fltGetDataFromColId(void *param, int32_t id, void **data) {
 
   for (int32_t j = 0; j < numOfCols; ++j) {
     SColumnInfoData *pColInfo = taosArrayGet(pDataBlock, j);
+    if (NULL == pColInfo) {
+      FLT_ERR_RET(TSDB_CODE_OUT_OF_RANGE);
+    }
     if (id == pColInfo->info.colId) {
       *data = pColInfo;
       break;
@@ -4965,6 +5017,9 @@ int32_t fltGetDataFromSlotId(void *param, int32_t id, void **data) {
   }
 
   SColumnInfoData *pColInfo = taosArrayGet(pDataBlock, id);
+  if (NULL == pColInfo) {
+    return TSDB_CODE_OUT_OF_RANGE;
+  }
   *data = pColInfo;
 
   return TSDB_CODE_SUCCESS;

source/libs/scalar/src/scalar.c

@@ -90,6 +90,9 @@ int32_t sclConvertValueToSclParam(SValueNode *pValueNode, SScalarParam *out, int
 
 int32_t sclExtendResRows(SScalarParam *pDst, SScalarParam *pSrc, SArray *pBlockList) {
   SSDataBlock  *pb = taosArrayGetP(pBlockList, 0);
+  if (NULL == pb) {
+    SCL_ERR_RET(TSDB_CODE_OUT_OF_RANGE);
+  }
   SScalarParam *pLeft = taosMemoryCalloc(1, sizeof(SScalarParam));
   int32_t       code = TSDB_CODE_SUCCESS;
   if (NULL == pLeft) {
@@ -116,7 +119,7 @@ int32_t scalarGenerateSetFromList(void **data, void *pNode, uint32_t type) {
   SHashObj *pObj = taosHashInit(256, taosGetDefaultHashFunction(type), true, false);
   if (NULL == pObj) {
     sclError("taosHashInit failed, size:%d", 256);
-    SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY);
+    SCL_ERR_RET(terrno);
   }
 
   taosHashSetEqualFp(pObj, taosGetDefaultEqualFunction(type));
@@ -176,7 +179,7 @@ int32_t scalarGenerateSetFromList(void **data, void *pNode, uint32_t type) {
 
     if (taosHashPut(pObj, buf, (size_t)len, NULL, 0)) {
       sclError("taosHashPut to set failed");
-      SCL_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY);
+      SCL_ERR_JRET(terrno);
     }
 
     colInfoDataCleanup(out.columnData, out.numOfRows);
@@ -336,6 +339,9 @@ int32_t sclInitParam(SNode *node, SScalarParam *param, SScalarCtx *ctx, int32_t
   switch (nodeType(node)) {
     case QUERY_NODE_LEFT_VALUE: {
       SSDataBlock *pb = taosArrayGetP(ctx->pBlockList, 0);
+      if (NULL == pb) {
+        SCL_ERR_RET(TSDB_CODE_OUT_OF_RANGE);
+      }
       param->numOfRows = pb->info.rows;
       break;
     }
@@ -347,10 +353,7 @@ int32_t sclInitParam(SNode *node, SScalarParam *param, SScalarCtx *ctx, int32_t
         SCL_ERR_RET(TSDB_CODE_QRY_INVALID_INPUT);
       }
       param->numOfRows = 1;
-      int32_t code = sclCreateColumnInfoData(&valueNode->node.resType, 1, param);
+      SCL_ERR_RET(sclCreateColumnInfoData(&valueNode->node.resType, 1, param));
-      if (code != TSDB_CODE_SUCCESS) {
-        SCL_RET(TSDB_CODE_OUT_OF_MEMORY);
-      }
       if (TSDB_DATA_TYPE_NULL == valueNode->node.resType.type || valueNode->isNull) {
         colDataSetNULL(param->columnData, 0);
       } else {
@@ -377,7 +380,7 @@ int32_t sclInitParam(SNode *node, SScalarParam *param, SScalarCtx *ctx, int32_t
         taosHashCleanup(param->pHashFilter);
         param->pHashFilter = NULL;
         sclError("taosHashPut nodeList failed, size:%d", (int32_t)sizeof(*param));
-        return TSDB_CODE_OUT_OF_MEMORY;
+        return terrno;
       }
       param->colAlloced = false;
       break;
@@ -393,6 +396,9 @@ int32_t sclInitParam(SNode *node, SScalarParam *param, SScalarCtx *ctx, int32_t
       int32_t index = -1;
       for (int32_t i = 0; i < taosArrayGetSize(ctx->pBlockList); ++i) {
         SSDataBlock *pb = taosArrayGetP(ctx->pBlockList, i);
+        if (NULL == pb) {
+          SCL_ERR_RET(TSDB_CODE_OUT_OF_RANGE);
+        }
         if (pb->info.id.blockId == ref->dataBlockId) {
           index = i;
           break;
@@ -461,6 +467,9 @@ int32_t sclInitParamList(SScalarParam **pParams, SNodeList *pParamList, SScalarC
   if (NULL == pParamList) {
     if (ctx->pBlockList) {
       SSDataBlock *pBlock = taosArrayGetP(ctx->pBlockList, 0);
+      if (NULL == pBlock) {
+        SCL_ERR_RET(TSDB_CODE_OUT_OF_RANGE);
+      }
       *rowNum = pBlock->info.rows;
     } else {
       *rowNum = 1;
@@ -919,6 +928,9 @@ int32_t sclExecCaseWhen(SCaseWhenNode *node, SScalarCtx *ctx, SScalarParam *outp
 
   if (ctx->pBlockList) {
     SSDataBlock *pb = taosArrayGetP(ctx->pBlockList, 0);
+    if (NULL == pb) {
+      SCL_ERR_RET(TSDB_CODE_OUT_OF_RANGE);
+    }
     rowNum = pb->info.rows;
     output->numOfRows = pb->info.rows;
   }
@@ -1532,6 +1544,10 @@ EDealRes sclWalkTarget(SNode *pNode, SScalarCtx *ctx) {
   int32_t index = -1;
   for (int32_t i = 0; i < taosArrayGetSize(ctx->pBlockList); ++i) {
     SSDataBlock *pb = taosArrayGetP(ctx->pBlockList, i);
+    if (NULL == pb) {
+      ctx->code = TSDB_CODE_OUT_OF_RANGE;
+      return DEAL_RES_ERROR;
+    }
     if (pb->info.id.blockId == target->dataBlockId) {
       index = i;
       break;
@@ -1636,7 +1652,7 @@ int32_t sclCalcConstants(SNode *pNode, bool dual, SNode **pRes) {
   ctx.pRes = taosHashInit(SCL_DEFAULT_OP_NUM, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
   if (NULL == ctx.pRes) {
     sclError("taosHashInit failed, num:%d", SCL_DEFAULT_OP_NUM);
-    SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY);
+    SCL_ERR_RET(terrno);
   }
 
   nodesRewriteExprPostOrder(&pNode, sclConstantsRewriter, (void *)&ctx);
@@ -1770,7 +1786,7 @@ int32_t scalarCalculate(SNode *pNode, SArray *pBlockList, SScalarParam *pDst) {
   ctx.pRes = taosHashInit(SCL_DEFAULT_OP_NUM, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
   if (NULL == ctx.pRes) {
     sclError("taosHashInit failed, num:%d", SCL_DEFAULT_OP_NUM);
-    SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY);
+    SCL_ERR_RET(terrno);
   }
 
   nodesWalkExprPostOrder(pNode, sclCalcWalker, (void *)&ctx);
@@ -1784,6 +1800,9 @@ int32_t scalarCalculate(SNode *pNode, SArray *pBlockList, SScalarParam *pDst) {
     }
 
     SSDataBlock *pb = taosArrayGetP(pBlockList, 0);
+    if (NULL == pb) {
+      SCL_ERR_JRET(TSDB_CODE_OUT_OF_RANGE);
+    }
     if (1 == res->numOfRows && pb->info.rows > 0) {
       SCL_ERR_JRET(sclExtendResRows(pDst, res, pBlockList));
     } else {

source/libs/scalar/src/sclfunc.c

@@ -399,7 +399,7 @@ static int32_t concatCopyHelper(const char *input, char *output, bool hasNchar,
     bool    ret = taosMbsToUcs4(varDataVal(input), len, newBuf, (varDataLen(input) + 1) * TSDB_NCHAR_SIZE, &len);
     if (!ret) {
       taosMemoryFree(newBuf);
-      return TSDB_CODE_FAILED;
+      return TSDB_CODE_SCALAR_CONVERT_ERROR;
     }
     memcpy(varDataVal(output) + *dataLen, newBuf, varDataLen(input) * TSDB_NCHAR_SIZE);
     *dataLen += varDataLen(input) * TSDB_NCHAR_SIZE;
@@ -818,7 +818,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
         } else if (inputType == TSDB_DATA_TYPE_NCHAR) {
           int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(input), varDataLen(input), convBuf);
           if (len < 0) {
-            code = TSDB_CODE_FAILED;
+            code = TSDB_CODE_SCALAR_CONVERT_ERROR;
             goto _end;
           }
 
@@ -837,7 +837,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
         } else if (inputType == TSDB_DATA_TYPE_NCHAR) {
           int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(input), varDataLen(input), convBuf);
           if (len < 0) {
-            code = TSDB_CODE_FAILED;
+            code = TSDB_CODE_SCALAR_CONVERT_ERROR;
             goto _end;
           }
           convBuf[len] = 0;
@@ -855,7 +855,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
         } else if (inputType == TSDB_DATA_TYPE_NCHAR) {
           int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(input), varDataLen(input), convBuf);
           if (len < 0) {
-            code = TSDB_CODE_FAILED;
+            code = TSDB_CODE_SCALAR_CONVERT_ERROR;
             goto _end;
           }
 
@@ -874,7 +874,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
         } else if (inputType == TSDB_DATA_TYPE_NCHAR) {
           int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(input), varDataLen(input), convBuf);
           if (len < 0) {
-            code = TSDB_CODE_FAILED;
+            code = TSDB_CODE_SCALAR_CONVERT_ERROR;
             goto _end;
           }
           convBuf[len] = 0;
@@ -892,7 +892,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
         } else if (inputType == TSDB_DATA_TYPE_NCHAR) {
           int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(input), varDataLen(input), convBuf);
           if (len < 0) {
-            code = TSDB_CODE_FAILED;
+            code = TSDB_CODE_SCALAR_CONVERT_ERROR;
             goto _end;
           }
           convBuf[len] = 0;
@@ -910,7 +910,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
         } else if (inputType == TSDB_DATA_TYPE_NCHAR) {
           int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(input), varDataLen(input), convBuf);
           if (len < 0) {
-            code = TSDB_CODE_FAILED;
+            code = TSDB_CODE_SCALAR_CONVERT_ERROR;
             goto _end;
           }
           convBuf[len] = 0;
@@ -928,7 +928,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
         } else if (inputType == TSDB_DATA_TYPE_NCHAR) {
           int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(input), varDataLen(input), convBuf);
           if (len < 0) {
-            code = TSDB_CODE_FAILED;
+            code = TSDB_CODE_SCALAR_CONVERT_ERROR;
             goto _end;
           }
           convBuf[len] = 0;
@@ -946,7 +946,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
         } else if (inputType == TSDB_DATA_TYPE_NCHAR) {
           int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(input), varDataLen(input), convBuf);
           if (len < 0) {
-            code = TSDB_CODE_FAILED;
+            code = TSDB_CODE_SCALAR_CONVERT_ERROR;
             goto _end;
           }
 
@@ -965,7 +965,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
         } else if (inputType == TSDB_DATA_TYPE_NCHAR) {
           int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(input), varDataLen(input), convBuf);
           if (len < 0) {
-            code = TSDB_CODE_FAILED;
+            code = TSDB_CODE_SCALAR_CONVERT_ERROR;
             goto _end;
           }
           convBuf[len] = 0;
@@ -983,7 +983,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
         } else if (inputType == TSDB_DATA_TYPE_NCHAR) {
           int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(input), varDataLen(input), convBuf);
           if (len < 0) {
-            code = TSDB_CODE_FAILED;
+            code = TSDB_CODE_SCALAR_CONVERT_ERROR;
             goto _end;
           }
           convBuf[len] = 0;
@@ -1001,7 +1001,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
         } else if (inputType == TSDB_DATA_TYPE_NCHAR) {
           int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(input), varDataLen(input), convBuf);
           if (len < 0) {
-            code = TSDB_CODE_FAILED;
+            code = TSDB_CODE_SCALAR_CONVERT_ERROR;
             goto _end;
           }
           convBuf[len] = 0;
@@ -1041,7 +1041,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
         } else if (inputType == TSDB_DATA_TYPE_NCHAR) {
           int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(input), varDataLen(input), convBuf);
           if (len < 0) {
-            code = TSDB_CODE_FAILED;
+            code = TSDB_CODE_SCALAR_CONVERT_ERROR;
             goto _end;
           }
           len = TMIN(len, outputLen - VARSTR_HEADER_SIZE);
@@ -1075,7 +1075,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
           len = sprintf(tmp, "%.*s", outputCharLen, *(int8_t *)input ? "true" : "false");
           bool ret = taosMbsToUcs4(tmp, len, (TdUcs4 *)varDataVal(output), outputLen - VARSTR_HEADER_SIZE, &len);
           if (!ret) {
-            code = TSDB_CODE_FAILED;
+            code = TSDB_CODE_SCALAR_CONVERT_ERROR;
             goto _end;
           }
 
@@ -1085,7 +1085,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
           bool ret = taosMbsToUcs4(input + VARSTR_HEADER_SIZE, len, (TdUcs4 *)varDataVal(output),
                                    outputLen - VARSTR_HEADER_SIZE, &len);
           if (!ret) {
-            code = TSDB_CODE_FAILED;
+            code = TSDB_CODE_SCALAR_CONVERT_ERROR;
             goto _end;
           }
           varDataSetLen(output, len);
@@ -1099,7 +1099,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
           len = outputCharLen > len ? len : outputCharLen;
           bool ret = taosMbsToUcs4(buf, len, (TdUcs4 *)varDataVal(output), outputLen - VARSTR_HEADER_SIZE, &len);
           if (!ret) {
-            code = TSDB_CODE_FAILED;
+            code = TSDB_CODE_SCALAR_CONVERT_ERROR;
             goto _end;
           }
           varDataSetLen(output, len);

source/libs/scalar/src/sclvector.c

@@ -105,7 +105,7 @@ int32_t convertNcharToDouble(const void *inData, void *outData) {
   int   len = taosUcs4ToMbs((TdUcs4 *)varDataVal(inData), varDataLen(inData), tmp);
   if (len < 0) {
     sclError("castConvert taosUcs4ToMbs error 1");
-    SCL_ERR_JRET(TSDB_CODE_FAILED);
+    SCL_ERR_JRET(TSDB_CODE_SCALAR_CONVERT_ERROR);
   }
 
   tmp[len] = 0;
@@ -596,7 +596,7 @@ int32_t ncharTobinary(void *buf, void **out) {  // todo need to remove , if tobi
     sclError("charset:%s to %s. val:%s convert ncharTobinary failed.", DEFAULT_UNICODE_ENCODEC, tsCharset,
              (char *)varDataVal(buf));
     taosMemoryFree(*out);
-    SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY);
+    SCL_ERR_RET(TSDB_CODE_SCALAR_CONVERT_ERROR);
   }
   varDataSetLen(*out, len);
   SCL_RET(TSDB_CODE_SUCCESS);

source/libs/stream/src/streamMsg.c

@@ -549,7 +549,7 @@ int32_t tEncodeStreamTask(SEncoder* pEncoder, const SStreamTask* pTask) {
   if (tEncodeCStrWithLen(pEncoder, pTask->reserve, sizeof(pTask->reserve) - 1) < 0) return -1;
 
   tEndEncode(pEncoder);
-  return pEncoder->pos;
+  return 0;
 }
 
 int32_t tDecodeStreamTask(SDecoder* pDecoder, SStreamTask* pTask) {

source/libs/sync/src/syncRaftLog.c

@@ -206,17 +206,17 @@ static int32_t raftLogAppendEntry(struct SSyncLogStore* pLogStore, SSyncRaftEntr
   SSyncLogStoreData* pData = pLogStore->data;
   SWal*              pWal = pData->pWal;
 
-  SyncIndex    index = 0;
   SWalSyncInfo syncMeta = {0};
   syncMeta.isWeek = pEntry->isWeak;
   syncMeta.seqNum = pEntry->seqNum;
   syncMeta.term = pEntry->term;
+
   int64_t tsWriteBegin = taosGetTimestampNs();
-  index = walAppendLog(pWal, pEntry->index, pEntry->originalRpcType, syncMeta, pEntry->data, pEntry->dataLen);
+  int32_t code = walAppendLog(pWal, pEntry->index, pEntry->originalRpcType, syncMeta, pEntry->data, pEntry->dataLen);
   int64_t tsWriteEnd = taosGetTimestampNs();
   int64_t tsElapsed = tsWriteEnd - tsWriteBegin;
 
-  if (index < 0) {
+  if (TSDB_CODE_SUCCESS != code) {
     int32_t     err = terrno;
     const char* errStr = tstrerror(err);
     int32_t     sysErr = errno;
@@ -227,9 +227,11 @@ static int32_t raftLogAppendEntry(struct SSyncLogStore* pLogStore, SSyncRaftEntr
     return -1;
   }
 
-  ASSERT(pEntry->index == index);
+  code = walFsync(pWal, forceSync);
-
+  if (TSDB_CODE_SUCCESS != code) {
-  walFsync(pWal, forceSync);
+    sNError(pData->pSyncNode, "wal fsync failed since %s", tstrerror(code));
+    TAOS_RETURN(code);
+  }
 
   sNTrace(pData->pSyncNode, "write index:%" PRId64 ", type:%s, origin type:%s, elapsed:%" PRId64, pEntry->index,
           TMSG_INFO(pEntry->msgType), TMSG_INFO(pEntry->originalRpcType), tsElapsed);

source/libs/sync/src/syncUtil.c

@@ -43,17 +43,16 @@ void syncUtilNodeInfo2EpSet(const SNodeInfo* pInfo, SEpSet* pEpSet) {
 
 bool syncUtilNodeInfo2RaftId(const SNodeInfo* pInfo, SyncGroupId vgId, SRaftId* raftId) {
   uint32_t ipv4 = 0xFFFFFFFF;
-  sDebug("vgId:%d, start to resolve sync addr fqdn in %d seconds, "
+  sDebug(
+      "vgId:%d, start to resolve sync addr fqdn in %d seconds, "
       "dnode:%d cluster:%" PRId64 " fqdn:%s port:%u ",
-        vgId, tsResolveFQDNRetryTime,
+      vgId, tsResolveFQDNRetryTime, pInfo->nodeId, pInfo->clusterId, pInfo->nodeFqdn, pInfo->nodePort);
-        pInfo->nodeId, pInfo->clusterId, pInfo->nodeFqdn, pInfo->nodePort);
+  for (int i = 0; i < tsResolveFQDNRetryTime; i++) {
-  for(int i = 0; i < tsResolveFQDNRetryTime; i++){
     ipv4 = taosGetIpv4FromFqdn(pInfo->nodeFqdn);
     if (ipv4 == 0xFFFFFFFF || ipv4 == 1) {
       sError("failed to resolve ipv4 addr, fqdn:%s, wait one second", pInfo->nodeFqdn);
       taosSsleep(1);
-    }
+    } else {
-    else{
       break;
     }
   }
@@ -501,8 +500,7 @@ void syncLogSendRequestVoteReply(SSyncNode* pSyncNode, const SyncRequestVoteRepl
 int32_t syncSnapInfoDataRealloc(SSnapshot* pSnap, int32_t size) {
   void* data = taosMemoryRealloc(pSnap->data, size);
   if (data == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return -1;
   }
   pSnap->data = data;
   return 0;