From 7efc73bca751c0c8628cd5173251f5aad5cc4a64 Mon Sep 17 00:00:00 2001
From: wpan <wpan@taosdata.com>
Date: Sat, 28 Aug 2021 15:27:30 +0800
Subject: [PATCH] fix compile issue

---
 src/client/src/tscSubquery.c | 61 ++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index a5d72ec3b9..c4584d6675 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -860,6 +860,37 @@ static bool checkForDuplicateTagVal(SSchema* pColSchema, SJoinSupporter* p1, SSq
   return true;
 }
 
+
+bool tscReparseSql(SSqlObj *sql, int32_t code){
+  if (!((code == TSDB_CODE_TDB_INVALID_TABLE_ID || code == TSDB_CODE_VND_INVALID_VGROUP_ID) && sql->retry < sql->maxRetry)) {
+    return true;
+  }
+
+  sql->res.code = TSDB_CODE_SUCCESS;
+  sql->retry++;
+  
+  tscDebug("0x%"PRIx64" retry parse sql and send query, prev error: %s, retry:%d", sql->self,
+      tstrerror(code), sql->retry);
+  
+  tscResetSqlCmd(&sql->cmd, true);
+  code = tsParseSql(sql, true);
+  if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+    return false;
+  }
+  
+  if (code != TSDB_CODE_SUCCESS) {
+    sql->res.code = code;
+    tscAsyncResultOnError(sql);
+    return false;
+  }
+  
+  SQueryInfo* pQueryInfo = tscGetQueryInfo(&sql->cmd);
+  executeQuery(sql, pQueryInfo);
+
+  return false;
+}
+
+
 static void setTidTagType(SJoinSupporter* p, uint8_t type) {
   for (int32_t i = 0; i < p->num; ++i) {
     STidTags * tag = (STidTags*) varDataVal(p->pIdTagList + i * p->tagSize);
@@ -1749,36 +1780,6 @@ void tscSetupOutputColumnIndex(SSqlObj* pSql) {
 }
 
 
-bool tscReparseSql(SSqlObj *sql, int32_t code){
-  if (!((code == TSDB_CODE_TDB_INVALID_TABLE_ID || code == TSDB_CODE_VND_INVALID_VGROUP_ID) && sql->retry < sql->maxRetry)) {
-    return true;
-  }
-
-  sql->res.code = TSDB_CODE_SUCCESS;
-  sql->retry++;
-  
-  tscDebug("0x%"PRIx64" retry parse sql and send query, prev error: %s, retry:%d", sql->self,
-      tstrerror(code), sql->retry);
-  
-  tscResetSqlCmd(&sql->cmd, true);
-  code = tsParseSql(sql, true);
-  if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
-    return false;
-  }
-  
-  if (code != TSDB_CODE_SUCCESS) {
-    sql->res.code = code;
-    tscAsyncResultOnError(sql);
-    return false;
-  }
-  
-  SQueryInfo* pQueryInfo = tscGetQueryInfo(&sql->cmd);
-  executeQuery(sql, pQueryInfo);
-
-  return false;
-}
-
-
 void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code) {
   SSqlObj* pSql = (SSqlObj*)tres;
 
-- 
GitLab