refactor: remove the invalid return value.

include/common/tmsgcb.h

@@ -17,13 +17,13 @@
 #define _TD_COMMON_MSG_CB_H_
 
 #include "os.h"
+#include "tmsg.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef struct SRpcMsg        SRpcMsg;
-typedef struct SEpSet         SEpSet;
 typedef struct SMgmtWrapper   SMgmtWrapper;
 typedef struct SRpcHandleInfo SRpcHandleInfo;
 
@@ -46,7 +46,7 @@ typedef int32_t (*PutToQueueFp)(void* pMgmt, EQueueType qtype, SRpcMsg* pMsg);
 typedef int32_t (*GetQueueSizeFp)(void* pMgmt, int32_t vgId, EQueueType qtype);
 typedef int32_t (*SendReqFp)(const SEpSet* pEpSet, SRpcMsg* pMsg);
 typedef void (*SendRspFp)(SRpcMsg* pMsg);
-typedef void (*RegisterBrokenLinkArgFp)(SRpcMsg* pMsg);
+typedef void (*RegisterBrokenLinkArgFp)(struct SRpcMsg* pMsg);
 typedef void (*ReleaseHandleFp)(SRpcHandleInfo* pHandle, int8_t type);
 typedef void (*ReportStartup)(const char* name, const char* desc);
 

include/libs/executor/storageapi.h

