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

fix:[TD-31017]process return value in client

This commit is contained in:
wangmm0220 2024-07-26 23:43:36 +08:00
parent 81b78feaf8
commit 8875863d07
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/client/inc/clientInt.h
View File

@ -207,7 +207,7 @@ typedef struct SReqResultInfo {
} SReqResultInfo;
typedef struct SRequestSendRecvBody {
tsem2_t rspSem; // not used now
tsem_t rspSem; // not used now
__taos_async_fn_t queryFp;
__taos_async_fn_t fetchFp;
EQueryExecMode execMode;

4
source/client/src/clientEnv.c
View File

@ -561,7 +561,7 @@ int32_t createRequest(uint64_t connId, int32_t type, int64_t reqid, SRequestObj
goto _return;
}
(*pRequest)->msgBufLen = ERROR_MSG_BUF_DEFAULT_SIZE;
TSC_ERR_JRET(tsem2_init(&(*pRequest)->body.rspSem, 0, 0));
TSC_ERR_JRET(tsem_init(&(*pRequest)->body.rspSem, 0, 0));
TSC_ERR_JRET(registerRequest(*pRequest, pTscObj));
return TSDB_CODE_SUCCESS;
@ -684,7 +684,7 @@ void doDestroyRequest(void *p) {
taosMemoryFreeClear(pRequest->msgBuf);
doFreeReqResultInfo(&pRequest->body.resInfo);
(void)tsem2_destroy(&pRequest->body.rspSem);
(void)tsem_destroy(&pRequest->body.rspSem);
taosArrayDestroy(pRequest->tableList);
taosArrayDestroy(pRequest->targetTableList);

4
source/client/src/clientImpl.c
View File

@ -332,7 +332,7 @@ int32_t execDdlQuery(SRequestObj* pRequest, SQuery* pQuery) {
int64_t transporterId = 0;
TSC_ERR_RET(asyncSendMsgToServer(pTscObj->pAppInfo->pTransporter, &pMsgInfo->epSet, &transporterId, pSendMsg));
(void)tsem2_wait(&pRequest->body.rspSem);
(void)tsem_wait(&pRequest->body.rspSem);
return TSDB_CODE_SUCCESS;
}
@ -1563,7 +1563,7 @@ int32_t taosConnectImpl(const char* user, const char* auth, const char* db, __ta
tscError("failed to send connect msg to server, code:%s", tstrerror(code));
return code;
}
(void)tsem2_wait(&pRequest->body.rspSem);
(void)tsem_wait(&pRequest->body.rspSem);
if (pRequest->code != TSDB_CODE_SUCCESS) {
const char* errorMsg = (code == TSDB_CODE_RPC_FQDN_ERROR) ? taos_errstr(pRequest) : tstrerror(pRequest->code);
tscError("failed to connect to server, reason: %s", errorMsg);

36
source/client/src/clientMsgHandler.c
View File

@ -51,7 +51,7 @@ int32_t genericRspCallback(void* param, SDataBuf* pMsg, int32_t code) {
if (pRequest->body.queryFp != NULL) {
doRequestCallback(pRequest, code);
} else {
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
}
return code;
}
@ -64,7 +64,7 @@ int32_t processConnectRsp(void* param, SDataBuf* pMsg, int32_t code) {
if (code != TSDB_CODE_SUCCESS) {
setErrno(pRequest, code);
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
goto End;
}
@ -73,7 +73,7 @@ int32_t processConnectRsp(void* param, SDataBuf* pMsg, int32_t code) {
if (NULL == pTscObj->pAppInfo) {
code = TSDB_CODE_TSC_DISCONNECTED;
setErrno(pRequest, code);
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
goto End;
}
@ -81,14 +81,14 @@ int32_t processConnectRsp(void* param, SDataBuf* pMsg, int32_t code) {
if (tDeserializeSConnectRsp(pMsg->pData, pMsg->len, &connectRsp) != 0) {
code = TSDB_CODE_TSC_INVALID_VERSION;
setErrno(pRequest, code);
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
goto End;
}
if ((code = taosCheckVersionCompatibleFromStr(version, connectRsp.sVer, 3)) != 0) {
tscError("version not compatible. client version: %s, server version: %s", version, connectRsp.sVer);
setErrno(pRequest, code);
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
goto End;
}
@ -98,14 +98,14 @@ int32_t processConnectRsp(void* param, SDataBuf* pMsg, int32_t code) {
code = TSDB_CODE_TIME_UNSYNCED;
tscError("time diff:%ds is too big", delta);
setErrno(pRequest, code);
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
goto End;
}
if (connectRsp.epSet.numOfEps == 0) {
code = TSDB_CODE_APP_ERROR;
setErrno(pRequest, code);
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
goto End;
}
@ -118,7 +118,7 @@ int32_t processConnectRsp(void* param, SDataBuf* pMsg, int32_t code) {
dstEpSet.eps[dstEpSet.inUse].fqdn);
if (code != 0){
setErrno(pRequest, code);
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
goto End;
}
updateEpSet = 0;
@ -178,14 +178,14 @@ int32_t processConnectRsp(void* param, SDataBuf* pMsg, int32_t code) {
code = hbRegisterConn(pAppHbMgr, pTscObj->id, connectRsp.clusterId, connectRsp.connType);
if (code != 0){
setErrno(pRequest, code);
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
goto End;
}
} else {
taosThreadMutexUnlock(&clientHbMgr.lock);
code = TSDB_CODE_TSC_DISCONNECTED;
setErrno(pRequest, code);
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
goto End;
}
taosThreadMutexUnlock(&clientHbMgr.lock);
@ -193,7 +193,7 @@ int32_t processConnectRsp(void* param, SDataBuf* pMsg, int32_t code) {
tscDebug("0x%" PRIx64 " clusterId:%" PRId64 ", totalConn:%" PRId64, pRequest->requestId, connectRsp.clusterId,
pTscObj->pAppInfo->numOfConns);
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
End:
if (pRequest) {
@ -256,7 +256,7 @@ int32_t processCreateDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
if (pRequest->body.queryFp) {
doRequestCallback(pRequest, code);
} else {
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
}
return code;
}
@ -359,7 +359,7 @@ END:
if (pRequest->body.queryFp != NULL) {
doRequestCallback(pRequest, pRequest->code);
} else {
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
}
return code;
}
@ -406,7 +406,7 @@ int32_t processCreateSTableRsp(void* param, SDataBuf* pMsg, int32_t code) {
doRequestCallback(pRequest, code);
} else {
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
}
return code;
}
@ -459,7 +459,7 @@ END:
if (pRequest->body.queryFp != NULL) {
doRequestCallback(pRequest, code);
} else {
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
}
return code;
}
@ -502,7 +502,7 @@ int32_t processAlterStbRsp(void* param, SDataBuf* pMsg, int32_t code) {
doRequestCallback(pRequest, code);
} else {
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
}
return code;
}
@ -637,7 +637,7 @@ int32_t processShowVariablesRsp(void* param, SDataBuf* pMsg, int32_t code) {
if (pRequest->body.queryFp != NULL) {
doRequestCallback(pRequest, code);
} else {
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
}
return code;
}
@ -773,7 +773,7 @@ int32_t processCompactDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
if (pRequest->body.queryFp != NULL) {
pRequest->body.queryFp(((SSyncQueryParam *)pRequest->body.interParam)->userParam, pRequest, code);
} else {
(void)tsem2_post(&pRequest->body.rspSem);
(void)tsem_post(&pRequest->body.rspSem);
}
return code;
}