From 7b921b81d2eccaa6681e5fc0f0b2e6eb772152cf Mon Sep 17 00:00:00 2001 From: xiao-77 Date: Fri, 13 Dec 2024 17:48:51 +0800 Subject: [PATCH] Fix ci. --- source/dnode/mnode/impl/src/mndDnode.c | 16 ++++++++-------- source/dnode/mnode/impl/src/mndMnode.c | 2 +- source/dnode/mnode/impl/src/mndProfile.c | 8 ++++---- source/dnode/mnode/impl/src/mndQnode.c | 4 ++-- source/dnode/mnode/impl/src/mndStb.c | 8 ++++---- source/dnode/mnode/impl/src/mndStreamUtil.c | 4 ++-- source/dnode/mnode/impl/src/mndUser.c | 10 +++++----- source/dnode/mnode/impl/src/mndVgroup.c | 2 +- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndDnode.c b/source/dnode/mnode/impl/src/mndDnode.c index 6ce73dfaa1..ee009d2ad5 100644 --- a/source/dnode/mnode/impl/src/mndDnode.c +++ b/source/dnode/mnode/impl/src/mndDnode.c @@ -1060,18 +1060,18 @@ _OVER: static void getSlowLogScopeString(int32_t scope, char *result) { if (scope == SLOW_LOG_TYPE_NULL) { - strncat(result, "NONE", 64); + (void)strncat(result, "NONE", 64); return; } while (scope > 0) { if (scope & SLOW_LOG_TYPE_QUERY) { - strncat(result, "QUERY", 64); + (void)strncat(result, "QUERY", 64); scope &= ~SLOW_LOG_TYPE_QUERY; } else if (scope & SLOW_LOG_TYPE_INSERT) { - strncat(result, "INSERT", 64); + (void)strncat(result, "INSERT", 64); scope &= ~SLOW_LOG_TYPE_INSERT; } else if (scope & SLOW_LOG_TYPE_OTHERS) { - strncat(result, "OTHERS", 64); + (void)strncat(result, "OTHERS", 64); scope &= ~SLOW_LOG_TYPE_OTHERS; } else { (void)printf("invalid slow log scope:%d", scope); @@ -1079,7 +1079,7 @@ static void getSlowLogScopeString(int32_t scope, char *result) { } if (scope > 0) { - strncat(result, "|", 64); + (void)strncat(result, "|", 64); } } } @@ -1237,7 +1237,7 @@ static int32_t mndProcessCreateDnodeReq(SRpcMsg *pReq) { } char obj[200] = {0}; - tsnprintf(obj, sizeof(obj), "%s:%d", createReq.fqdn, createReq.port); + (void)tsnprintf(obj, sizeof(obj), "%s:%d", createReq.fqdn, createReq.port); auditRecord(pReq, pMnode->clusterId, "createDnode", "", obj, createReq.sql, createReq.sqlLen); @@ -1421,7 +1421,7 @@ static int32_t mndProcessDropDnodeReq(SRpcMsg *pReq) { if (code == 0) code = TSDB_CODE_ACTION_IN_PROGRESS; char obj1[30] = {0}; - tsnprintf(obj1, sizeof(obj1), "%d", dropReq.dnodeId); + (void)tsnprintf(obj1, sizeof(obj1), "%d", dropReq.dnodeId); auditRecord(pReq, pMnode->clusterId, "dropDnode", "", obj1, dropReq.sql, dropReq.sqlLen); @@ -1553,7 +1553,7 @@ static int32_t mndProcessConfigDnodeReq(SRpcMsg *pReq) { { // audit char obj[50] = {0}; - tsnprintf(obj, sizeof(obj), "%d", cfgReq.dnodeId); + (void)tsnprintf(obj, sizeof(obj), "%d", cfgReq.dnodeId); auditRecord(pReq, pMnode->clusterId, "alterDnode", obj, "", cfgReq.sql, cfgReq.sqlLen); } diff --git a/source/dnode/mnode/impl/src/mndMnode.c b/source/dnode/mnode/impl/src/mndMnode.c index a3ffcb0300..1f81e422c8 100644 --- a/source/dnode/mnode/impl/src/mndMnode.c +++ b/source/dnode/mnode/impl/src/mndMnode.c @@ -880,7 +880,7 @@ static int32_t mndProcessDropMnodeReq(SRpcMsg *pReq) { if (code == 0) code = TSDB_CODE_ACTION_IN_PROGRESS; char obj[40] = {0}; - tsnprintf(obj, sizeof(obj), "%d", dropReq.dnodeId); + (void)tsnprintf(obj, sizeof(obj), "%d", dropReq.dnodeId); auditRecord(pReq, pMnode->clusterId, "dropMnode", "", obj, dropReq.sql, dropReq.sqlLen); diff --git a/source/dnode/mnode/impl/src/mndProfile.c b/source/dnode/mnode/impl/src/mndProfile.c index 3d11d7be13..8fe36ca0c4 100644 --- a/source/dnode/mnode/impl/src/mndProfile.c +++ b/source/dnode/mnode/impl/src/mndProfile.c @@ -911,7 +911,7 @@ static int32_t mndRetrieveConns(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl char endpoint[TD_IP_LEN + 6 + VARSTR_HEADER_SIZE] = {0}; taosInetNtoa(varDataVal(endpoint), pConn->ip); - tsnprintf(varDataVal(endpoint) + strlen(varDataVal(endpoint)), + (void)tsnprintf(varDataVal(endpoint) + strlen(varDataVal(endpoint)), sizeof(endpoint) - VARSTR_HEADER_SIZE - strlen(varDataVal(endpoint)), ":%d", pConn->port); varDataLen(endpoint) = strlen(varDataVal(endpoint)); pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); @@ -988,7 +988,7 @@ static int32_t packQueriesIntoBlock(SShowObj *pShow, SConnObj *pConn, SSDataBloc cols = 0; char queryId[26 + VARSTR_HEADER_SIZE] = {0}; - tsnprintf(&queryId[VARSTR_HEADER_SIZE], sizeof(queryId) - VARSTR_HEADER_SIZE, "%x:%" PRIx64, pConn->id, + (void)tsnprintf(&queryId[VARSTR_HEADER_SIZE], sizeof(queryId) - VARSTR_HEADER_SIZE, "%x:%" PRIx64, pConn->id, pQuery->reqRid); varDataLen(queryId) = strlen(&queryId[VARSTR_HEADER_SIZE]); SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); @@ -1045,7 +1045,7 @@ static int32_t packQueriesIntoBlock(SShowObj *pShow, SConnObj *pConn, SSDataBloc char endpoint[TD_IP_LEN + 6 + VARSTR_HEADER_SIZE] = {0}; taosInetNtoa(varDataVal(endpoint), pConn->ip); - tsnprintf(varDataVal(endpoint) + strlen(varDataVal(endpoint)), + (void)tsnprintf(varDataVal(endpoint) + strlen(varDataVal(endpoint)), sizeof(endpoint) - VARSTR_HEADER_SIZE - strlen(varDataVal(endpoint)), ":%d", pConn->port); varDataLen(endpoint) = strlen(&endpoint[VARSTR_HEADER_SIZE]); pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); @@ -1246,7 +1246,7 @@ static int32_t mndRetrieveApps(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBlo } char name[TSDB_APP_NAME_LEN + 6 + VARSTR_HEADER_SIZE] = {0}; - tsnprintf(&name[VARSTR_HEADER_SIZE], sizeof(name) - VARSTR_HEADER_SIZE, "%s", pApp->name); + (void)tsnprintf(&name[VARSTR_HEADER_SIZE], sizeof(name) - VARSTR_HEADER_SIZE, "%s", pApp->name); varDataLen(name) = strlen(&name[VARSTR_HEADER_SIZE]); pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); code = colDataSetVal(pColInfo, numOfRows, (const char *)name, false); diff --git a/source/dnode/mnode/impl/src/mndQnode.c b/source/dnode/mnode/impl/src/mndQnode.c index 30bf40c0d8..ea42551fa5 100644 --- a/source/dnode/mnode/impl/src/mndQnode.c +++ b/source/dnode/mnode/impl/src/mndQnode.c @@ -333,7 +333,7 @@ static int32_t mndProcessCreateQnodeReq(SRpcMsg *pReq) { if (code == 0) code = TSDB_CODE_ACTION_IN_PROGRESS; char obj[33] = {0}; - tsnprintf(obj, sizeof(obj), "%d", createReq.dnodeId); + (void)tsnprintf(obj, sizeof(obj), "%d", createReq.dnodeId); auditRecord(pReq, pMnode->clusterId, "createQnode", "", obj, createReq.sql, createReq.sqlLen); _OVER: @@ -465,7 +465,7 @@ static int32_t mndProcessDropQnodeReq(SRpcMsg *pReq) { if (code == 0) code = TSDB_CODE_ACTION_IN_PROGRESS; char obj[33] = {0}; - tsnprintf(obj, sizeof(obj), "%d", dropReq.dnodeId); + (void)tsnprintf(obj, sizeof(obj), "%d", dropReq.dnodeId); auditRecord(pReq, pMnode->clusterId, "dropQnode", "", obj, dropReq.sql, dropReq.sqlLen); diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c index 60a7fc0b6d..2db76f6312 100644 --- a/source/dnode/mnode/impl/src/mndStb.c +++ b/source/dnode/mnode/impl/src/mndStb.c @@ -1368,7 +1368,7 @@ static int32_t mndProcessCreateStbReq(SRpcMsg *pReq) { if (createReq.sql == NULL && createReq.sqlLen == 0) { char detail[1000] = {0}; - tsnprintf(detail, sizeof(detail), "dbname:%s, stable name:%s", name.dbname, name.tname); + (void)tsnprintf(detail, sizeof(detail), "dbname:%s, stable name:%s", name.dbname, name.tname); auditRecord(pReq, pMnode->clusterId, "createStb", name.dbname, name.tname, detail, strlen(detail)); } else { @@ -3148,7 +3148,7 @@ int32_t mndValidateStbInfo(SMnode *pMnode, SSTableVersion *pStbVersions, int32_t TAOS_RETURN(code); } - tsnprintf(tbFName, sizeof(tbFName), "%s.%s", pStbVersion->dbFName, pStbVersion->stbName); + (void)tsnprintf(tbFName, sizeof(tbFName), "%s.%s", pStbVersion->dbFName, pStbVersion->stbName); int32_t code = mndGetTableSma(pMnode, tbFName, &indexRsp, &exist); if (code || !exist) { indexRsp.suid = pStbVersion->suid; @@ -3331,7 +3331,7 @@ static int32_t mndRetrieveStb(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBloc } char watermark[64 + VARSTR_HEADER_SIZE] = {0}; - tsnprintf(varDataVal(watermark), sizeof(watermark) - VARSTR_HEADER_SIZE, "%" PRId64 "a,%" PRId64 "a", + (void)tsnprintf(varDataVal(watermark), sizeof(watermark) - VARSTR_HEADER_SIZE, "%" PRId64 "a,%" PRId64 "a", pStb->watermark[0], pStb->watermark[1]); varDataSetLen(watermark, strlen(varDataVal(watermark))); @@ -3339,7 +3339,7 @@ static int32_t mndRetrieveStb(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBloc RETRIEVE_CHECK_GOTO(colDataSetVal(pColInfo, numOfRows, (const char *)watermark, false), pStb, &lino, _ERROR); char maxDelay[64 + VARSTR_HEADER_SIZE] = {0}; - tsnprintf(varDataVal(maxDelay), sizeof(maxDelay) - VARSTR_HEADER_SIZE, "%" PRId64 "a,%" PRId64 "a", + (void)tsnprintf(varDataVal(maxDelay), sizeof(maxDelay) - VARSTR_HEADER_SIZE, "%" PRId64 "a,%" PRId64 "a", pStb->maxdelay[0], pStb->maxdelay[1]); varDataSetLen(maxDelay, strlen(varDataVal(maxDelay))); diff --git a/source/dnode/mnode/impl/src/mndStreamUtil.c b/source/dnode/mnode/impl/src/mndStreamUtil.c index 8654fd64e4..537a22bb7c 100644 --- a/source/dnode/mnode/impl/src/mndStreamUtil.c +++ b/source/dnode/mnode/impl/src/mndStreamUtil.c @@ -1005,7 +1005,7 @@ int32_t setStreamAttrInResBlock(SStreamObj *pStream, SSDataBlock *pBlock, int32_ // checkpoint interval char tmp[20 + VARSTR_HEADER_SIZE] = {0}; - tsnprintf(varDataVal(tmp), sizeof(tmp) - VARSTR_HEADER_SIZE, "%d sec", tsStreamCheckpointInterval); + (void)tsnprintf(varDataVal(tmp), sizeof(tmp) - VARSTR_HEADER_SIZE, "%d sec", tsStreamCheckpointInterval); varDataSetLen(tmp, strlen(varDataVal(tmp))); pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); @@ -1191,7 +1191,7 @@ int32_t setTaskAttrInResBlock(SStreamObj *pStream, SStreamTask *pTask, SSDataBlo if (pTask->info.taskLevel == TASK_LEVEL__SINK) { colDataSetNULL(pColInfo, numOfRows); } else { - tsnprintf(buf, sizeof(buf), formatTotalMb, pe->outputTotal); + (void)tsnprintf(buf, sizeof(buf), formatTotalMb, pe->outputTotal); memset(vbuf, 0, tListLen(vbuf)); STR_TO_VARSTR(vbuf, buf); diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c index 03519a7fdb..e1518d3752 100644 --- a/source/dnode/mnode/impl/src/mndUser.c +++ b/source/dnode/mnode/impl/src/mndUser.c @@ -691,7 +691,7 @@ static void ipRangeToStr(SIpV4Range *range, char *buf) { (void)uv_inet_ntop(AF_INET, &addr, buf, 32); if (range->mask != 32) { - tsnprintf(buf + strlen(buf), 36 - strlen(buf), "/%d", range->mask); + (void)tsnprintf(buf + strlen(buf), 36 - strlen(buf), "/%d", range->mask); } return; } @@ -1901,7 +1901,7 @@ static int32_t mndProcessCreateUserReq(SRpcMsg *pReq) { if (code == 0) code = TSDB_CODE_ACTION_IN_PROGRESS; char detail[1000] = {0}; - tsnprintf(detail, sizeof(detail), "enable:%d, superUser:%d, sysInfo:%d, password:xxx", createReq.enable, + (void)tsnprintf(detail, sizeof(detail), "enable:%d, superUser:%d, sysInfo:%d, password:xxx", createReq.enable, createReq.superUser, createReq.sysInfo); char operation[15] = {0}; if (createReq.isImport == 1) { @@ -2504,7 +2504,7 @@ static int32_t mndProcessAlterUserReq(SRpcMsg *pReq) { if (alterReq.alterType == TSDB_ALTER_USER_PASSWD) { char detail[1000] = {0}; - tsnprintf(detail, sizeof(detail), + (void)tsnprintf(detail, sizeof(detail), "alterType:%s, enable:%d, superUser:%d, sysInfo:%d, createdb:%d, tabName:%s, password:xxx", mndUserAuditTypeStr(alterReq.alterType), alterReq.enable, alterReq.superUser, alterReq.sysInfo, alterReq.createdb ? 1 : 0, alterReq.tabName); @@ -2895,12 +2895,12 @@ static int32_t mndLoopHash(SHashObj *hash, char *priType, SSDataBlock *pBlock, i if (nodesStringToNode(value, &pAst) == 0) { if (nodesNodeToSQL(pAst, *sql, bufSz, &sqlLen) != 0) { sqlLen = 5; - tsnprintf(*sql, bufSz, "error"); + (void)tsnprintf(*sql, bufSz, "error"); } nodesDestroyNode(pAst); } else { sqlLen = 5; - tsnprintf(*sql, bufSz, "error"); + (void)tsnprintf(*sql, bufSz, "error"); } STR_WITH_MAXSIZE_TO_VARSTR((*condition), (*sql), pShow->pMeta->pSchemas[cols].bytes); diff --git a/source/dnode/mnode/impl/src/mndVgroup.c b/source/dnode/mnode/impl/src/mndVgroup.c index 29bc1756f5..0bce21290b 100644 --- a/source/dnode/mnode/impl/src/mndVgroup.c +++ b/source/dnode/mnode/impl/src/mndVgroup.c @@ -2561,7 +2561,7 @@ static int32_t mndProcessRedistributeVgroupMsg(SRpcMsg *pReq) { if (code == 0) code = TSDB_CODE_ACTION_IN_PROGRESS; char obj[33] = {0}; - tsnprintf(obj, sizeof(obj), "%d", req.vgId); + (void)tsnprintf(obj, sizeof(obj), "%d", req.vgId); auditRecord(pReq, pMnode->clusterId, "RedistributeVgroup", "", obj, req.sql, req.sqlLen);