Merge pull request #19385 from taosdata/fix/TD-21664

fix(meta): cleanup coverity scan issues

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

@@ -563,13 +563,13 @@ int32_t metaUidFilterCachePut(SMeta* pMeta, uint64_t suid, const void* pKey, int
   }
 
   // add to cache.
-  taosLRUCacheInsert(pCache, buf, sizeof(uint64_t) + keyLen, pPayload, payloadLen, freePayload, NULL,
+  int32_t ret = taosLRUCacheInsert(pCache, buf, sizeof(uint64_t) + keyLen, pPayload, payloadLen, freePayload, NULL,
                                    TAOS_LRU_PRIORITY_LOW);
 
   taosThreadMutexUnlock(pLock);
 
-  metaDebug("vgId:%d, suid:%" PRIu64 " list cache added into cache, total:%d, tables:%d", TD_VID(pMeta->pVnode), suid,
-            (int32_t)taosLRUCacheGetUsage(pCache), taosHashGetSize(pTableEntry));
+  metaDebug("vgId:%d, suid:%" PRIu64 " list cache added into cache, total:%d, tables:%d, ret:%d", TD_VID(pMeta->pVnode),
+            suid, (int32_t)taosLRUCacheGetUsage(pCache), taosHashGetSize(pTableEntry), ret);
 
   return TSDB_CODE_SUCCESS;
 }

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

@@ -653,8 +653,10 @@ int32_t metaGetTbTSchemaEx(SMeta *pMeta, tb_uid_t suid, tb_uid_t uid, int32_t sv
       }
 
       if (c == 0) {
-        metaError("meta/query: incorrect c: %" PRId32 ".", c);
+        metaULock(pMeta);
+        tdbTbcClose(pSkmDbC);
         code = TSDB_CODE_FAILED;
+        metaError("meta/query: incorrect c: %" PRId32 ".", c);
         goto _exit;
       }
 

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

@@ -343,6 +343,10 @@ int metaAlterSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
   tdbTbcOpen(pMeta->pTbDb, &pTbDbc, NULL);
   ret = tdbTbcMoveTo(pTbDbc, &((STbDbKey){.uid = pReq->suid, .version = oversion}), sizeof(STbDbKey), &c);
   if (!(ret == 0 && c == 0)) {
+    tdbTbcClose(pUidIdxc);
+    tdbTbcClose(pTbDbc);
+
+    terrno = TSDB_CODE_TDB_STB_NOT_EXIST;
     metaError("meta/table: invalide ret: %" PRId32 " or c: %" PRId32 "alter stb failed.", ret, c);
     return -1;
   }
