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-27 18:17:45 +08:00
parent 7aaa7189d7
commit 410aff2768
2 changed files with 14 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,10 +40,7 @@ int32_t genericRspCallback(void* param, SDataBuf* pMsg, int32_t code) {
setErrno(pRequest, code); setErrno(pRequest, code);
if (NEED_CLIENT_RM_TBLMETA_REQ(pRequest->type)) { if (NEED_CLIENT_RM_TBLMETA_REQ(pRequest->type)) {
code = removeMeta(pRequest->pTscObj, pRequest->targetTableList, IS_VIEW_REQUEST(pRequest->type)); (void)removeMeta(pRequest->pTscObj, pRequest->targetTableList, IS_VIEW_REQUEST(pRequest->type));
if (code != 0){
setErrno(pRequest, code);
}
} }
taosMemoryFree(pMsg->pEpSet); taosMemoryFree(pMsg->pEpSet);
@ -114,13 +111,8 @@ int32_t processConnectRsp(void* param, SDataBuf* pMsg, int32_t code) {
SEpSet srcEpSet = getEpSet_s(&pTscObj->pAppInfo->mgmtEp); SEpSet srcEpSet = getEpSet_s(&pTscObj->pAppInfo->mgmtEp);
SEpSet dstEpSet = connectRsp.epSet; SEpSet dstEpSet = connectRsp.epSet;
if (srcEpSet.numOfEps == 1) { if (srcEpSet.numOfEps == 1) {
code = rpcSetDefaultAddr(pTscObj->pAppInfo->pTransporter, srcEpSet.eps[srcEpSet.inUse].fqdn, (void)rpcSetDefaultAddr(pTscObj->pAppInfo->pTransporter, srcEpSet.eps[srcEpSet.inUse].fqdn,
dstEpSet.eps[dstEpSet.inUse].fqdn); dstEpSet.eps[dstEpSet.inUse].fqdn);
if (code != 0){
setErrno(pRequest, code);
(void)tsem_post(&pRequest->body.rspSem);
goto End;
}
updateEpSet = 0; updateEpSet = 0;
} }
} }
@ -175,12 +167,7 @@ int32_t processConnectRsp(void* param, SDataBuf* pMsg, int32_t code) {
taosThreadMutexLock(&clientHbMgr.lock); taosThreadMutexLock(&clientHbMgr.lock);
SAppHbMgr* pAppHbMgr = taosArrayGetP(clientHbMgr.appHbMgrs, pTscObj->appHbMgrIdx); SAppHbMgr* pAppHbMgr = taosArrayGetP(clientHbMgr.appHbMgrs, pTscObj->appHbMgrIdx);
if (pAppHbMgr) { if (pAppHbMgr) {
code = hbRegisterConn(pAppHbMgr, pTscObj->id, connectRsp.clusterId, connectRsp.connType); (void)hbRegisterConn(pAppHbMgr, pTscObj->id, connectRsp.clusterId, connectRsp.connType);
if (code != 0){
setErrno(pRequest, code);
(void)tsem_post(&pRequest->body.rspSem);
goto End;
}
} else { } else {
taosThreadMutexUnlock(&clientHbMgr.lock); taosThreadMutexUnlock(&clientHbMgr.lock);
code = TSDB_CODE_TSC_DISCONNECTED; code = TSDB_CODE_TSC_DISCONNECTED;
@ -239,17 +226,9 @@ int32_t processCreateDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
.mgmtEps = getEpSet_s(&pTscObj->pAppInfo->mgmtEp)}; .mgmtEps = getEpSet_s(&pTscObj->pAppInfo->mgmtEp)};
char dbFName[TSDB_DB_FNAME_LEN]; char dbFName[TSDB_DB_FNAME_LEN];
(void)snprintf(dbFName, sizeof(dbFName) - 1, "%d.%s", pTscObj->acctId, TSDB_INFORMATION_SCHEMA_DB); (void)snprintf(dbFName, sizeof(dbFName) - 1, "%d.%s", pTscObj->acctId, TSDB_INFORMATION_SCHEMA_DB);
code = catalogRefreshDBVgInfo(pCatalog, &conn, dbFName); (void)catalogRefreshDBVgInfo(pCatalog, &conn, dbFName);
if (code != TSDB_CODE_SUCCESS) { (void)snprintf(dbFName, sizeof(dbFName) - 1, "%d.%s", pTscObj->acctId, TSDB_PERFORMANCE_SCHEMA_DB);
setErrno(pRequest, code); (void)catalogRefreshDBVgInfo(pCatalog, &conn, dbFName);
}
if (code == TSDB_CODE_SUCCESS) {
(void)snprintf(dbFName, sizeof(dbFName) - 1, "%d.%s", pTscObj->acctId, TSDB_PERFORMANCE_SCHEMA_DB);
code = catalogRefreshDBVgInfo(pCatalog, &conn, dbFName);
}
if (code != TSDB_CODE_SUCCESS) {
setErrno(pRequest, code);
}
} }
} }
@ -264,10 +243,7 @@ int32_t processCreateDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
int32_t processUseDbRsp(void* param, SDataBuf* pMsg, int32_t code) { int32_t processUseDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
SRequestObj* pRequest = param; SRequestObj* pRequest = param;
SUseDbRsp usedbRsp = {0}; SUseDbRsp usedbRsp = {0};
code = tDeserializeSUseDbRsp(pMsg->pData, pMsg->len, &usedbRsp); (void)tDeserializeSUseDbRsp(pMsg->pData, pMsg->len, &usedbRsp);
if (code != 0){
goto END;
}
if (TSDB_CODE_MND_DB_NOT_EXIST == code || TSDB_CODE_MND_DB_IN_CREATING == code || if (TSDB_CODE_MND_DB_NOT_EXIST == code || TSDB_CODE_MND_DB_IN_CREATING == code ||
TSDB_CODE_MND_DB_IN_DROPPING == code) { TSDB_CODE_MND_DB_IN_DROPPING == code) {
@ -280,10 +256,7 @@ int32_t processUseDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
tscWarn("0x%" PRIx64 "catalogGetHandle failed, clusterId:%" PRIx64 ", error:%s", pRequest->requestId, clusterId, tscWarn("0x%" PRIx64 "catalogGetHandle failed, clusterId:%" PRIx64 ", error:%s", pRequest->requestId, clusterId,
tstrerror(code1)); tstrerror(code1));
} else { } else {
code = catalogRemoveDB(pCatalog, usedbRsp.db, usedbRsp.uid); (void)catalogRemoveDB(pCatalog, usedbRsp.db, usedbRsp.uid);
if (code != 0){
goto END;
}
} }
} }
@ -316,10 +289,7 @@ int32_t processUseDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
} }
SName name = {0}; SName name = {0};
code = tNameFromString(&name, usedbRsp.db, T_NAME_ACCT | T_NAME_DB); (void)tNameFromString(&name, usedbRsp.db, T_NAME_ACCT | T_NAME_DB);
if (code != 0){
goto END;
}
SUseDbOutput output = {0}; SUseDbOutput output = {0};
code = queryBuildUseDbOutput(&output, &usedbRsp); code = queryBuildUseDbOutput(&output, &usedbRsp);
@ -336,10 +306,7 @@ int32_t processUseDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
tscWarn("catalogGetHandle failed, clusterId:%" PRIx64 ", error:%s", pRequest->pTscObj->pAppInfo->clusterId, tscWarn("catalogGetHandle failed, clusterId:%" PRIx64 ", error:%s", pRequest->pTscObj->pAppInfo->clusterId,
tstrerror(code1)); tstrerror(code1));
} else { } else {
code = catalogUpdateDBVgInfo(pCatalog, output.db, output.dbId, output.dbVgroup); (void)catalogUpdateDBVgInfo(pCatalog, output.db, output.dbId, output.dbVgroup);
if (code == 0){
output.dbVgroup = NULL;
}
} }
} }
@ -414,19 +381,11 @@ int32_t processDropDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
setErrno(pRequest, code); setErrno(pRequest, code);
} else { } else {
SDropDbRsp dropdbRsp = {0}; SDropDbRsp dropdbRsp = {0};
code = tDeserializeSDropDbRsp(pMsg->pData, pMsg->len, &dropdbRsp); (void)tDeserializeSDropDbRsp(pMsg->pData, pMsg->len, &dropdbRsp);
if (code != 0){
setErrno(pRequest, TAOS_GET_TERRNO(code));
goto END;
}
struct SCatalog* pCatalog = NULL; struct SCatalog* pCatalog = NULL;
code = catalogGetHandle(pRequest->pTscObj->pAppInfo->clusterId, &pCatalog); code = catalogGetHandle(pRequest->pTscObj->pAppInfo->clusterId, &pCatalog);
if (TSDB_CODE_SUCCESS == code) { if (TSDB_CODE_SUCCESS == code) {
code = catalogRemoveDB(pCatalog, dropdbRsp.db, dropdbRsp.uid); (void)catalogRemoveDB(pCatalog, dropdbRsp.db, dropdbRsp.uid);
if (code != 0){
setErrno(pRequest, TAOS_GET_TERRNO(code));
goto END;
}
STscObj* pTscObj = pRequest->pTscObj; STscObj* pTscObj = pRequest->pTscObj;
SRequestConnInfo conn = {.pTrans = pTscObj->pAppInfo->pTransporter, SRequestConnInfo conn = {.pTrans = pTscObj->pAppInfo->pTransporter,
@ -435,17 +394,9 @@ int32_t processDropDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
.mgmtEps = getEpSet_s(&pTscObj->pAppInfo->mgmtEp)}; .mgmtEps = getEpSet_s(&pTscObj->pAppInfo->mgmtEp)};
char dbFName[TSDB_DB_FNAME_LEN] = {0}; char dbFName[TSDB_DB_FNAME_LEN] = {0};
(void)snprintf(dbFName, sizeof(dbFName) - 1, "%d.%s", pTscObj->acctId, TSDB_INFORMATION_SCHEMA_DB); (void)snprintf(dbFName, sizeof(dbFName) - 1, "%d.%s", pTscObj->acctId, TSDB_INFORMATION_SCHEMA_DB);
code = catalogRefreshDBVgInfo(pCatalog, &conn, dbFName); (void)catalogRefreshDBVgInfo(pCatalog, &conn, dbFName);
if (code != 0){
setErrno(pRequest, TAOS_GET_TERRNO(code));
goto END;
}
(void)snprintf(dbFName, sizeof(dbFName) - 1, "%d.%s", pTscObj->acctId, TSDB_PERFORMANCE_SCHEMA_DB); (void)snprintf(dbFName, sizeof(dbFName) - 1, "%d.%s", pTscObj->acctId, TSDB_PERFORMANCE_SCHEMA_DB);
code = catalogRefreshDBVgInfo(pCatalog, &conn, dbFName); (void)catalogRefreshDBVgInfo(pCatalog, &conn, dbFName);
if (code != 0){
setErrno(pRequest, TAOS_GET_TERRNO(code));
goto END;
}
} }
} }

3
tests/system-test/2-query/ttl_comment.py
View File

@ -18,9 +18,6 @@ from util.cases import tdCases
from util.sql import tdSql from util.sql import tdSql
class TDTestCase: class TDTestCase:
clientCfgDict = {'debugFlag': 135}
updatecfgDict = {'debugFlag': 135, 'asynclog': 0}
updatecfgDict["clientCfg"] = clientCfgDict
def caseDescription(self): def caseDescription(self):
''' '''
ttl/comment test ttl/comment test