From 8195149c72e084c3c5353893e0fd08374c26ed2c Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 25 Sep 2020 14:12:39 +0800
Subject: [PATCH] [td-225].

---
 src/client/src/tscServer.c | 4 ++--
 src/client/src/tscSql.c    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 3cbb0d936e..ac4bc5b066 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -259,8 +259,6 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet) {
     return;
   }
 
-  pSql->pRpcCtx = NULL;    // clear the rpcCtx
-
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
   if (pQueryInfo != NULL && pQueryInfo->type == TSDB_QUERY_TYPE_FREE_RESOURCE) {
     tscDebug("%p sqlObj needs to be released or DB connection is closed, cmd:%d type:%d, pObj:%p signature:%p",
@@ -389,6 +387,7 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet) {
   }
 
   rpcFreeCont(rpcMsg->pCont);
+
 }
 
 int doProcessSql(SSqlObj *pSql) {
@@ -475,6 +474,7 @@ void tscKillSTableQuery(SSqlObj *pSql) {
     pSub->res.code = TSDB_CODE_TSC_QUERY_CANCELLED;
     if (pSub->pRpcCtx != NULL) {
       rpcCancelRequest(pSub->pRpcCtx);
+      pSub->pRpcCtx = NULL;
     }
 
     tscQueueAsyncRes(pSub); // async res? not other functions?
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index 430a762321..acc93530e3 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -698,6 +698,7 @@ void taos_stop_query(TAOS_RES *res) {
     tscKillSTableQuery(pSql);
   } else {
     if (pSql->cmd.command < TSDB_SQL_LOCAL) {
+      assert(pSql->pRpcCtx != NULL);
       rpcCancelRequest(pSql->pRpcCtx);
     }
   }