diff --git a/src/client/src/tscAsync.c b/src/client/src/tscAsync.c
index 3fedc9e7ad7c9356c59ea75d16971fd338bb35ac..3c54176d0a6b2d1ff6fc567a5ca4760e8c1a1e79 100644
--- a/src/client/src/tscAsync.c
+++ b/src/client/src/tscAsync.c
@@ -42,11 +42,13 @@ static void tscAsyncFetchSingleRowProxy(void *param, TAOS_RES *tres, int numOfRo
 int doAsyncParseSql(SSqlObj* pSql) {
   SSqlCmd* pCmd = &pSql->cmd;
   SSqlRes* pRes = &pSql->res;
+
   int32_t code = tscAllocPayload(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE);
   if (code != TSDB_CODE_SUCCESS) {
     tscError("failed to malloc payload");
+    pSql->res.code = code;
+
     tscQueueAsyncRes(pSql);
-//    tscQueueAsyncRes(pSql->fp, pSql->param, TSDB_CODE_TSC_OUT_OF_MEMORY);
     return code;
   }
   
diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index d821271857ae64f834e182a169f90681498d6255..4b6178eb610a8250931f974e01e4d28916d4d25b 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -1354,7 +1354,7 @@ int tsParseSql(SSqlObj *pSql, bool initialParse) {
     if (TSDB_CODE_SUCCESS != ret) {
       return ret;
     }
-    
+
     SSqlInfo SQLInfo = qSQLParse(pSql->sqlstr);
     ret = tscToSQLCmd(pSql, &SQLInfo);
     SQLInfoDestroy(&SQLInfo);
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 1384dcecff04b197dae5bd8209cd767c2fd0d7cf..6e3602b69d5bd455255b2ebace20b5a797ab147a 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -198,8 +198,6 @@ int tscSendMsgToServer(SSqlObj *pSql) {
   };
 
   pSql->SRpcReqContext = rpcSendRequest(pObj->pDnodeConn, &pSql->ipList, &rpcMsg);
-  assert(pSql->SRpcReqContext != NULL);
-
   return TSDB_CODE_SUCCESS;
 }
 
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index a3e655a9711fe0df8a8bac95846a0869d2b1a6ca..aaa5ab291f5760e1518c7bb306627996f549967f 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -1896,7 +1896,8 @@ int32_t tscHandleMultivnodeInsert(SSqlObj *pSql) {
   tscTrace("%p submit data to %d vnode(s)", pSql, pDataBlocks->nSize);
   SSubqueryState *pState = calloc(1, sizeof(SSubqueryState));
   pState->numOfTotal = pSql->numOfSubs;
-  
+  pState->numOfRemain = pState->numOfTotal;
+
   pRes->code = TSDB_CODE_SUCCESS;
   
   int32_t i = 0;
@@ -1917,8 +1918,7 @@ int32_t tscHandleMultivnodeInsert(SSqlObj *pSql) {
      */
     pNew->fetchFp = pNew->fp;
     pSql->pSubs[i] = pNew;
-    pNew->fetchFp = pNew->fp;
-    
+
     tscTrace("%p sub:%p create subObj success. orderOfSub:%d", pSql, pNew, i);
   }
   
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index cbf1aa12bef7325969632d71a556e55b9fc999c6..110a435e571e2a7595f00d64f9a7f2ed19c3fdee 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -1581,24 +1581,6 @@ void tscClearSubqueryInfo(SSqlCmd* pCmd) {
   }
 }
 
-void doRemoveTableMetaInfo(SQueryInfo* pQueryInfo, int32_t index, bool removeFromCache) {
-  if (index < 0 || index >= pQueryInfo->numOfTables) {
-    return;
-  }
-  
-  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index);
-  
-  tscClearTableMetaInfo(pTableMetaInfo, removeFromCache);
-  free(pTableMetaInfo);
-  
-  int32_t after = pQueryInfo->numOfTables - index - 1;
-  if (after > 0) {
-    memmove(&pQueryInfo->pTableMetaInfo[index], &pQueryInfo->pTableMetaInfo[index + 1], after * POINTER_BYTES);
-  }
-  
-  pQueryInfo->numOfTables -= 1;
-}
-
 void clearAllTableMetaInfo(SQueryInfo* pQueryInfo, const char* address, bool removeFromCache) {
   tscTrace("%p deref the table meta in cache, numOfTables:%d", address, pQueryInfo->numOfTables);