From cc187e103b76b7c0fe6e8ee3f2f4dc213baf9868 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 21 Oct 2020 15:39:15 +0000 Subject: [PATCH] TD-1589 --- src/client/src/tscLocal.c | 1 + src/client/src/tscServer.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/client/src/tscLocal.c b/src/client/src/tscLocal.c index a15673bdb1..642b900581 100644 --- a/src/client/src/tscLocal.c +++ b/src/client/src/tscLocal.c @@ -47,6 +47,7 @@ typedef struct SCreateBuilder { int32_t (*fp)(void *para, char* result); Stage callStage; } SCreateBuilder; + static void tscSetLocalQueryResult(SSqlObj *pSql, const char *val, const char *columnName, int16_t type, size_t valueLength); static int32_t getToStringLength(const char *pData, int32_t length, int32_t type) { diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c index f51aa081ce..54f8b63328 100644 --- a/src/client/src/tscServer.c +++ b/src/client/src/tscServer.c @@ -297,7 +297,7 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet) { } int32_t cmd = pCmd->command; - if ((cmd == TSDB_SQL_SELECT || cmd == TSDB_SQL_FETCH || cmd == TSDB_SQL_INSERT || cmd == TSDB_SQL_UPDATE_TAGS_VAL) && + if ((cmd == TSDB_SQL_SELECT || cmd == TSDB_SQL_FETCH || cmd == TSDB_SQL_INSERT || cmd == TSDB_SQL_UPDATE_TAGS_VAL || cmd == TSDB_SQL_DELETE) && (rpcMsg->code == TSDB_CODE_TDB_INVALID_TABLE_ID || rpcMsg->code == TSDB_CODE_VND_INVALID_VGROUP_ID || rpcMsg->code == TSDB_CODE_RPC_NETWORK_UNAVAIL || @@ -377,8 +377,19 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet) { pRes->numOfRows += pMsg->affectedRows; tscDebug("%p SQL cmd:%s, code:%s inserted rows:%d rspLen:%d", pSql, sqlCmd[pCmd->command], tstrerror(pRes->code), pMsg->affectedRows, pRes->rspLen); + } else if (rpcMsg->msgType == TSDB_MSG_TYPE_DELETE_RSP && pRes->pRsp != NULL) { + SShellSubmitRspMsg *pMsg = (SShellSubmitRspMsg*)pRes->pRsp; + pMsg->code = htonl(pMsg->code); + pMsg->numOfRows = 10; //htonl(pMsg->numOfRows); + pMsg->affectedRows = 10; //htonl(pMsg->affectedRows); + pMsg->failedRows = htonl(pMsg->failedRows); + pMsg->numOfFailedBlocks = htonl(pMsg->numOfFailedBlocks); + pRes->numOfRows += pMsg->affectedRows; + tscDebug("%p SQL cmd:%s, code:%s delete rows:%d rspLen:%d", pSql, sqlCmd[pCmd->command], + tstrerror(pRes->code), pMsg->affectedRows, pRes->rspLen); } else { tscDebug("%p SQL cmd:%s, code:%s rspLen:%d", pSql, sqlCmd[pCmd->command], tstrerror(pRes->code), pRes->rspLen); + } } -- GitLab