From 4d2d0cf9646cda3d9020ab80ab28fb30f6356e5a Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Tue, 30 Aug 2022 14:49:13 +0800
Subject: [PATCH] enh: add query metric

---
 source/client/inc/clientInt.h  |  3 ++-
 source/client/src/clientEnv.c  | 18 +++++++++---------
 source/client/src/clientImpl.c |  4 +++-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/source/client/inc/clientInt.h b/source/client/inc/clientInt.h
index d57175d31b..4331da1506 100644
--- a/source/client/inc/clientInt.h
+++ b/source/client/inc/clientInt.h
@@ -102,6 +102,7 @@ typedef struct SQueryExecMetric {
   int64_t ctgEnd;       // end to parse, us
   int64_t semanticEnd;
   int64_t planEnd;
+  int64_t resultReady;
   int64_t execEnd;
   int64_t send;  // start to send to server, us
   int64_t rsp;   // receive response from server, us
@@ -370,7 +371,7 @@ void         launchAsyncQuery(SRequestObj* pRequest, SQuery* pQuery, SMetaData*
 int32_t      refreshMeta(STscObj* pTscObj, SRequestObj* pRequest);
 int32_t      updateQnodeList(SAppInstInfo* pInfo, SArray* pNodeList);
 void         doAsyncQuery(SRequestObj* pRequest, bool forceUpdateMeta);
-int32_t      removeMeta(STscObj* pTscObj, SArray* tbList);  
+int32_t      removeMeta(STscObj* pTscObj, SArray* tbList);
 int32_t      handleAlterTbExecRes(void* res, struct SCatalog* pCatalog);
 int32_t      handleCreateTbExecRes(void* res, SCatalog* pCatalog);
 bool         qnodeRequired(SRequestObj* pRequest);
diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c
index 9117287b32..bf92a9ba6a 100644
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
@@ -76,19 +76,19 @@ static void deregisterRequest(SRequestObj *pRequest) {
            pRequest->self, pTscObj->id, pRequest->requestId, duration / 1000, num, currentInst);
 
   if (QUERY_NODE_VNODE_MODIF_STMT == pRequest->stmtType) {
-    tscPerf("insert duration %" PRId64 "us: syntax:%" PRId64 "us, ctg:%" PRId64 "us, semantic:%" PRId64 "us, exec:%" PRId64 "us", 
-            duration, pRequest->metric.syntaxEnd - pRequest->metric.syntaxStart, 
-            pRequest->metric.ctgEnd - pRequest->metric.ctgStart,
-            pRequest->metric.semanticEnd - pRequest->metric.ctgEnd,
+    tscPerf("insert duration %" PRId64 "us: syntax:%" PRId64 "us, ctg:%" PRId64 "us, semantic:%" PRId64
+            "us, exec:%" PRId64 "us",
+            duration, pRequest->metric.syntaxEnd - pRequest->metric.syntaxStart,
+            pRequest->metric.ctgEnd - pRequest->metric.ctgStart, pRequest->metric.semanticEnd - pRequest->metric.ctgEnd,
             pRequest->metric.execEnd - pRequest->metric.semanticEnd);
     atomic_add_fetch_64((int64_t *)&pActivity->insertElapsedTime, duration);
   } else if (QUERY_NODE_SELECT_STMT == pRequest->stmtType) {
-    tscPerf("select duration %" PRId64 "us: syntax:%" PRId64 "us, ctg:%" PRId64 "us, semantic:%" PRId64 "us, planner:%" PRId64 "us, exec:%" PRId64 "us", 
-            duration, pRequest->metric.syntaxEnd - pRequest->metric.syntaxStart, 
-            pRequest->metric.ctgEnd - pRequest->metric.ctgStart,
-            pRequest->metric.semanticEnd - pRequest->metric.ctgEnd,
+    tscPerf("select duration %" PRId64 "us: syntax:%" PRId64 "us, ctg:%" PRId64 "us, semantic:%" PRId64
+            "us, planner:%" PRId64 "us, exec:%" PRId64 "us",
+            duration, pRequest->metric.syntaxEnd - pRequest->metric.syntaxStart,
+            pRequest->metric.ctgEnd - pRequest->metric.ctgStart, pRequest->metric.semanticEnd - pRequest->metric.ctgEnd,
             pRequest->metric.planEnd - pRequest->metric.semanticEnd,
-            nowUs - pRequest->metric.semanticEnd);
+            pRequest->metric.resultReady - pRequest->metric.planEnd);
     atomic_add_fetch_64((int64_t *)&pActivity->queryElapsedTime, duration);
   }
 
diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index 97429e099b..f91ceb3184 100644
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -728,7 +728,7 @@ int32_t handleSubmitExecRes(SRequestObj* pRequest, void* res, SCatalog* pCatalog
       tFreeSTableMetaRsp(blk->pMeta);
       taosMemoryFreeClear(blk->pMeta);
     }
-    
+
     if (NULL == blk->tblFName || 0 == blk->tblFName[0]) {
       continue;
     }
@@ -851,6 +851,8 @@ void schedulerExecCb(SExecResult* pResult, void* param, int32_t code) {
   SRequestObj* pRequest = (SRequestObj*)param;
   pRequest->code = code;
 
+  pRequest->metric.resultReady = taosGetTimestampUs();
+
   if (pResult) {
     memcpy(&pRequest->body.resInfo.execRes, pResult, sizeof(*pResult));
   }