From b9767707cb31a4ce29f22ed85586669db0fd8776 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Sat, 7 Oct 2023 15:57:26 +0800
Subject: [PATCH] chore: code optimization for array size

---
 source/dnode/vnode/src/inc/vnodeInt.h   |  3 --
 source/dnode/vnode/src/meta/metaCache.c |  6 ++--
 source/dnode/vnode/src/vnd/vnodeQuery.c | 46 +++++++++++++------------
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h
index 9929b66932..2fadccdf2d 100644
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@@ -98,9 +98,6 @@ typedef struct SQueryNode         SQueryNode;
 #define VND_INFO_FNAME     "vnode.json"
 #define VND_INFO_FNAME_TMP "vnode_tmp.json"
 
-#define TK_LOG_STB_NUM   19
-#define TK_AUDIT_STB_NUM 1
-
 // vnd.h
 typedef int32_t (*_query_reseek_func_t)(void* pQHandle);
 struct SQueryNode {
diff --git a/source/dnode/vnode/src/meta/metaCache.c b/source/dnode/vnode/src/meta/metaCache.c
index 999ef4ee64..ceb72aa14d 100644
--- a/source/dnode/vnode/src/meta/metaCache.c
+++ b/source/dnode/vnode/src/meta/metaCache.c
@@ -17,6 +17,8 @@
 #ifdef TD_ENTERPRISE
 extern const char* tkLogStb[];
 extern const char* tkAuditStb[];
+extern const int   tkLogStbNum;
+extern const int   tkAuditStbNum;
 #endif
 
 #define TAG_FILTER_RES_KEY_LEN  32
@@ -946,10 +948,10 @@ int32_t metaInitTbFilterCache(SMeta* pMeta) {
 
   if (!(dbName = strchr(pMeta->pVnode->config.dbname, '.'))) return 0;
   if (0 == strncmp(++dbName, "log", TSDB_DB_NAME_LEN)) {
-    tbNum = TK_LOG_STB_NUM;
+    tbNum = tkLogStbNum;
     pTbArr = (const char**)&tkLogStb;
   } else if (0 == strncmp(dbName, "audit", TSDB_DB_NAME_LEN)) {
-    tbNum = TK_AUDIT_STB_NUM;
+    tbNum = tkAuditStbNum;
     pTbArr = (const char**)&tkAuditStb;
   }
   if (tbNum && pTbArr) {
diff --git a/source/dnode/vnode/src/vnd/vnodeQuery.c b/source/dnode/vnode/src/vnd/vnodeQuery.c
index 3ec85ac93a..e9dbc5e659 100644
--- a/source/dnode/vnode/src/vnd/vnodeQuery.c
+++ b/source/dnode/vnode/src/vnd/vnodeQuery.c
@@ -566,26 +566,28 @@ int32_t vnodeGetStbColumnNum(SVnode *pVnode, tb_uid_t suid, int *num) {
 }
 
 #ifdef TD_ENTERPRISE
-const char *tkLogStb[TK_LOG_STB_NUM] = {"cluster_info",
-                                               "data_dir",
-                                               "dnodes_info",
-                                               "d_info",
-                                               "grants_info",
-                                               "keeper_monitor",
-                                               "logs",
-                                               "log_dir",
-                                               "log_summary",
-                                               "m_info",
-                                               "taosadapter_restful_http_request_fail",
-                                               "taosadapter_restful_http_request_in_flight",
-                                               "taosadapter_restful_http_request_summary_milliseconds",
-                                               "taosadapter_restful_http_request_total",
-                                               "taosadapter_system_cpu_percent",
-                                               "taosadapter_system_mem_percent",
-                                               "temp_dir",
-                                               "vgroups_info",
-                                               "vnodes_role"};
-const char *tkAuditStb[TK_AUDIT_STB_NUM] = {"operations"};
+const char *tkLogStb[] = {"cluster_info",
+                          "data_dir",
+                          "dnodes_info",
+                          "d_info",
+                          "grants_info",
+                          "keeper_monitor",
+                          "logs",
+                          "log_dir",
+                          "log_summary",
+                          "m_info",
+                          "taosadapter_restful_http_request_fail",
+                          "taosadapter_restful_http_request_in_flight",
+                          "taosadapter_restful_http_request_summary_milliseconds",
+                          "taosadapter_restful_http_request_total",
+                          "taosadapter_system_cpu_percent",
+                          "taosadapter_system_mem_percent",
+                          "temp_dir",
+                          "vgroups_info",
+                          "vnodes_role"};
+const char *tkAuditStb[] = {"operations"};
+const int   tkLogStbNum = ARRAY_SIZE(tkLogStb);
+const int   tkAuditStbNum = ARRAY_SIZE(tkAuditStb);
 
 // exclude stbs of taoskeeper log
 static int32_t vnodeGetTimeSeriesBlackList(SVnode *pVnode) {
@@ -596,10 +598,10 @@ static int32_t vnodeGetTimeSeriesBlackList(SVnode *pVnode) {
 
   if (!(dbName = strchr(pVnode->config.dbname, '.'))) return 0;
   if (0 == strncmp(++dbName, "log", TSDB_DB_NAME_LEN)) {
-    tbNum = TK_LOG_STB_NUM;
+    tbNum = tkLogStbNum;
     pTbArr = (const char **)&tkLogStb;
   } else if (0 == strncmp(dbName, "audit", TSDB_DB_NAME_LEN)) {
-    tbNum = TK_AUDIT_STB_NUM;
+    tbNum = tkAuditStbNum;
     pTbArr = (const char **)&tkAuditStb;
   }
   if (tbNum && pTbArr) {