From 0da27973a79ce7678f0024a8273f09f0dd64d683 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Sat, 14 Sep 2024 16:18:15 +0800 Subject: [PATCH 1/3] fix:[TD-32010] code rewrite --- source/client/src/clientImpl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c index 8efbf81258..ad4cbabbb0 100644 --- a/source/client/src/clientImpl.c +++ b/source/client/src/clientImpl.c @@ -1282,8 +1282,9 @@ SRequestObj* launchQueryImpl(SRequestObj* pRequest, SQuery* pQuery, bool keepQue } } - if (TSDB_CODE_SUCCESS == code) { - code = handleQueryExecRsp(pRequest); + int ret = handleQueryExecRsp(pRequest); + if (TSDB_CODE_SUCCESS != ret) { + tscError("0x%" PRIx64 " handleQueryExecRsp,code:%d,QID:0x%" PRIx64, pRequest->self, ret, pRequest->requestId); } if (TSDB_CODE_SUCCESS != code) { From 50d94fd78b829a293949af5134aed1c3829e4f31 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Wed, 18 Sep 2024 11:02:19 +0800 Subject: [PATCH 2/3] fix:[TD-32010] code rewrite --- source/client/src/clientImpl.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c index ad4cbabbb0..52da031817 100644 --- a/source/client/src/clientImpl.c +++ b/source/client/src/clientImpl.c @@ -1282,13 +1282,11 @@ SRequestObj* launchQueryImpl(SRequestObj* pRequest, SQuery* pQuery, bool keepQue } } - int ret = handleQueryExecRsp(pRequest); - if (TSDB_CODE_SUCCESS != ret) { - tscError("0x%" PRIx64 " handleQueryExecRsp,code:%d,QID:0x%" PRIx64, pRequest->self, ret, pRequest->requestId); - } + if (TSDB_CODE_SUCCESS == code) { + code = handleQueryExecRsp(pRequest); if (TSDB_CODE_SUCCESS != code) { - pRequest->code = terrno; + pRequest->code = code; } if (res) { From bf0691fde6e6e79831caf4079476f8a9d95b2e1a Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Wed, 18 Sep 2024 13:58:12 +0800 Subject: [PATCH 3/3] fix:[TD-32010] code was rewritted --- source/client/src/clientImpl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c index 52da031817..7844703041 100644 --- a/source/client/src/clientImpl.c +++ b/source/client/src/clientImpl.c @@ -1284,6 +1284,7 @@ SRequestObj* launchQueryImpl(SRequestObj* pRequest, SQuery* pQuery, bool keepQue if (TSDB_CODE_SUCCESS == code) { code = handleQueryExecRsp(pRequest); + } if (TSDB_CODE_SUCCESS != code) { pRequest->code = code;