From a914816ce75111b15d75dbaf4a93255da9dba975 Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Wed, 21 Sep 2022 11:28:34 +0800
Subject: [PATCH] enh: added memory allocators for parser and planner

---
 source/client/inc/clientInt.h          | 3 +--
 source/client/src/clientEnv.c          | 1 +
 source/libs/nodes/src/nodesUtilFuncs.c | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/client/inc/clientInt.h b/source/client/inc/clientInt.h
index eca1a0ebbe..7a9c665556 100644
--- a/source/client/inc/clientInt.h
+++ b/source/client/inc/clientInt.h
@@ -250,8 +250,7 @@ typedef struct SRequestObj {
   bool                 inRetry;
   uint32_t             prevCode;  // previous error code: todo refactor, add update flag for catalog
   uint32_t             retry;
-  // SNodeAllocator*      pNodeAllocator;
-  int64_t allocatorRefId;
+  int64_t              allocatorRefId;
 } SRequestObj;
 
 typedef struct SSyncQueryParam {
diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c
index e95a2d2871..5019314fed 100644
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
@@ -288,6 +288,7 @@ void *createRequest(uint64_t connId, int32_t type) {
 
   pRequest->body.resInfo.convertUcs4 = true;  // convert ucs4 by default
   pRequest->type = type;
+  pRequest->allocatorRefId = -1;
 
   pRequest->pDb = getDbOfConnection(pTscObj);
   pRequest->pTscObj = pTscObj;
diff --git a/source/libs/nodes/src/nodesUtilFuncs.c b/source/libs/nodes/src/nodesUtilFuncs.c
index b7caead3e5..480d2cce72 100644
--- a/source/libs/nodes/src/nodesUtilFuncs.c
+++ b/source/libs/nodes/src/nodesUtilFuncs.c
@@ -153,14 +153,14 @@ int32_t nodesCreateAllocator(int32_t chunkSize, int64_t* pRefId) {
 }
 
 void nodesDestroyAllocator(int64_t refId) {
-  if (refId < 0) {
+  if (refId <= 0) {
     return;
   }
   taosReleaseRef(allocatorReqRefPool, refId);
 }
 
 void nodesResetAllocator(int64_t refId) {
-  if (refId < 0) {
+  if (refId <= 0) {
     pNodeAllocator = NULL;
   } else {
     pNodeAllocator = taosAcquireRef(allocatorReqRefPool, refId);
@@ -169,7 +169,7 @@ void nodesResetAllocator(int64_t refId) {
 }
 
 int64_t nodesIncAllocatorRefCount(int64_t refId) {
-  if (refId < 0) {
+  if (refId <= 0) {
     return -1;
   }
   SNodeAllocator* pAllocator = taosAcquireRef(allocatorReqRefPool, refId);