@@ -783,6 +787,7 @@ static int metaAlterTableColumn(SMeta *pMeta, int64_t version, SVAlterTbReq *pAl
   tdbTbcOpen(pMeta->pUidIdx, &pUidIdxc, NULL);
   tdbTbcMoveTo(pUidIdxc, &uid, sizeof(uid), &c);
   if (c != 0) {
+    tdbTbcClose(pUidIdxc);
     metaError("meta/table: invalide c: %" PRId32 " alt tb column failed.", c);
     return -1;
   }
@@ -796,6 +801,8 @@ static int metaAlterTableColumn(SMeta *pMeta, int64_t version, SVAlterTbReq *pAl
   tdbTbcOpen(pMeta->pTbDb, &pTbDbc, NULL);
   tdbTbcMoveTo(pTbDbc, &((STbDbKey){.uid = uid, .version = oversion}), sizeof(STbDbKey), &c);
   if (c != 0) {
+    tdbTbcClose(pUidIdxc);
+    tdbTbcClose(pTbDbc);
     metaError("meta/table: invalide c: %" PRId32 " alt tb column failed.", c);
     return -1;
   }
@@ -809,6 +816,8 @@ static int metaAlterTableColumn(SMeta *pMeta, int64_t version, SVAlterTbReq *pAl
   tDecoderInit(&dc, entry.pBuf, nData);
   ret = metaDecodeEntry(&dc, &entry);
   if (ret != 0) {
+    tdbTbcClose(pUidIdxc);
+    tdbTbcClose(pTbDbc);
     tDecoderClear(&dc);
     metaError("meta/table: invalide ret: %" PRId32 " alt tb column failed.", ret);
     return -1;
@@ -989,6 +998,8 @@ static int metaUpdateTableTagVal(SMeta *pMeta, int64_t version, SVAlterTbReq *pA
   tdbTbcOpen(pMeta->pUidIdx, &pUidIdxc, NULL);
   tdbTbcMoveTo(pUidIdxc, &uid, sizeof(uid), &c);
   if (c != 0) {
+    tdbTbcClose(pUidIdxc);
+    terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
     metaError("meta/table: invalide c: %" PRId32 " update tb tag val failed.", c);
     return -1;
   }
@@ -1005,6 +1016,9 @@ static int metaUpdateTableTagVal(SMeta *pMeta, int64_t version, SVAlterTbReq *pA
   tdbTbcOpen(pMeta->pTbDb, &pTbDbc, NULL);
   tdbTbcMoveTo(pTbDbc, &((STbDbKey){.uid = uid, .version = oversion}), sizeof(STbDbKey), &c);
   if (c != 0) {
+    tdbTbcClose(pUidIdxc);
+    tdbTbcClose(pTbDbc);
+    terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
     metaError("meta/table: invalide c: %" PRId32 " update tb tag val failed.", c);
     return -1;
   }
@@ -1166,6 +1180,7 @@ static int metaUpdateTableOptions(SMeta *pMeta, int64_t version, SVAlterTbReq *p
   tdbTbcOpen(pMeta->pUidIdx, &pUidIdxc, NULL);
   tdbTbcMoveTo(pUidIdxc, &uid, sizeof(uid), &c);
   if (c != 0) {
+    tdbTbcClose(pUidIdxc);
     metaError("meta/table: invalide c: %" PRId32 " update tb options failed.", c);
     return -1;
   }
@@ -1179,6 +1194,8 @@ static int metaUpdateTableOptions(SMeta *pMeta, int64_t version, SVAlterTbReq *p
   tdbTbcOpen(pMeta->pTbDb, &pTbDbc, NULL);
   tdbTbcMoveTo(pTbDbc, &((STbDbKey){.uid = uid, .version = oversion}), sizeof(STbDbKey), &c);
   if (c != 0) {
+    tdbTbcClose(pUidIdxc);
+    tdbTbcClose(pTbDbc);
     metaError("meta/table: invalide c: %" PRId32 " update tb options failed.", c);
     return -1;
   }

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

@@ -262,9 +262,10 @@ int vnodeDecodeConfig(const SJson *pJson, void *pObj) {
     tjsonGetNumberValue(info, "nodePort", pNode->nodePort, code);
     if (code < 0) return -1;
     tjsonGetStringValue(info, "nodeFqdn", pNode->nodeFqdn);
-    if (code < 0) return -1;
     tjsonGetNumberValue(info, "nodeId", pNode->nodeId, code);
+    if (code < 0) return -1;
     tjsonGetNumberValue(info, "clusterId", pNode->clusterId, code);
+    if (code < 0) return -1;
     vDebug("vgId:%d, decode config, replica:%d ep:%s:%u dnode:%d", pCfg->vgId, i, pNode->nodeFqdn, pNode->nodePort,
            pNode->nodeId);
   }

source/libs/tdb/src/db/tdbPager.c

@@ -731,8 +731,8 @@ static int tdbPagerInitPage(SPager *pPager, SPage *pPage, int (*initPage)(SPage
   int   ret;
   int   lcode;
   int   nLoops;
-  i64   nRead;
-  SPgno pgno;
+  i64   nRead = 0;
+  SPgno pgno = 0;
   int   init = 0;
 
   lcode = TDB_TRY_LOCK_PAGE(pPage);

source/os/src/osFile.c

@@ -439,6 +439,9 @@ int64_t taosWriteFile(TdFilePtr pFile, const void *buf, int64_t count) {
   taosThreadRwlockWrlock(&(pFile->rwlock));
 #endif
   if (pFile->fd < 0) {
+#if FILE_WITH_LOCK
+    taosThreadRwlockUnlock(&(pFile->rwlock));
+#endif
     return 0;
   }
 
@@ -543,7 +546,7 @@ int32_t taosFStatFile(TdFilePtr pFile, int64_t *size, int32_t *mtime) {
 
 int32_t taosLockFile(TdFilePtr pFile) {
   ASSERT(pFile->fd >= 0);  // Please check if you have closed the file.
-  if(pFile->fd < 0) {
+  if (pFile->fd < 0) {
     return -1;
   }
 #ifdef WINDOWS
@@ -570,7 +573,7 @@ int32_t taosLockFile(TdFilePtr pFile) {
 
 int32_t taosUnLockFile(TdFilePtr pFile) {
   ASSERT(pFile->fd >= 0);
-  if(pFile->fd < 0) {
+  if (pFile->fd < 0) {
     return 0;
   }
 #ifdef WINDOWS
@@ -592,7 +595,7 @@ int32_t taosFtruncateFile(TdFilePtr pFile, int64_t l_size) {
   if (pFile == NULL) {
     return 0;
   }
-  if(pFile->fd < 0) {
+  if (pFile->fd < 0) {
     printf("Ftruncate file error, fd arg was negative\n");
     return -1;
   }
@@ -669,7 +672,7 @@ int64_t taosFSendFile(TdFilePtr pFileOut, TdFilePtr pFileIn, int64_t *offset, in
     return 0;
   }
   ASSERT(pFileIn->fd >= 0 && pFileOut->fd >= 0);
-  if(pFileIn->fd < 0 || pFileOut->fd < 0) {
+  if (pFileIn->fd < 0 || pFileOut->fd < 0) {
     return 0;
   }
 
@@ -829,7 +832,7 @@ int32_t taosEOFFile(TdFilePtr pFile) {
     return -1;
   }
   ASSERT(pFile->fp != NULL);
-  if(pFile->fp == NULL) {
+  if (pFile->fp == NULL) {
     return -1;
   }