Merge pull request #15854 from taosdata/fix/TD-18112

Fix/td 18112

source/dnode/vnode/src/meta/metaQuery.c

@@ -481,7 +481,7 @@ int64_t metaGetTbNum(SMeta *pMeta) {
   /* int64_t num = 0; */
   /* vnodeGetAllCtbNum(pMeta->pVnode, &num); */
 
-  return pMeta->pVnode->config.vndStats.numOfCTables;
+  return pMeta->pVnode->config.vndStats.numOfCTables + pMeta->pVnode->config.vndStats.numOfNTables;
 }
 
 // N.B. Called by statusReq per second

source/dnode/vnode/src/vnd/vnodeQuery.c

@@ -473,7 +473,7 @@ int32_t vnodeGetTimeSeriesNum(SVnode *pVnode, int64_t *num) {
     int numOfCols = 0;
     vnodeGetStbColumnNum(pVnode, id, &numOfCols);
 
-    *num += ctbNum * numOfCols;
+    *num += ctbNum * (numOfCols - 1);
   }
 
   metaCloseStbCursor(pCur);