From 99ac957290b2fae3c91ff29f8d2a4b6298dea56f Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 24 Jul 2024 18:28:11 +0800
Subject: [PATCH] fix:[TD-31017]process return value in vnode for tmq

---
 source/dnode/vnode/src/inc/vnodeInt.h      |  2 +-
 source/dnode/vnode/src/tq/tqSnapshot.c     | 30 ++++++++++------------
 source/dnode/vnode/src/vnd/vnodeSnapshot.c |  9 +++----
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h
index 6bcacdf66f..c45d6e6edf 100644
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@@ -345,7 +345,7 @@ int32_t tsdbSnapRAWWriterPrepareClose(STsdbSnapRAWWriter* pWriter);
 int32_t tsdbSnapRAWWriterClose(STsdbSnapRAWWriter** ppWriter, int8_t rollback);
 // STqSnapshotReader ==
 int32_t tqSnapReaderOpen(STQ* pTq, int64_t sver, int64_t ever, int8_t type, STqSnapReader** ppReader);
-int32_t tqSnapReaderClose(STqSnapReader** ppReader);
+void    tqSnapReaderClose(STqSnapReader** ppReader);
 int32_t tqSnapRead(STqSnapReader* pReader, uint8_t** ppData);
 // STqSnapshotWriter ======================================
 int32_t tqSnapWriterOpen(STQ* pTq, int64_t sver, int64_t ever, STqSnapWriter** ppWriter);
diff --git a/source/dnode/vnode/src/tq/tqSnapshot.c b/source/dnode/vnode/src/tq/tqSnapshot.c
index 1731759dae..1abc94f653 100644
--- a/source/dnode/vnode/src/tq/tqSnapshot.c
+++ b/source/dnode/vnode/src/tq/tqSnapshot.c
@@ -76,14 +76,10 @@ _err:
   return code;
 }
 
