xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix:ci error

This commit is contained in:
wangmm0220 2024-12-18 17:36:06 +08:00
parent e598486b10
commit c2baa7e177
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/client/src/clientRawBlockWrite.c
View File

@ -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;
}

6
source/dnode/mnode/impl/src/mndSubscribe.c
View File

@ -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;
}