@@ -105,7 +105,7 @@ typedef struct SMTbCursor {
 } SMTbCursor;
 
 typedef struct SMCtbCursor {
-  SMeta*   pMeta;
+  struct SMeta*   pMeta;
   void*    pCur;
   tb_uid_t suid;
   void*    pKey;
@@ -134,7 +134,7 @@ typedef struct SMetaTableInfo {
 } SMetaTableInfo;
 
 typedef struct SSnapContext {
-  SMeta*    pMeta;
+  struct SMeta* pMeta;
   int64_t   snapVersion;
   void*     pCur;
   int64_t   suid;
@@ -178,7 +178,7 @@ typedef struct TsdReader {
   int32_t      (*tsdNextDataBlock)();
 
   int32_t      (*tsdReaderRetrieveBlockSMAInfo)();
-  SSDataBlock *(*tsdReaderRetrieveDataBlock)();
+  int32_t      (*tsdReaderRetrieveDataBlock)();
 
   void         (*tsdReaderReleaseDataBlock)();
 

include/libs/sync/sync.h

@@ -70,7 +70,6 @@ typedef int64_t  SyncIndex;
 typedef int64_t  SyncTerm;
 
 typedef struct SSyncNode      SSyncNode;
-typedef struct SWal           SWal;
 typedef struct SSyncRaftEntry SSyncRaftEntry;
 
 typedef enum {
@@ -238,7 +237,7 @@ typedef struct SSyncInfo {
   int32_t       batchSize;
   SSyncCfg      syncCfg;
   char          path[TSDB_FILENAME_LEN];
-  SWal*         pWal;
+  struct SWal*  pWal;
   SSyncFSM*     pFsm;
   SMsgCb*       msgcb;
   int32_t       pingMs;

source/dnode/vnode/inc/vnode.h

@@ -167,7 +167,7 @@ void         tsdbReaderClose2(STsdbReader *pReader);
 int32_t      tsdbNextDataBlock2(STsdbReader *pReader, bool *hasNext);
 int32_t      tsdbRetrieveDatablockSMA2(STsdbReader *pReader, SSDataBlock *pDataBlock, bool *allHave, bool *hasNullSMA);
 void         tsdbReleaseDataBlock2(STsdbReader *pReader);
-SSDataBlock *tsdbRetrieveDataBlock2(STsdbReader *pTsdbReadHandle, SArray *pColumnIdList);
+int32_t      tsdbRetrieveDataBlock2(STsdbReader *pReader, SSDataBlock **pBlock, SArray *pIdList);
 int32_t      tsdbReaderReset2(STsdbReader *pReader, SQueryTableDataCond *pCond);
 int32_t      tsdbGetFileBlocksDistInfo2(STsdbReader *pReader, STableBlockDistInfo *pTableBlockInfo);
 int64_t      tsdbGetNumOfRowsInMemTable2(STsdbReader *pHandle);

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

@@ -54,7 +54,6 @@ extern "C" {
 #endif
 
 typedef struct SVnodeInfo         SVnodeInfo;
-typedef struct SMeta              SMeta;
 typedef struct SSma               SSma;
 typedef struct STsdb              STsdb;
 typedef struct STQ                STQ;
@@ -153,7 +152,6 @@ int32_t vnodeBufPoolRegisterQuery(SVBufPool* pPool, SQueryNode* pQNode);
 void    vnodeBufPoolDeregisterQuery(SVBufPool* pPool, SQueryNode* pQNode, bool proactive);
 
 // meta
-typedef struct SMCtbCursor SMCtbCursor;
 typedef struct SMStbCursor SMStbCursor;
 typedef struct STbUidStore STbUidStore;
 

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

@@ -3212,7 +3212,10 @@ static int32_t nextRowIterOpen(CacheNextRowIter *pIter, tb_uid_t uid, STsdb *pTs
 
   pIter->pMemDelData = NULL;
 
-  loadMemTombData(&pIter->pMemDelData, pMem, pIMem, pr->info.verRange.maxVer);
+  code = loadMemTombData(&pIter->pMemDelData, pMem, pIMem, pr->info.verRange.maxVer);
+  if (code != TSDB_CODE_SUCCESS) {
+    goto _err;
+  }
 
   pIter->idx = (SBlockIdx){.suid = suid, .uid = uid};
 

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

@@ -842,9 +842,12 @@ int32_t loadSttTombDataForAll(STsdbReader* pReader, SSttFileReader* pSttFileRead
   return doLoadTombDataFromTombBlk(pBlkArray, pReader, pSttFileReader, false);
 }
 
-void loadMemTombData(SArray** ppMemDelData, STbData* pMemTbData, STbData* piMemTbData, int64_t ver) {
+int32_t loadMemTombData(SArray** ppMemDelData, STbData* pMemTbData, STbData* piMemTbData, int64_t ver) {
   if (*ppMemDelData == NULL) {
     *ppMemDelData = taosArrayInit(4, sizeof(SDelData));
+    if (*ppMemDelData == NULL) {
+      return TSDB_CODE_SUCCESS;
+    }
   }
 
   SArray* pMemDelData = *ppMemDelData;
@@ -872,6 +875,8 @@ void loadMemTombData(SArray** ppMemDelData, STbData* pMemTbData, STbData* piMemT
       p = p->pNext;
     }
   }
+
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t getNumOfRowsInSttBlock(SSttFileReader* pSttFileReader, SSttBlockLoadInfo* pBlockLoadInfo,

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

@@ -339,7 +339,7 @@ int32_t initBlockIterator(STsdbReader* pReader, SDataBlockIter* pBlockIter, int3
 bool    blockIteratorNext(SDataBlockIter* pBlockIter, const char* idStr);
 
 // load tomb data API (stt/mem only for one table each, tomb data from data files are load for all tables at one time)
-void    loadMemTombData(SArray** ppMemDelData, STbData* pMemTbData, STbData* piMemTbData, int64_t ver);
+int32_t loadMemTombData(SArray** ppMemDelData, STbData* pMemTbData, STbData* piMemTbData, int64_t ver);
 int32_t loadDataFileTombDataForAll(STsdbReader* pReader);
 int32_t loadSttTombDataForAll(STsdbReader* pReader, SSttFileReader* pSttFileReader, SSttBlockLoadInfo* pLoadInfo);
 int32_t getNumOfRowsInSttBlock(SSttFileReader* pSttFileReader, SSttBlockLoadInfo* pBlockLoadInfo,

source/libs/executor/src/scanoperator.c

@@ -388,9 +388,10 @@ static int32_t loadDataBlock(SOperatorInfo* pOperator, STableScanBase* pTableSca
   pCost->totalCheckedRows += pBlock->info.rows;
   pCost->loadBlocks += 1;
 
-  SSDataBlock* p = pAPI->tsdReader.tsdReaderRetrieveDataBlock(pTableScanInfo->dataReader, NULL);
+  SSDataBlock* p = NULL;
-  if (p == NULL) {
+  int32_t code = pAPI->tsdReader.tsdReaderRetrieveDataBlock(pTableScanInfo->dataReader, &p, NULL);
-    return terrno;
+  if (p == NULL || code != TSDB_CODE_SUCCESS) {
+    return code;
   }
 
   ASSERT(p == pBlock);
@@ -1351,7 +1352,12 @@ static SSDataBlock* readPreVersionData(SOperatorInfo* pTableScanOp, uint64_t tbU
   }
 
   if (hasNext) {
-    /*SSDataBlock* p = */ pAPI->tsdReader.tsdReaderRetrieveDataBlock(pReader, NULL);
+    SSDataBlock* p = NULL;
+    code = pAPI->tsdReader.tsdReaderRetrieveDataBlock(pReader, &p, NULL);
+    if (code != TSDB_CODE_SUCCESS) {
+      return NULL;
+    }
+
     doSetTagColumnData(&pTableScanInfo->base, pBlock, pTaskInfo, pBlock->info.rows);
     pBlock->info.id.groupId = tableListGetTableGroupId(pTableScanInfo->base.pTableListInfo, pBlock->info.id.uid);
   }
@@ -2929,8 +2935,9 @@ static SSDataBlock* doRawScan(SOperatorInfo* pOperator) {
         T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
       }
 
-      SSDataBlock* pBlock = pAPI->tsdReader.tsdReaderRetrieveDataBlock(pInfo->dataReader, NULL);
+      SSDataBlock* pBlock = NULL;
-      if (pBlock == NULL) {
+      code = pAPI->tsdReader.tsdReaderRetrieveDataBlock(pInfo->dataReader, &pBlock, NULL);
+      if (pBlock == NULL || code != TSDB_CODE_SUCCESS) {
         T_LONG_JMP(pTaskInfo->env, terrno);
       }
 

source/libs/sync/inc/syncInt.h

@@ -74,16 +74,16 @@ typedef struct SRaftStore {
   TdThreadMutex mutex;
 } SRaftStore;
 
-typedef struct SSyncHbTimerData {
+struct SSyncHbTimerData {
   int64_t     syncNodeRid;
   SSyncTimer* pTimer;
   SRaftId     destId;
   uint64_t    logicClock;
   int64_t     execTime;
   int64_t     rid;
-} SSyncHbTimerData;
+};
 
-typedef struct SSyncTimer {
+struct SSyncTimer {
   void*             pTimer;
   TAOS_TMR_CALLBACK timerCb;
   uint64_t          logicClock;
@@ -92,7 +92,7 @@ typedef struct SSyncTimer {
   int64_t           timeStamp;
   SRaftId           destId;
   int64_t           hbDataRid;
-} SSyncTimer;
+};
 
 typedef struct SElectTimerParam {
   uint64_t   logicClock;
@@ -106,7 +106,7 @@ typedef struct SPeerState {
   int64_t   lastSendTime;
 } SPeerState;
 
-typedef struct SSyncNode {
+struct SSyncNode {
   // init by SSyncInfo
   SyncGroupId vgId;
   SRaftCfg    raftCfg;
@@ -116,7 +116,7 @@ typedef struct SSyncNode {
 
   // sync io
   SSyncLogBuffer* pLogBuf;
-  SWal*           pWal;
+  struct SWal*    pWal;
   const SMsgCb*   msgcb;
   int32_t (*syncSendMSg)(const SEpSet* pEpSet, SRpcMsg* pMsg);
   int32_t (*syncEqMsg)(const SMsgCb* msgcb, SRpcMsg* pMsg);
@@ -234,7 +234,7 @@ typedef struct SSyncNode {
 
   bool isStart;
 
-} SSyncNode;
+};
 
 // open/close --------------
 SSyncNode* syncNodeOpen(SSyncInfo* pSyncInfo, int32_t vnodeVersion);

source/libs/transport/inc/transComm.h

@@ -103,7 +103,7 @@ typedef void* queue[2];
 #define TRANS_MAGIC_NUM           0x5f375a86
 #define TRANS_NOVALID_PACKET(src) ((src) != TRANS_MAGIC_NUM ? 1 : 0)
 
-typedef SRpcMsg      STransMsg;
+typedef struct SRpcMsg      STransMsg;
 typedef SRpcCtx      STransCtx;
 typedef SRpcCtxVal   STransCtxVal;
 typedef SRpcInfo     STrans;