Merge pull request #2157 from taosdata/feature/query

[td-225] fix bugs in stable/metric.sim

src/client/src/tscServer.c

@@ -336,7 +336,6 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcIpSet *pIpSet) {
   if (rpcMsg->code != TSDB_CODE_ACTION_IN_PROGRESS) {
     rpcMsg->code = (pRes->code == TSDB_CODE_SUCCESS) ? pRes->numOfRows: pRes->code;
     
-    tscTrace("%p SQL result:%s res:%p", pSql, tstrerror(pRes->code), pSql);
     bool shouldFree = tscShouldBeFreed(pSql);
     (*pSql->fp)(pSql->param, pSql, rpcMsg->code);
 

src/client/src/tscUtil.c

@@ -404,8 +404,6 @@ void tscPartiallyFreeSqlObj(SSqlObj* pSql) {
   pSql->numOfSubs = 0;
   
   tscResetSqlCmdObj(pCmd);
-  
-  tscTrace("%p partially free sqlObj completed", pSql);
 }
 
 void tscFreeSqlObj(SSqlObj* pSql) {

src/mnode/src/mnodeTable.c

@@ -1284,7 +1284,7 @@ static int32_t mnodeProcessSuperTableVgroupMsg(SMnodeMsg *pMsg) {
   char *msg = (char *)pRsp + sizeof(SCMSTableVgroupRspMsg);
 
   for (int32_t i = 0; i < numOfTable; ++i) {
-    char *stableName = (char*)pInfo + sizeof(SCMSTableVgroupMsg) + (TSDB_TABLE_ID_LEN) * i;
+    char *          stableName = (char *)pInfo + sizeof(SCMSTableVgroupMsg) + (TSDB_TABLE_ID_LEN)*i;
     SSuperTableObj *pTable = mnodeGetSuperTable(stableName);
     if (pTable == NULL) {
       mError("stable:%s, not exist while get stable vgroup info", stableName);
@@ -1294,9 +1294,15 @@ static int32_t mnodeProcessSuperTableVgroupMsg(SMnodeMsg *pMsg) {
     if (pTable->vgHash == NULL) {
       mError("stable:%s, not vgroup exist while get stable vgroup info", stableName);
       mnodeDecTableRef(pTable);
-      continue;
-    }
+
+      // even this super table has no corresponding table, still return
+      pRsp->numOfTables++;
 
+      SVgroupsInfo *pVgroupInfo = (SVgroupsInfo *)msg;
+      pVgroupInfo->numOfVgroups = 0;
+      
+      msg += sizeof(SVgroupsInfo);
+    } else {
       SVgroupsInfo *pVgroupInfo = (SVgroupsInfo *)msg;
 
       SHashMutableIterator *pIter = taosHashCreateIter(pTable->vgHash);
@@ -1330,6 +1336,7 @@ static int32_t mnodeProcessSuperTableVgroupMsg(SMnodeMsg *pMsg) {
       msg += sizeof(SVgroupsInfo) + vgSize * sizeof(SCMVgroupInfo);
       pRsp->numOfTables++;
     }
+  }
 
   if (pRsp->numOfTables != numOfTable) {
     rpcFreeCont(pRsp);