From 50db5c92752422f7a3a8db90fd06faae78d3c564 Mon Sep 17 00:00:00 2001
From: lihui <huili@taosdata.com>
Date: Mon, 11 May 2020 12:02:30 +0800
Subject: [PATCH] [TD-161]

---
 src/client/src/tscServer.c | 3 ++-
 src/client/src/tscUtil.c   | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 10ea9de835..08ea7f77ba 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -3701,7 +3701,8 @@ int tscGetMetricMeta(SSqlObj *pSql, int32_t clauseIndex) {
   for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
     SMeterMetaInfo *pMMInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, i);
 
-    SMeterMeta *pMeterMeta = taosGetDataFromCache(tscCacheHandle, pMMInfo->name);
+    SMeterMeta *pMeterMeta = (SMeterMeta *)taosGetDataFromExists(tscCacheHandle, pQueryInfo->pMeterInfo[i]->pMeterMeta);
+    assert(pMeterMeta != NULL);
     tscAddMeterMetaInfo(pNewQueryInfo, pMMInfo->name, pMeterMeta, NULL, pMMInfo->numOfTags, pMMInfo->tagColumnIndex);
   }
 
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 77d4a95c14..1611c5b724 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -457,9 +457,11 @@ void tscFreeSqlObjPartial(SSqlObj* pSql) {
   pCmd->command = 0;
 
   // pSql->sqlstr will be used by tscBuildQueryStreamDesc
-  pthread_mutex_lock(&pObj->mutex);
-  tfree(pSql->sqlstr);
-  pthread_mutex_unlock(&pObj->mutex);
+  if (pObj->signature == pObj) {
+    pthread_mutex_lock(&pObj->mutex);
+    tfree(pSql->sqlstr);
+    pthread_mutex_unlock(&pObj->mutex);
+  }
 
   tscFreeSqlResult(pSql);
   tfree(pSql->pSubs);
-- 
GitLab