From 497159f3aa53b605585378fc4d5804a573cf1a4f Mon Sep 17 00:00:00 2001
From: wpan <wpan@taosdata.com>
Date: Tue, 17 Aug 2021 09:40:56 +0800
Subject: [PATCH] fix subquery reparse sql issue

---
 src/client/src/tscSubquery.c | 13 +++++++++----
 src/client/src/tscUtil.c     | 18 ++++++++++++------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 553d2c0804..04b10caa4e 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -2735,18 +2735,23 @@ void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numO
       tscDebug("0x%"PRIx64" retry parse sql and send query, prev error: %s, retry:%d", pParentSql->self,
           tstrerror(code), pParentSql->retry);
 
-      code = tsParseSql(pParentSql, true);
+      SSqlObj *userSql = ((SRetrieveSupport*)pParentSql->param)->pParentSql;
+
+      code = tsParseSql(userSql, true);
       if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
         return;
       }
 
       if (code != TSDB_CODE_SUCCESS) {
-        pParentSql->res.code = code;
-        tscAsyncResultOnError(pParentSql);
+        userSql->res.code = code;
+        tscAsyncResultOnError(userSql);
         return;
       }
 
-      executeQuery(pParentSql, pQueryInfo);
+      doCleanupSubqueries(userSql, userSql->subState.numOfSub);
+
+      pQueryInfo = tscGetQueryInfo(&userSql->cmd);
+      executeQuery(userSql, pQueryInfo);
     } else {
       (*pParentSql->fp)(pParentSql->param, pParentSql, pParentSql->res.code);
     }
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 8c2165cadf..ae78c7a81e 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -3771,19 +3771,24 @@ static void tscSubqueryCompleteCallback(void* param, TAOS_RES* tres, int code) {
     tscDebug("0x%"PRIx64" retry parse sql and send query, prev error: %s, retry:%d", pParentSql->self,
              tstrerror(code), pParentSql->retry);
 
-    code = tsParseSql(pParentSql, true);
+    SSqlObj *userSql = ((SRetrieveSupport*)pParentSql->param)->pParentSql;
+
+    code = tsParseSql(userSql, true);
     if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
       return;
     }
 
     if (code != TSDB_CODE_SUCCESS) {
-      pParentSql->res.code = code;
-      tscAsyncResultOnError(pParentSql);
+      userSql->res.code = code;
+      tscAsyncResultOnError(userSql);
       return;
     }
 
-    SQueryInfo *pQueryInfo = tscGetQueryInfo(pParentCmd);
-    executeQuery(pParentSql, pQueryInfo);
+    SQueryInfo *pQueryInfo = tscGetQueryInfo(&userSql->cmd);
+
+    doCleanupSubqueries(userSql, userSql->subState.numOfSub);
+    
+    executeQuery(userSql, pQueryInfo);
     return;
   }
 
@@ -3805,8 +3810,9 @@ void executeQuery(SSqlObj* pSql, SQueryInfo* pQueryInfo) {
   }
 
   if (taosArrayGetSize(pQueryInfo->pUpstream) > 0) {  // nest query. do execute it firstly
+    assert(pSql->subState.numOfSub == 0);
     pSql->subState.numOfSub = (int32_t) taosArrayGetSize(pQueryInfo->pUpstream);
-
+    assert(pSql->pSubs == NULL);
     pSql->pSubs = calloc(pSql->subState.numOfSub, POINTER_BYTES);
     pSql->subState.states = calloc(pSql->subState.numOfSub, sizeof(int8_t));
     code = pthread_mutex_init(&pSql->subState.mutex, NULL);