From d9622d9d8cb52de2343fb0f7137a6ab44d088ea1 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Mon, 27 Jul 2020 16:17:34 +0800
Subject: [PATCH] [td-225] fix bugs in rsp data using wrong connection handle

---
 src/inc/query.h           | 9 +--------
 src/query/src/qExecutor.c | 8 ++++++++
 src/vnode/src/vnodeRead.c | 8 ++++++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/inc/query.h b/src/inc/query.h
index a9a21bc911..ccff05bc1b 100644
--- a/src/inc/query.h
+++ b/src/inc/query.h
@@ -65,14 +65,7 @@ int32_t qRetrieveQueryResultInfo(qinfo_t qinfo, bool* buildRes, void* pRspContex
  */
 int32_t qDumpRetrieveResult(qinfo_t qinfo, SRetrieveTableRsp** pRsp, int32_t* contLen, bool* continueExec);
 
-/**
- * Decide if more results will be produced or not, NOTE: this function will increase the ref count of QInfo,
- * so it can be only called once for each retrieve
- *
- * @param qinfo
- * @return
- */
-bool qHasMoreResultsToRetrieve(qinfo_t qinfo);
+void* qGetResultRetrieveMsg(qinfo_t qinfo);
 
 /**
  * kill current ongoing query and free query handle automatically
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 28d1c138f6..5b904936f2 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -6640,6 +6640,13 @@ static void buildTagQueryResult(SQInfo* pQInfo) {
   setQueryStatus(pQuery, QUERY_COMPLETED);
 }
 
+void* qGetResultRetrieveMsg(qinfo_t qinfo) {
+  SQInfo* pQInfo = (SQInfo*) qinfo;
+  assert(pQInfo != NULL);
+
+  return pQInfo->rspContext;
+}
+
 void freeqinfoFn(void *qhandle) {
   void** handle = qhandle;
   if (handle == NULL || *handle == NULL) {
@@ -6762,3 +6769,4 @@ void** qReleaseQInfo(void* pMgmt, void* pQInfo, bool needFree) {
   return 0;
 }
 
+
diff --git a/src/vnode/src/vnodeRead.c b/src/vnode/src/vnodeRead.c
index 5edfcf597c..3659ef1430 100644
--- a/src/vnode/src/vnodeRead.c
+++ b/src/vnode/src/vnodeRead.c
@@ -166,12 +166,16 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
       bool buildRes = qTableQuery(*handle); // do execute query
 
       if (buildRes) { // build result rsp
-        vDebug("vgId:%d, QInfo:%p, start to build result rsp after query paused", pVnode->vgId, *handle);
+
+        SReadMsg* pRetrieveMsg = qGetResultRetrieveMsg(*handle);
+        assert(pRetrieveMsg != NULL);
+        vDebug("vgId:%d, QInfo:%p, start to build result rsp after query paused, %p", pVnode->vgId, *handle, pRetrieveMsg->rpcMsg.handle);
+        pReadMsg->rpcMsg.handle = pRetrieveMsg->rpcMsg.handle;  // update the connection info according to the retrieve connection
 
         pRet = &pReadMsg->rspRet;
+        code = TSDB_CODE_QRY_HAS_RSP;
 
         bool continueExec = false;
-        code = TSDB_CODE_QRY_HAS_RSP;
         if ((code = qDumpRetrieveResult(*handle, (SRetrieveTableRsp **)&pRet->rsp, &pRet->len, &continueExec)) == TSDB_CODE_SUCCESS) {
 
           if (continueExec) {
-- 
GitLab