Merge pull request #16500 from taosdata/fix/TD-18726

fix: stat timeseries every minute to avoid dnode offline caused by ma…

source/dnode/vnode/inc/vnode.h

@@ -157,17 +157,17 @@ void   tsdbCacheSetCapacity(SVnode *pVnode, size_t capacity);
 size_t tsdbCacheGetCapacity(SVnode *pVnode);
 
 // tq
-typedef struct SMetaTableInfo{
+typedef struct SMetaTableInfo {
   int64_t         suid;
   int64_t         uid;
   SSchemaWrapper *schema;
   char            tbName[TSDB_TABLE_NAME_LEN];
-}SMetaTableInfo;
+} SMetaTableInfo;
 
-typedef struct SIdInfo{
-  int64_t         version;
-  int32_t         index;
-}SIdInfo;
+typedef struct SIdInfo {
+  int64_t version;
+  int32_t index;
+} SIdInfo;
 
 typedef struct SSnapContext {
   SMeta    *pMeta;
@@ -180,8 +180,8 @@ typedef struct SSnapContext {
   SArray   *idList;
   int32_t   index;
   bool      withMeta;
-  bool      queryMetaOrData;    // true-get meta, false-get data
-}SSnapContext;
+  bool      queryMetaOrData;  // true-get meta, false-get data
+} SSnapContext;
 
 typedef struct STqReader {
   int64_t           ver;
@@ -232,11 +232,12 @@ int32_t vnodeSnapWriterOpen(SVnode *pVnode, int64_t sver, int64_t ever, SVSnapWr
 int32_t vnodeSnapWriterClose(SVSnapWriter *pWriter, int8_t rollback, SSnapshot *pSnapshot);
 int32_t vnodeSnapWrite(SVSnapWriter *pWriter, uint8_t *pData, uint32_t nData);
 
-int32_t buildSnapContext(SMeta* pMeta, int64_t snapVersion, int64_t suid, int8_t subType, bool withMeta, SSnapContext** ctxRet);
-int32_t getMetafromSnapShot(SSnapContext* ctx, void **pBuf, int32_t *contLen, int16_t *type, int64_t *uid);
-SMetaTableInfo getUidfromSnapShot(SSnapContext* ctx);
-int32_t setForSnapShot(SSnapContext* ctx, int64_t uid);
-int32_t destroySnapContext(SSnapContext* ctx);
+int32_t        buildSnapContext(SMeta *pMeta, int64_t snapVersion, int64_t suid, int8_t subType, bool withMeta,
+                                SSnapContext **ctxRet);
+int32_t        getMetafromSnapShot(SSnapContext *ctx, void **pBuf, int32_t *contLen, int16_t *type, int64_t *uid);
+SMetaTableInfo getUidfromSnapShot(SSnapContext *ctx);
+int32_t        setForSnapShot(SSnapContext *ctx, int64_t uid);
+int32_t        destroySnapContext(SSnapContext *ctx);
 
 // structs
 struct STsdbCfg {
@@ -259,6 +260,7 @@ typedef struct {
   int64_t numOfNTables;
   int64_t numOfNTimeSeries;
   int64_t numOfTimeSeries;
+  int64_t itvTimeSeries;
   int64_t pointsWritten;
   int64_t totalStorage;
   int64_t compStorage;

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

@@ -615,9 +615,13 @@ 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)
-  int64_t num = 0;
-  vnodeGetTimeSeriesNum(pMeta->pVnode, &num);
-  pMeta->pVnode->config.vndStats.numOfTimeSeries = num;
+  if (pMeta->pVnode->config.vndStats.numOfTimeSeries <= 0 || ++pMeta->pVnode->config.vndStats.itvTimeSeries % 60 == 0) {
+    int64_t num = 0;
+    vnodeGetTimeSeriesNum(pMeta->pVnode, &num);
+    pMeta->pVnode->config.vndStats.numOfTimeSeries = num;
+
+    pMeta->pVnode->config.vndStats.itvTimeSeries = 0;
+  }
 
   return pMeta->pVnode->config.vndStats.numOfTimeSeries + pMeta->pVnode->config.vndStats.numOfNTimeSeries;
 }
@@ -890,7 +894,7 @@ const void *metaGetTableTagVal(void *pTag, int16_t type, STagVal *val) {
 
 #ifdef TAG_FILTER_DEBUG
   if (IS_VAR_DATA_TYPE(val->type)) {
-    char* buf = taosMemoryCalloc(val->nData + 1, 1);
+    char *buf = taosMemoryCalloc(val->nData + 1, 1);
     memcpy(buf, val->pData, val->nData);
     metaDebug("metaTag table val varchar index:%d cid:%d type:%d value:%s", 1, val->cid, val->type, buf);
     taosMemoryFree(buf);
@@ -900,13 +904,13 @@ const void *metaGetTableTagVal(void *pTag, int16_t type, STagVal *val) {
     metaDebug("metaTag table val number index:%d cid:%d type:%d value:%f", 1, val->cid, val->type, dval);
   }
 
-  SArray* pTagVals = NULL;
-  tTagToValArray((STag*)pTag, &pTagVals);
+  SArray *pTagVals = NULL;
+  tTagToValArray((STag *)pTag, &pTagVals);
   for (int i = 0; i < taosArrayGetSize(pTagVals); i++) {
-    STagVal* pTagVal = (STagVal*)taosArrayGet(pTagVals, i);
+    STagVal *pTagVal = (STagVal *)taosArrayGet(pTagVals, i);
 
     if (IS_VAR_DATA_TYPE(pTagVal->type)) {
-      char* buf = taosMemoryCalloc(pTagVal->nData + 1, 1);
+      char *buf = taosMemoryCalloc(pTagVal->nData + 1, 1);
       memcpy(buf, pTagVal->pData, pTagVal->nData);
       metaDebug("metaTag table varchar index:%d cid:%d type:%d value:%s", i, pTagVal->cid, pTagVal->type, buf);
       taosMemoryFree(buf);