From 175dfb56a02e3691441a30124bf334fd6b8b8932 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 5 Aug 2020 17:03:59 +0800
Subject: [PATCH] [td-225] fix bug in hash

---
 src/util/src/tcache.c     |  2 ++
 src/vnode/src/vnodeRead.c | 62 ++++++++++++++++++---------------------
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c
index 8a4145f2f8..51991974ff 100644
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -318,6 +318,8 @@ static void incRefFn(void* ptNode) {
   assert(ptNode != NULL);
 
   SCacheDataNode** p = (SCacheDataNode**) ptNode;
+
+  assert(T_REF_VAL_GET(*p) >= 0);
   int32_t ret = T_REF_INC(*p);
   assert(ret > 0);
 }
diff --git a/src/vnode/src/vnodeRead.c b/src/vnode/src/vnodeRead.c
index 0d30be7662..e391fc5eb8 100644
--- a/src/vnode/src/vnodeRead.c
+++ b/src/vnode/src/vnodeRead.c
@@ -186,40 +186,35 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
   } else {
     assert(pCont != NULL);
     void** qhandle = (void**) pCont;
-//    *handle = /*(void*) */pCont;
-
-//    handle = qAcquireQInfo(pVnode->qMgmt, (uint64_t) pCont);
-//    if (handle == NULL) {
-//      vWarn("QInfo:%p invalid qhandle in continuing exec query, conn:%p", (void*) pCont, pReadMsg->rpcMsg.handle);
-//      code = TSDB_CODE_QRY_INVALID_QHANDLE;
-//    } else {
-      vDebug("vgId:%d, QInfo:%p, dnode continues to exec query", pVnode->vgId, *qhandle);
-
-      bool freehandle = false;
-      bool buildRes = qTableQuery(*qhandle); // do execute query
-
-      // build query rsp, the retrieve request has reached here already
-      if (buildRes) {
-        // update the connection info according to the retrieve connection
-        pReadMsg->rpcMsg.handle = qGetResultRetrieveMsg(*qhandle);
-        assert(pReadMsg->rpcMsg.handle != NULL);
-
-        vDebug("vgId:%d, QInfo:%p, start to build retrieval rsp after query paused, %p", pVnode->vgId, *qhandle,
-               pReadMsg->rpcMsg.handle);
-        code = vnodeDumpQueryResult(&pReadMsg->rspRet, pVnode, qhandle, &freehandle);
-
-        // todo test the error code case
-        if (code == TSDB_CODE_SUCCESS) {
-          code = TSDB_CODE_QRY_HAS_RSP;
-        }
-      } else {
-        freehandle = qQueryCompleted(*qhandle);
-      }
 
-      // NOTE: if the qhandle is not put into vread queue or query is completed, free the qhandle.
-      if (freehandle || (!buildRes)) {
-        qReleaseQInfo(pVnode->qMgmt, (void **)&qhandle, freehandle);
+    vDebug("vgId:%d, QInfo:%p, dnode continues to exec query", pVnode->vgId, *qhandle);
+
+    bool freehandle = false;
+    bool buildRes = qTableQuery(*qhandle); // do execute query
+
+    // build query rsp, the retrieve request has reached here already
+    if (buildRes) {
+      // update the connection info according to the retrieve connection
+      pReadMsg->rpcMsg.handle = qGetResultRetrieveMsg(*qhandle);
+      assert(pReadMsg->rpcMsg.handle != NULL);
+
+      vDebug("vgId:%d, QInfo:%p, start to build retrieval rsp after query paused, %p", pVnode->vgId, *qhandle,
+             pReadMsg->rpcMsg.handle);
+      code = vnodeDumpQueryResult(&pReadMsg->rspRet, pVnode, qhandle, &freehandle);
+
+      // todo test the error code case
+      if (code == TSDB_CODE_SUCCESS) {
+        code = TSDB_CODE_QRY_HAS_RSP;
       }
+    } else {
+      freehandle = qQueryCompleted(*qhandle);
+    }
+
+    // NOTE: if the qhandle is not put into vread queue or query is completed, free the qhandle.
+    // if not build result, free it not by forced.
+    if (freehandle || (!buildRes)) {
+      qReleaseQInfo(pVnode->qMgmt, (void **)&qhandle, freehandle);
+    }
   }
 
   return code;
@@ -273,9 +268,8 @@ static int32_t vnodeProcessFetchMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
 
     void** dup = handle;
     code = vnodeDumpQueryResult(pRet, pVnode, handle, &freeHandle);
-    qReleaseQInfo(pVnode->qMgmt, (void**) &handle, false);
 
-    // not added into task queue, the query must be completed already, free qhandle immediate
+    // not added into task queue, the query must be completed already, free qhandle immediately
     if (freeHandle) {
       qReleaseQInfo(pVnode->qMgmt, (void**) &dup, true);
     }
-- 
GitLab