Skip to content

Commit fcdb0f8

Browse files
committed
enh: timeseries calculation excluding system tables
1 parent b2cdd58 commit fcdb0f8

File tree

3 files changed

+51
-3
lines changed

3 files changed

+51
-3
lines changed

source/dnode/mnode/impl/src/mndDb.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,6 +1275,11 @@ static int32_t mndProcessCreateDbReq(SRpcMsg *pReq) {
12751275
mError("db:%s, audit db already exist, %s", createReq.db, pAuditDb->name);
12761276
TAOS_CHECK_GOTO(TSDB_CODE_AUDIT_DB_ALREADY_EXIST, &lino, _OVER);
12771277
}
1278+
char *realDbName = strchr(createReq.db, '.');
1279+
if (realDbName && strcmp(realDbName + 1, "log") == 0) {
1280+
mError("db:%s, failed to create, db name not allowed for audit db, %s", createReq.db, realDbName + 1);
1281+
TAOS_CHECK_GOTO(TSDB_CODE_MND_INVALID_DB, &lino, _OVER);
1282+
}
12781283
}
12791284

12801285
TAOS_CHECK_GOTO(mndCreateDb(pMnode, pReq, &createReq, pUser, dnodeList), &lino, _OVER);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1456,7 +1456,7 @@ int32_t metaInitTbFilterCache(SMeta* pMeta) {
14561456
if (0 == strncmp(++dbName, "log", TSDB_DB_NAME_LEN)) {
14571457
tbNum = tkLogStbNum;
14581458
pTbArr = (const char**)&tkLogStb;
1459-
} else if (0 == strncmp(dbName, "audit", TSDB_DB_NAME_LEN)) {
1459+
} else if (0 == strncmp(dbName, "audit", TSDB_DB_NAME_LEN) || pMeta->pVnode->config.isAudit) {
14601460
tbNum = tkAuditStbNum;
14611461
pTbArr = (const char**)&tkAuditStb;
14621462
}

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

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,50 @@ const char *tkLogStb[] = {"cluster_info",
12241224
"taosadapter_system_mem_percent",
12251225
"temp_dir",
12261226
"vgroups_info",
1227-
"vnodes_role"};
1227+
"vnodes_role",
1228+
"taosd_dnodes_status",
1229+
"adapter_conn_pool",
1230+
"taosd_vnodes_info",
1231+
"taosd_dnodes_metrics",
1232+
"taosd_vgroups_info",
1233+
"taos_sql_req",
1234+
"taosd_mnodes_info",
1235+
"adapter_c_interface",
1236+
"taosd_cluster_info",
1237+
"taosd_sql_req",
1238+
"taosd_dnodes_info",
1239+
"adapter_requests",
1240+
"taosd_write_metrics",
1241+
"adapter_status",
1242+
"taos_slow_sql",
1243+
"taos_slow_sql_detail",
1244+
"taosd_cluster_basic",
1245+
"taosd_dnodes_data_dirs",
1246+
"taosd_dnodes_log_dirs",
1247+
"xnode_agent_activities",
1248+
"xnode_task_activities",
1249+
"xnode_task_metrics",
1250+
"taosx_task_csv",
1251+
"taosx_task_progress",
1252+
"taosx_task_kinghist",
1253+
"taosx_task_tdengine2",
1254+
"taosx_task_tdengine3",
1255+
"taosx_task_opc_da",
1256+
"taosx_task_opc_ua",
1257+
"taosx_task_kafka",
1258+
"taosx_task_influxdb",
1259+
"taosx_task_mqtt",
1260+
"taosx_task_avevahistorian",
1261+
"taosx_task_opentsdb",
1262+
"taosx_task_mysql",
1263+
"taosx_task_postgres",
1264+
"taosx_task_oracle",
1265+
"taosx_task_mssql",
1266+
"taosx_task_mongodb",
1267+
"taosx_task_sparkplugb",
1268+
"taosx_task_orc",
1269+
"taosx_task_pulsar",
1270+
"taosx_task_pspace"};
12281271
const char *tkAuditStb[] = {"operations"};
12291272
const int tkLogStbNum = ARRAY_SIZE(tkLogStb);
12301273
const int tkAuditStbNum = ARRAY_SIZE(tkAuditStb);
@@ -1241,7 +1284,7 @@ static int32_t vnodeGetTimeSeriesBlackList(SVnode *pVnode, int32_t *tbSize) {
12411284
if (0 == strncmp(++dbName, "log", TSDB_DB_NAME_LEN)) {
12421285
tbNum = tkLogStbNum;
12431286
pTbArr = (const char **)&tkLogStb;
1244-
} else if (0 == strncmp(dbName, "audit", TSDB_DB_NAME_LEN)) {
1287+
} else if (0 == strncmp(dbName, "audit", TSDB_DB_NAME_LEN) || pVnode->config.isAudit) {
12451288
tbNum = tkAuditStbNum;
12461289
pTbArr = (const char **)&tkAuditStb;
12471290
}

0 commit comments

Comments
 (0)