From 592899c9594c273a87d8b983413ee28a840361ec Mon Sep 17 00:00:00 2001
From: hjxilinx <hjxilinx@163.com>
Date: Thu, 30 Apr 2020 22:11:58 +0800
Subject: [PATCH] [td-186] add more log

---
 src/client/src/tscServer.c    | 6 ++----
 src/query/inc/qresultBuf.h    | 2 +-
 src/query/src/qresultBuf.c    | 4 ++--
 src/query/src/queryExecutor.c | 7 ++++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 0ab830bf70..fb7174d988 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -419,13 +419,11 @@ int tscProcessSql(SSqlObj *pSql) {
     type = pQueryInfo->type;
   
     // while numOfTables equals to 0, it must be Heartbeat
-    assert((pQueryInfo->numOfTables == 0 && pQueryInfo->command == TSDB_SQL_HB) ||
-            pQueryInfo->numOfTables > 0);
+    assert((pQueryInfo->numOfTables == 0 && pQueryInfo->command == TSDB_SQL_HB) || pQueryInfo->numOfTables > 0);
   }
 
   tscTrace("%p SQL cmd:%d will be processed, name:%s, type:%d", pSql, pCmd->command, name, type);
-  if (pSql->cmd.command < TSDB_SQL_MGMT) {
-    // the pTableMetaInfo cannot be NULL
+  if (pSql->cmd.command < TSDB_SQL_MGMT) { // the pTableMetaInfo cannot be NULL
     if (pTableMetaInfo == NULL) {
       pSql->res.code = TSDB_CODE_OTHERS;
       return pSql->res.code;
diff --git a/src/query/inc/qresultBuf.h b/src/query/inc/qresultBuf.h
index ebea29feda..2e813dbd98 100644
--- a/src/query/inc/qresultBuf.h
+++ b/src/query/inc/qresultBuf.h
@@ -103,7 +103,7 @@ int32_t getNumOfResultBufGroupId(SDiskbasedResultBuf* pResultBuf);
  * destroy result buffer
  * @param pResultBuf
  */
-void destroyResultBuf(SDiskbasedResultBuf* pResultBuf);
+void destroyResultBuf(SDiskbasedResultBuf* pResultBuf, void* handle);
 
 /**
  *
diff --git a/src/query/src/qresultBuf.c b/src/query/src/qresultBuf.c
index d9a3c6a0bf..bdf700c83f 100644
--- a/src/query/src/qresultBuf.c
+++ b/src/query/src/qresultBuf.c
@@ -191,7 +191,7 @@ SIDList getDataBufPagesIdList(SDiskbasedResultBuf* pResultBuf, int32_t groupId)
   }
 }
 
-void destroyResultBuf(SDiskbasedResultBuf* pResultBuf) {
+void destroyResultBuf(SDiskbasedResultBuf* pResultBuf, void* handle) {
   if (pResultBuf == NULL) {
     return;
   }
@@ -200,7 +200,7 @@ void destroyResultBuf(SDiskbasedResultBuf* pResultBuf) {
     close(pResultBuf->fd);
   }
 
-  qTrace("disk-based output buffer closed, %" PRId64 " bytes, file:%s", pResultBuf->totalBufSize, pResultBuf->path);
+  qTrace("QInfo:%p disk-based output buffer closed, %" PRId64 " bytes, file:%s", handle, pResultBuf->totalBufSize, pResultBuf->path);
   munmap(pResultBuf->pBuf, pResultBuf->totalBufSize);
   unlink(pResultBuf->path);
   
diff --git a/src/query/src/queryExecutor.c b/src/query/src/queryExecutor.c
index 5b8b705944..a3ffb20952 100644
--- a/src/query/src/queryExecutor.c
+++ b/src/query/src/queryExecutor.c
@@ -1500,8 +1500,9 @@ static void teardownQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv) {
   }
 
   SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  qTrace("QInfo:%p teardown runtime env", GET_QINFO_ADDR(pRuntimeEnv));
+  SQInfo* pQInfo = (SQInfo*) GET_QINFO_ADDR(pRuntimeEnv);
+  
+  qTrace("QInfo:%p teardown runtime env", pQInfo);
   cleanupTimeWindowInfo(&pRuntimeEnv->windowResInfo, pQuery->numOfOutput);
 
   if (pRuntimeEnv->pCtx != NULL) {
@@ -1531,7 +1532,7 @@ static void teardownQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv) {
     tfree(pRuntimeEnv->pInterpoBuf);
   }
 
-  destroyResultBuf(pRuntimeEnv->pResultBuf);
+  destroyResultBuf(pRuntimeEnv->pResultBuf, pQInfo);
   tsdbCleanupQueryHandle(pRuntimeEnv->pQueryHandle);
   tsdbCleanupQueryHandle(pRuntimeEnv->pSecQueryHandle);
 
-- 
GitLab