From db07511c932b5684ccbe2e414890101b4b981c52 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Tue, 29 Aug 2023 16:08:51 +0800
Subject: [PATCH] enh: report time series by period and quantity

---
 source/dnode/vnode/src/meta/metaQuery.c |  5 ++++-
 source/dnode/vnode/src/vnd/vnodeQuery.c | 12 +++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/source/dnode/vnode/src/meta/metaQuery.c b/source/dnode/vnode/src/meta/metaQuery.c
index ca5346eee3..cf59b3c658 100644
--- a/source/dnode/vnode/src/meta/metaQuery.c
+++ b/source/dnode/vnode/src/meta/metaQuery.c
@@ -699,13 +699,16 @@ int64_t metaGetTbNum(SMeta *pMeta) {
 // N.B. Called by statusReq per second
 int64_t metaGetTimeSeriesNum(SMeta *pMeta) {
   // sum of (number of columns of stable -  1) * number of ctables (excluding timestamp column)
-  if (pMeta->pVnode->config.vndStats.numOfTimeSeries <= 0 ||
+  static int64_t vndNumOfCTables = 0;
+  int64_t        numOfCTables = pMeta->pVnode->config.vndStats.numOfCTables;
+  if (numOfCTables - vndNumOfCTables > 100 || pMeta->pVnode->config.vndStats.numOfTimeSeries <= 0 ||
       ++pMeta->pVnode->config.vndStats.itvTimeSeries % (60 * 5) == 0) {
     int64_t num = 0;
     vnodeGetTimeSeriesNum(pMeta->pVnode, &num);
     pMeta->pVnode->config.vndStats.numOfTimeSeries = num;
 
     pMeta->pVnode->config.vndStats.itvTimeSeries = (TD_VID(pMeta->pVnode) % 100) * 2;
+    vndNumOfCTables = numOfCTables;
   }
 
   return pMeta->pVnode->config.vndStats.numOfTimeSeries + pMeta->pVnode->config.vndStats.numOfNTimeSeries;
diff --git a/source/dnode/vnode/src/vnd/vnodeQuery.c b/source/dnode/vnode/src/vnd/vnodeQuery.c
index 1554d58d56..e7a1674d39 100644
--- a/source/dnode/vnode/src/vnd/vnodeQuery.c
+++ b/source/dnode/vnode/src/vnd/vnodeQuery.c
@@ -545,13 +545,11 @@ int32_t vnodeGetCtbNum(SVnode *pVnode, int64_t suid, int64_t *num) {
 }
 
 static int32_t vnodeGetStbColumnNum(SVnode *pVnode, tb_uid_t suid, int *num) {
-  STSchema *pTSchema = metaGetTbTSchema(pVnode->pMeta, suid, -1, 1);
-  // metaGetTbTSchemaEx(pVnode->pMeta, suid, suid, -1, &pTSchema);
-
-  if (pTSchema) {
-    *num = pTSchema->numOfCols;
-
-    taosMemoryFree(pTSchema);
+static int32_t vnodeGetStbColumnNum(SVnode *pVnode, tb_uid_t suid, int *num) {
+  SSchemaWrapper *pSW = metaGetTableSchema(pVnode->pMeta, suid, -1, 1);
+  if (pSW) {
+    *num = pSW->nCols;
+    tDeleteSchemaWrapper(pSW);
   } else {
     *num = 2;
   }