From ce863c00f6a229152db51c2893fb0a8b393468a3 Mon Sep 17 00:00:00 2001
From: hjxilinx <hjxilinx@163.com>
Date: Wed, 13 Nov 2019 10:14:35 +0800
Subject: [PATCH] [TBASE-1112]

---
 src/client/src/tscServer.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index aa80e505d5..67118b50e2 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -1332,7 +1332,7 @@ int tscBuildRetrieveMsg(SSqlObj *pSql) {
   *((uint64_t *)pMsg) = pSql->res.qhandle;
   pMsg += sizeof(pSql->res.qhandle);
 
-  *pMsg = htons(pSql->cmd.type);
+  *((uint16_t*)pMsg) = htons(pSql->cmd.type);
   pMsg += sizeof(pSql->cmd.type);
 
   msgLen = pMsg - pStart;
@@ -3450,7 +3450,12 @@ int tscProcessRetrieveRspFromVnode(SSqlObj *pSql) {
   tscSetResultPointer(pCmd, pRes);
   pRes->row = 0;
 
-  if (pRes->numOfRows == 0 && !(tscProjectionQueryOnMetric(pCmd) && pRes->offset > 0)) {
+  /**
+   * If the query result is exhausted, the connection will be recycled.
+   * If current query is to free resource at server side, the connection will be recycle.
+   */
+  if ((pRes->numOfRows == 0 && !(tscProjectionQueryOnMetric(pCmd) && pRes->offset > 0)) ||
+      ((pCmd->type & TSDB_QUERY_TYPE_FREE_RESOURCE) == TSDB_QUERY_TYPE_FREE_RESOURCE)) {
     taosAddConnIntoCache(tscConnCache, pSql->thandle, pSql->ip, pSql->vnode, pObj->user);
     pSql->thandle = NULL;
   } else {