From 35b82a644f559a240f78cde78af37bd778dd4626 Mon Sep 17 00:00:00 2001
From: wpan <wpan@taosdata.com>
Date: Wed, 18 Aug 2021 09:40:18 +0800
Subject: [PATCH] fix nested query bug

---
 src/client/inc/tscSubquery.h |  2 --
 src/client/src/tscSubquery.c | 42 ++++++++----------------------------
 src/client/src/tscUtil.c     | 23 +++++++++-----------
 3 files changed, 19 insertions(+), 48 deletions(-)

diff --git a/src/client/inc/tscSubquery.h b/src/client/inc/tscSubquery.h
index 99215551c3..a012ca5a7f 100644
--- a/src/client/inc/tscSubquery.h
+++ b/src/client/inc/tscSubquery.h
@@ -52,8 +52,6 @@ int tsInsertInitialCheck(SSqlObj *pSql);
 
 void doCleanupSubqueries(SSqlObj *pSql, int32_t numOfSubs);
 
-void tscFreeRetrieveSupporters(SSqlObj *pSql);
-
 void tscFreeRetrieveSup(SSqlObj *pSql);
 
 
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index c5afbe6dba..d16d744393 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -2040,11 +2040,8 @@ void doCleanupSubqueries(SSqlObj *pSql, int32_t numOfSubs) {
   for(int32_t i = 0; i < numOfSubs; ++i) {
     SSqlObj* pSub = pSql->pSubs[i];
     assert(pSub != NULL);
-    
-    SRetrieveSupport* pSupport = pSub->param;
-    
-    tfree(pSupport->localBuffer);
-    tfree(pSupport);
+
+    tscFreeRetrieveSup(pSub);
     
     taos_free_result(pSub);
   }
@@ -2576,18 +2573,6 @@ void tscFreeRetrieveSup(SSqlObj *pSql) {
   tfree(trsupport);
 }
 
-void tscFreeRetrieveSupporters(SSqlObj *pSql) {  
-  for(int32_t i = 0; i < pSql->subState.numOfSub; ++i) {
-    SSqlObj* pSub = pSql->pSubs[i];
-    assert(pSub != NULL);
-
-    tscFreeRetrieveSup(pSub);
-  }
-}
-
-
-
-
 static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfRows);
 static void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numOfRows);
 
@@ -2732,30 +2717,21 @@ void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numO
   if (!TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_JOIN_SEC_STAGE)) {
 
     int32_t code = pParentSql->res.code;
-    if ((code == TSDB_CODE_TDB_INVALID_TABLE_ID || code == TSDB_CODE_VND_INVALID_VGROUP_ID) && pParentSql->retry < pParentSql->maxRetry) {
-      // remove the cached tableMeta and vgroup id list, and then parse the sql again
-      SSqlCmd* pParentCmd = &pParentSql->cmd;
-      STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pParentCmd, 0);
-      tscRemoveTableMetaBuf(pTableMetaInfo, pParentSql->self);
-
-      pParentCmd->pTableMetaMap = tscCleanupTableMetaMap(pParentCmd->pTableMetaMap);
-      pParentCmd->pTableMetaMap = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK);
-
-      SSqlObj *userSql = ((SRetrieveSupport*)pParentSql->param)->pParentSql;
+    SSqlObj *userSql = ((SRetrieveSupport*)pParentSql->param)->pParentSql;
 
+    if ((code == TSDB_CODE_TDB_INVALID_TABLE_ID || code == TSDB_CODE_VND_INVALID_VGROUP_ID) && userSql->retry < userSql->maxRetry) {
       tscFreeRetrieveSup(pParentSql);
-      tscFreeRetrieveSup(userSql);
 
       tscFreeSubobj(userSql);      
       tfree(userSql->pSubs);
 
-      pParentSql->res.code = TSDB_CODE_SUCCESS;
-      pParentSql->retry++;
+      userSql->res.code = TSDB_CODE_SUCCESS;
+      userSql->retry++;
 
-      tscDebug("0x%"PRIx64" retry parse sql and send query, prev error: %s, retry:%d", pParentSql->self,
-          tstrerror(code), pParentSql->retry);
+      tscDebug("0x%"PRIx64" retry parse sql and send query, prev error: %s, retry:%d", userSql->self,
+          tstrerror(code), userSql->retry);
 
-      tscResetSqlCmd(&userSql->cmd, false);
+      tscResetSqlCmd(&userSql->cmd, true);
       code = tsParseSql(userSql, true);
       if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
         return;
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index a79f50b63d..06b61d443d 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -3758,29 +3758,26 @@ static void tscSubqueryCompleteCallback(void* param, TAOS_RES* tres, int code) {
     // todo refactor
     tscDebug("0x%"PRIx64" all subquery response received, retry", pParentSql->self);
 
-    SSqlCmd* pParentCmd = &pParentSql->cmd;
-    STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pParentCmd, 0);
-    tscRemoveTableMetaBuf(pTableMetaInfo, pParentSql->self);
-
-    pParentCmd->pTableMetaMap = tscCleanupTableMetaMap(pParentCmd->pTableMetaMap);
-    pParentCmd->pTableMetaMap = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK);
-
     SSqlObj *userSql = ((SRetrieveSupport*)pParentSql->param)->pParentSql;
 
     tscFreeRetrieveSup(pParentSql);
-    tscFreeRetrieveSup(userSql);
+
+    if (code && !((code == TSDB_CODE_TDB_INVALID_TABLE_ID || code == TSDB_CODE_VND_INVALID_VGROUP_ID) && userSql->retry < userSql->maxRetry)) {
+      tscAsyncResultOnError(pParentSql);
+      return;
+    }
 
     tscFreeSubobj(userSql);    
     tfree(userSql->pSubs);
 
-    pParentSql->res.code = TSDB_CODE_SUCCESS;
-    pParentSql->retry++;
+    userSql->res.code = TSDB_CODE_SUCCESS;
+    userSql->retry++;
 
-    tscDebug("0x%"PRIx64" retry parse sql and send query, prev error: %s, retry:%d", pParentSql->self,
-             tstrerror(code), pParentSql->retry);
+    tscDebug("0x%"PRIx64" retry parse sql and send query, prev error: %s, retry:%d", userSql->self,
+             tstrerror(code), userSql->retry);
 
     
-    tscResetSqlCmd(&userSql->cmd, false);
+    tscResetSqlCmd(&userSql->cmd, true);
     
     code = tsParseSql(userSql, true);
     if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {