From d2d01adb8c899932d25c38e5e9bc0456820dbb6b Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 11 Dec 2020 14:54:06 +0800
Subject: [PATCH] [TD-225] update a variable.

---
 packaging/cfg/taos.cfg    | 2 +-
 src/common/inc/tglobal.h  | 2 +-
 src/common/src/tglobal.c  | 8 ++++----
 src/query/src/qExecutor.c | 2 +-
 src/vnode/src/vnodeRead.c | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packaging/cfg/taos.cfg b/packaging/cfg/taos.cfg
index 4cc871c0b1..8c2ef19382 100644
--- a/packaging/cfg/taos.cfg
+++ b/packaging/cfg/taos.cfg
@@ -270,4 +270,4 @@
 # stream                1
 
 # in retrieve blocking model, only in 50% query threads will be used in query processing in dnode
-# retrieveBlockModel    0
+# retrieveBlockingModel    0
diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h
index db15bb8964..b5bb8998b4 100644
--- a/src/common/inc/tglobal.h
+++ b/src/common/inc/tglobal.h
@@ -57,7 +57,7 @@ extern char     tsTempDir[];
 
 //query buffer management
 extern int32_t  tsQueryBufferSize;      // maximum allowed usage buffer for each data node during query processing
-extern int32_t  tsRetrieveBlockModel;         // only 50% will be used in query processing
+extern int32_t  tsRetrieveBlockingModel;         // only 50% will be used in query processing
 
 // client
 extern int32_t tsTableMetaKeepTimer;
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index cadad3c5d8..c31b1dea3d 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -107,8 +107,8 @@ int64_t tsMaxRetentWindow = 24 * 3600L;  // maximum time window tolerance
 // positive value (in MB)
 int32_t tsQueryBufferSize = -1;
 
-// in retrieve blocking model, only in 50% query threads will be used in query processing in dnode
-int32_t tsRetrieveBlockModel = 0;
+// in retrieve blocking model, the retrieve threads will wait for the completion of the query processing.
+int32_t tsRetrieveBlockingModel = 0;
 
 // db parameters
 int32_t tsCacheBlockSize = TSDB_DEFAULT_CACHE_BLOCK_SIZE;
@@ -887,8 +887,8 @@ static void doInitGlobalConfig(void) {
   cfg.unitType = TAOS_CFG_UTYPE_BYTE;
   taosInitConfigOption(cfg);
 
-  cfg.option = "retrieveBlockModel";
-  cfg.ptr = &tsRetrieveBlockModel;
+  cfg.option = "retrieveBlockingModel";
+  cfg.ptr = &tsRetrieveBlockingModel;
   cfg.valType = TAOS_CFG_VTYPE_INT32;
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
   cfg.minValue = 0;
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index aebfd8e70e..58f05c9d9d 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -7635,7 +7635,7 @@ int32_t qRetrieveQueryResultInfo(qinfo_t qinfo, bool* buildRes, void* pRspContex
 
   int32_t code = TSDB_CODE_SUCCESS;
 
-  if (tsRetrieveBlockModel) {
+  if (tsRetrieveBlockingModel) {
     pQInfo->rspContext = pRspContext;
     tsem_wait(&pQInfo->ready);
     *buildRes = true;
diff --git a/src/vnode/src/vnodeRead.c b/src/vnode/src/vnodeRead.c
index 30b982c177..e207b04677 100644
--- a/src/vnode/src/vnodeRead.c
+++ b/src/vnode/src/vnodeRead.c
@@ -281,7 +281,7 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, SVReadMsg *pRead) {
     vDebug("vgId:%d, QInfo:%p, dnode continues to exec query", pVnode->vgId, *qhandle);
 
     // In the retrieve blocking model, only 50% CPU will be used in query processing
-    if (tsRetrieveBlockModel) {
+    if (tsRetrieveBlockingModel) {
       qTableQuery(*qhandle);  // do execute query
       qReleaseQInfo(pVnode->qMgmt, (void **)&qhandle, false);
     } else {
@@ -380,7 +380,7 @@ static int32_t vnodeProcessFetchMsg(SVnodeObj *pVnode, SVReadMsg *pRead) {
     freeHandle = true;
   } else {  // result is not ready, return immediately
     // Only effects in the non-blocking model
-    if (!tsRetrieveBlockModel) {
+    if (!tsRetrieveBlockingModel) {
       if (!buildRes) {
         assert(pRead->rpcHandle != NULL);
 
-- 
GitLab