Merge pull request #2232 from taosdata/origin/hotfix/TD-557

Origin/hotfix/td 557

src/client/src/tscAsync.c

@@ -449,14 +449,13 @@ void tscTableMetaCallBack(void *param, TAOS_RES *res, int code) {
       tscTrace("%p update table meta in local cache, continue to process sql and send corresponding subquery", pSql);
 
       STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
-      if (pTableMetaInfo->pTableMeta == NULL){
-        code = tscGetTableMeta(pSql, pTableMetaInfo);
-        if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
-          return;
-        } else {
-          assert(code == TSDB_CODE_SUCCESS);      
-        }
+      code = tscGetTableMeta(pSql, pTableMetaInfo);
+      if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+        return;
+      } else {
+        assert(code == TSDB_CODE_SUCCESS);      
       }
+     
       
       assert((tscGetNumOfTags(pTableMetaInfo->pTableMeta) != 0) && pTableMetaInfo->vgroupIndex >= 0 && pSql->param != NULL);
 

src/client/src/tscUtil.c

@@ -396,14 +396,12 @@ void tscPartiallyFreeSqlObj(SSqlObj* pSql) {
   if (pObj->signature == pObj) {
     pthread_mutex_lock(&pObj->mutex);
     tfree(pSql->sqlstr);
-    pSql->sqlstr = NULL;
     pthread_mutex_unlock(&pObj->mutex);
   }
   
   tscFreeSqlResult(pSql);
   
   tfree(pSql->pSubs);
-  pSql->pSubs = NULL;
   pSql->freed = 0;
   pSql->numOfSubs = 0;