diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 20d14958c8f0bcc764468af1f7d8fb520f1f2e84..e4728a410a0a9f0d1f8d0002f35a35fe5fda9f88 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -8701,13 +8701,10 @@ static int32_t doLoadAllTableMeta(SSqlObj* pSql, SQueryInfo* pQueryInfo, SSqlNod
 
         assert(existVgroupInfo.inUse >= 0);
         SVgroupMsg *pVgroup = &pTableMetaInfo->vgroupList->vgroups[j];
-        memcpy(pVgroup, &existVgroupInfo, sizeof(SVgroupMsg));
-//        pVgroup->numOfEps = existVgroupInfo.numOfEps;
-//        pVgroup->vgId = existVgroupInfo.vgId;
-//        for (int32_t k = 0; k < existVgroupInfo.numOfEps; ++k) {
-//          pVgroup->epAddr[k].port = existVgroupInfo.ep[k].port;
-//          pVgroup->epAddr[k].fqdn = strndup(existVgroupInfo.ep[k].fqdn, TSDB_FQDN_LEN);
-//        }
+
+        pVgroup->numOfEps = existVgroupInfo.numOfEps;
+        pVgroup->vgId = existVgroupInfo.vgId;
+        memcpy(&pVgroup->epAddr, &existVgroupInfo.ep, sizeof(pVgroup->epAddr));
       }
     }
   }
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index faa1c2ff41147e63faa2c71dda34a8b026c28c19..5fdaad0d667c19548f699a9a8cfed7c9f017ad1b 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -588,8 +588,8 @@ static bool tscKillQueryInDnode(SSqlObj* pSql) {
     pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
     tscDebug("0x%"PRIx64" send msg to dnode to free qhandle ASAP before free sqlObj, command:%s", pSql->self, sqlCmd[pCmd->command]);
 
-//    tscBuildAndSendRequest(pSql, NULL);
-//    return false;
+    tscBuildAndSendRequest(pSql, NULL);
+    return false;
   }
 
   return true;
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 1a88270b27c99af73100ada52008792c207b183b..8a52bc776d908992a7459a96ad36160a7a96b963 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -748,7 +748,6 @@ void tscBuildVgroupTableInfo(SSqlObj* pSql, STableMetaInfo* pTableMetaInfo, SArr
       for (int32_t m = 0; m < pvg->numOfVgroups; ++m) {
         if (tt->vgId == pvg->vgroups[m].vgId) {
           memcpy(&info.vgInfo, &pvg->vgroups[m], sizeof(info.vgInfo));
-//          tscSVgroupInfoCopy(&info.vgInfo, &pvg->vgroups[m]);
           break;
         }
       }
@@ -2579,9 +2578,6 @@ int32_t tscHandleMasterSTableQuery(SSqlObj *pSql) {
     
     tscDebug("0x%"PRIx64" sub:0x%"PRIx64" create subquery success. orderOfSub:%d", pSql->self, pNew->self,
         trs->subqueryIndex);
-
-    tfree(trs->localBuffer);
-    tfree(trs);
   }
   
   if (i < pState->numOfSub) {
@@ -2599,8 +2595,7 @@ int32_t tscHandleMasterSTableQuery(SSqlObj *pSql) {
     return pRes->code;
   }
 
-  pSql->fp(pSql->param, pSql, 0);
-//  doConcurrentlySendSubQueries(pSql);
+  doConcurrentlySendSubQueries(pSql);
   return TSDB_CODE_SUCCESS;
 }
 
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index 616ee1d972e892442a3c0a1eddef318316f71692..3c1d89134c0916181f01941fc73a0d7a2e7847b0 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -766,12 +766,6 @@ typedef struct SSTableVgroupMsg {
   int32_t numOfTables;
 } SSTableVgroupMsg, SSTableVgroupRspMsg;
 
-//typedef struct {
-//  int32_t       vgId;
-//  int8_t        numOfEps;
-//  SEpAddr1      epAddr[TSDB_MAX_REPLICA];
-//} SVgroupInfo;
-
 typedef struct {
   int32_t    vgId;
   int8_t     numOfEps;