From 699f28284132596e0288ebb2c5d6b0059995e48b Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 25 Jul 2020 00:22:46 +0800
Subject: [PATCH] [td-225] fix bugs in non-blocking processing.

---
 src/dnode/src/dnodeVRead.c | 2 +-
 src/query/src/qExecutor.c  | 7 +++----
 src/vnode/src/vnodeRead.c  | 7 +++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/dnode/src/dnodeVRead.c b/src/dnode/src/dnodeVRead.c
index f8a31d568e..85ed194976 100644
--- a/src/dnode/src/dnodeVRead.c
+++ b/src/dnode/src/dnodeVRead.c
@@ -49,7 +49,7 @@ static taos_qset       readQset;
 int32_t dnodeInitVnodeRead() {
   readQset = taosOpenQset();
 
-  readPool.min = 2;
+  readPool.min = 4;
   readPool.max = tsNumOfCores * tsNumOfThreadsPerCore;
   if (readPool.max <= readPool.min * 2) readPool.max = 2 * readPool.min;
   readPool.readWorker = (SReadWorker *)calloc(sizeof(SReadWorker), readPool.max);
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index c4142f5d93..6de300400e 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -6352,7 +6352,6 @@ bool qTableQuery(qinfo_t qinfo) {
            pQInfo, pQuery->rec.rows, pQuery->rec.total + pQuery->rec.rows);
   }
 
-//  pQInfo->dataReady = QUERY_RESULT_READY;
   bool buildRes = false;
   pthread_mutex_lock(&pQInfo->lock);
   pQInfo->dataReady = QUERY_RESULT_READY;
@@ -6360,8 +6359,9 @@ bool qTableQuery(qinfo_t qinfo) {
   if (pQInfo->rspContext != NULL) {
     buildRes = true;
   }
-  pthread_mutex_unlock(&pQInfo->lock);
 
+
+  pthread_mutex_unlock(&pQInfo->lock);
   return buildRes;
 //  sem_post(&pQInfo->dataReady);
 }
@@ -6387,12 +6387,11 @@ int32_t qRetrieveQueryResultInfo(qinfo_t qinfo, bool* buildRes, void* pRspContex
     qDebug("QInfo:%p retrieve result info, rowsize:%d, rows:%"PRId64", code:%d", pQInfo, pQuery->rowSize, pQuery->rec.rows,
            pQInfo->code);
   } else {
+    qDebug("QInfo:%p retrieve req set query return result after paused", pQInfo);
     pQInfo->rspContext = pRspContext;
   }
 
   pthread_mutex_unlock(&pQInfo->lock);
-
-//  sem_wait(&pQInfo->dataReady);
   return pQInfo->code;
 }
 
diff --git a/src/vnode/src/vnodeRead.c b/src/vnode/src/vnodeRead.c
index 542c132e03..5edfcf597c 100644
--- a/src/vnode/src/vnodeRead.c
+++ b/src/vnode/src/vnodeRead.c
@@ -163,18 +163,21 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
       code = TSDB_CODE_QRY_INVALID_QHANDLE;
     } else {
       vDebug("vgId:%d, QInfo:%p, dnode continue exec query", pVnode->vgId, (void*) pCont);
-      code = TSDB_CODE_VND_ACTION_IN_PROGRESS;
       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);
+
         pRet = &pReadMsg->rspRet;
 
         bool continueExec = false;
+        code = TSDB_CODE_QRY_HAS_RSP;
         if ((code = qDumpRetrieveResult(*handle, (SRetrieveTableRsp **)&pRet->rsp, &pRet->len, &continueExec)) == TSDB_CODE_SUCCESS) {
+
           if (continueExec) {
             vnodePutItemIntoReadQueue(pVnode, *handle, pReadMsg->rpcMsg.handle);
             pRet->qhandle = *handle;
-
+            code = TSDB_CODE_SUCCESS;
           }
         } else { // todo handle error
         }
-- 
GitLab