From c2baa7e177c378572c248663e4c55fdcc28a381f Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Wed, 18 Dec 2024 17:36:06 +0800 Subject: [PATCH] fix:ci error --- source/client/src/clientRawBlockWrite.c | 7 +++---- source/dnode/mnode/impl/src/mndSubscribe.c | 6 ++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/source/client/src/clientRawBlockWrite.c b/source/client/src/clientRawBlockWrite.c index 212623d6b5..8570b67544 100644 --- a/source/client/src/clientRawBlockWrite.c +++ b/source/client/src/clientRawBlockWrite.c @@ -77,9 +77,8 @@ static tb_uid_t processSuid(tb_uid_t suid, char* db) { } static void buildCreateTableJson(SSchemaWrapper* schemaRow, SSchemaWrapper* schemaTag, char* name, int64_t id, int8_t t, SColCmprWrapper* pColCmprRow, cJSON** pJson) { - if (schemaRow == NULL || schemaTag == NULL || name == NULL || pColCmprRow == NULL || pJson == NULL) { - uError("invalid parameter, schemaRow:%p, schemaTag:%p, name:%p, pColCmprRow:%p, pJson:%p", schemaRow, schemaTag, - name, pColCmprRow, pJson); + if (schemaRow == NULL || name == NULL || pColCmprRow == NULL || pJson == NULL) { + uError("invalid parameter, schemaRow:%p, name:%p, pColCmprRow:%p, pJson:%p", schemaRow, name, pColCmprRow, pJson); return; } int32_t code = TSDB_CODE_SUCCESS; @@ -2570,7 +2569,7 @@ static int32_t writeRawImpl(TAOS* taos, void* buf, uint32_t len, uint16_t type) int32_t tmq_write_raw(TAOS* taos, tmq_raw_data raw) { if (taos == NULL || raw.raw == NULL || raw.raw_len <= 0) { - uError("taos:%p or data:%p is NULL or raw_len <= 0", taos, raw.raw); + SET_ERROR_MSG("taos:%p or data:%p is NULL or raw_len <= 0", taos, raw.raw); return TSDB_CODE_INVALID_PARA; } diff --git a/source/dnode/mnode/impl/src/mndSubscribe.c b/source/dnode/mnode/impl/src/mndSubscribe.c index da36dc30e4..e5ab02996a 100644 --- a/source/dnode/mnode/impl/src/mndSubscribe.c +++ b/source/dnode/mnode/impl/src/mndSubscribe.c @@ -1446,8 +1446,7 @@ END: static int32_t buildResult(SSDataBlock *pBlock, int32_t *numOfRows, int64_t consumerId, const char* user, const char* fqdn, const char *topic, const char *cgroup, SArray *vgs, SArray *offsetRows) { - if (pBlock == NULL || numOfRows == NULL || topic == NULL || - cgroup == NULL || vgs == NULL || offsetRows == NULL){ + if (pBlock == NULL || numOfRows == NULL || topic == NULL || cgroup == NULL){ return TSDB_CODE_INVALID_PARA; } int32_t code = 0; @@ -1601,6 +1600,9 @@ int32_t mndRetrieveSubscribe(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock return numOfRows; END: + taosRUnLockLatch(&pSub->lock); + sdbRelease(pSdb, pSub); + return code; }