-int32_t tqSnapReaderClose(STqSnapReader** ppReader) {
-  int32_t code = 0;
-
-  tdbTbcClose((*ppReader)->pCur);
+void tqSnapReaderClose(STqSnapReader** ppReader) {
+  (void)tdbTbcClose((*ppReader)->pCur);
   taosMemoryFree(*ppReader);
   *ppReader = NULL;
-
-  return code;
 }
 
 int32_t tqSnapRead(STqSnapReader* pReader, uint8_t** ppData) {
@@ -99,14 +95,14 @@ int32_t tqSnapRead(STqSnapReader* pReader, uint8_t** ppData) {
 
   *ppData = taosMemoryMalloc(sizeof(SSnapDataHdr) + vLen);
   if (*ppData == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    code = TAOS_GET_TERRNO(TSDB_CODE_OUT_OF_MEMORY);
     goto _err;
   }
 
   SSnapDataHdr* pHdr = (SSnapDataHdr*)(*ppData);
   pHdr->type = pReader->type;
   pHdr->size = vLen;
-  memcpy(pHdr->data, pVal, vLen);
+  (void)memcpy(pHdr->data, pVal, vLen);
 
 _exit:
   tdbFree(pKey);
@@ -131,20 +127,20 @@ struct STqSnapWriter {
 
 int32_t tqSnapWriterOpen(STQ* pTq, int64_t sver, int64_t ever, STqSnapWriter** ppWriter) {
   int32_t        code = 0;
-  STqSnapWriter* pWriter;
+  STqSnapWriter* pWriter = NULL;
 
   // alloc
   pWriter = (STqSnapWriter*)taosMemoryCalloc(1, sizeof(*pWriter));
   if (pWriter == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    code = TAOS_GET_TERRNO(TSDB_CODE_OUT_OF_MEMORY);;
     goto _err;
   }
   pWriter->pTq = pTq;
   pWriter->sver = sver;
   pWriter->ever = ever;
 
-  if (tdbBegin(pTq->pMetaDB, &pWriter->txn, tdbDefaultMalloc, tdbDefaultFree, NULL, 0) < 0) {
-    code = -1;
+  code = tdbBegin(pTq->pMetaDB, &pWriter->txn, tdbDefaultMalloc, tdbDefaultFree, NULL, 0);
+  if (code < 0) {
     taosMemoryFree(pWriter);
     goto _err;
   }
@@ -164,7 +160,7 @@ int32_t tqSnapWriterClose(STqSnapWriter** ppWriter, int8_t rollback) {
   STQ*           pTq = pWriter->pTq;
 
   if (rollback) {
-    tdbAbort(pWriter->pTq->pMetaDB, pWriter->txn);
+    (void)tdbAbort(pWriter->pTq->pMetaDB, pWriter->txn);
   } else {
     code = tdbCommit(pWriter->pTq->pMetaDB, pWriter->txn);
     if (code) goto _err;
@@ -207,7 +203,8 @@ int32_t tqSnapCheckInfoWrite(STqSnapWriter* pWriter, uint8_t* pData, uint32_t nD
   int32_t   code = 0;
   STQ*      pTq = pWriter->pTq;
   STqCheckInfo info = {0};
-  if(tqMetaDecodeCheckInfo(&info, pData + sizeof(SSnapDataHdr), nData - sizeof(SSnapDataHdr)) != 0){
+  code = tqMetaDecodeCheckInfo(&info, pData + sizeof(SSnapDataHdr), nData - sizeof(SSnapDataHdr));
+  if(code != 0){
     goto _err;
   }
 
@@ -217,7 +214,7 @@ int32_t tqSnapCheckInfoWrite(STqSnapWriter* pWriter, uint8_t* pData, uint32_t nD
 
   return code;
 
-  _err:
+_err:
   tqError("vgId:%d, vnode check info tq write failed since %s", TD_VID(pTq->pVnode), tstrerror(code));
   return code;
 }
@@ -227,7 +224,8 @@ int32_t tqSnapOffsetWrite(STqSnapWriter* pWriter, uint8_t* pData, uint32_t nData
   STQ*      pTq = pWriter->pTq;
 
   STqOffset info = {0};
-  if(tqMetaDecodeOffsetInfo(&info, pData + sizeof(SSnapDataHdr), nData - sizeof(SSnapDataHdr)) != 0){
+  code = tqMetaDecodeOffsetInfo(&info, pData + sizeof(SSnapDataHdr), nData - sizeof(SSnapDataHdr));
+  if(code != 0){
     goto _err;
   }
 
diff --git a/source/dnode/vnode/src/vnd/vnodeSnapshot.c b/source/dnode/vnode/src/vnd/vnodeSnapshot.c
index 046f12f9e7..f30b2f2ada 100644
--- a/source/dnode/vnode/src/vnd/vnodeSnapshot.c
+++ b/source/dnode/vnode/src/vnd/vnodeSnapshot.c
@@ -370,8 +370,7 @@ int32_t vnodeSnapRead(SVSnapReader *pReader, uint8_t **ppData, uint32_t *nData)
       goto _exit;
     } else {
       pReader->tqHandleDone = 1;
-      code = tqSnapReaderClose(&pReader->pTqSnapReader);
-      TSDB_CHECK_CODE(code, lino, _exit);
+      tqSnapReaderClose(&pReader->pTqSnapReader);
     }
   }
   if (!pReader->tqCheckInfoDone) {
@@ -387,8 +386,7 @@ int32_t vnodeSnapRead(SVSnapReader *pReader, uint8_t **ppData, uint32_t *nData)
       goto _exit;
     } else {
       pReader->tqCheckInfoDone = 1;
-      code = tqSnapReaderClose(&pReader->pTqCheckInfoReader);
-      TSDB_CHECK_CODE(code, lino, _exit);
+      tqSnapReaderClose(&pReader->pTqCheckInfoReader);
     }
   }
   if (!pReader->tqOffsetDone) {
@@ -404,8 +402,7 @@ int32_t vnodeSnapRead(SVSnapReader *pReader, uint8_t **ppData, uint32_t *nData)
       goto _exit;
     } else {
       pReader->tqOffsetDone = 1;
-      code = tqSnapReaderClose(&pReader->pTqOffsetReader);
-      TSDB_CHECK_CODE(code, lino, _exit);
+      tqSnapReaderClose(&pReader->pTqOffsetReader);
     }
   }