diff --git a/source/server/mnode/inc/mnodeDef.h b/source/server/mnode/inc/mnodeDef.h index 7ea3d1567d3e25b40ee623eaef731dbf4d7264ce..1831c4d83a38b08c2196cf88709dd664d5a0b399 100644 --- a/source/server/mnode/inc/mnodeDef.h +++ b/source/server/mnode/inc/mnodeDef.h @@ -143,32 +143,18 @@ typedef struct { int32_t maxUsers; int32_t maxDbs; int32_t maxTimeSeries; - int32_t maxConnections; int32_t maxStreams; - int32_t maxPointsPerSecond; int64_t maxStorage; // In unit of GB - int64_t maxQueryTime; // In unit of hour - int64_t maxInbound; - int64_t maxOutbound; int8_t accessState; // Configured only by command } SAcctCfg; typedef struct { - int64_t totalStorage; // Total storage wrtten from this account - int64_t compStorage; // Compressed storage on disk - int64_t queryTime; - int64_t totalPoints; - int64_t inblound; - int64_t outbound; - int64_t sKey; int32_t numOfUsers; int32_t numOfDbs; int32_t numOfTimeSeries; - int32_t numOfPointsPerSecond; - int32_t numOfConns; - int32_t numOfQueries; int32_t numOfStreams; - int8_t accessState; // Checked by mgmt heartbeat message + int64_t totalStorage; // Total storage wrtten from this account + int64_t compStorage; // Compressed storage on disk } SAcctInfo; typedef struct SAcctObj { diff --git a/source/server/mnode/src/mnodeAcct.c b/source/server/mnode/src/mnodeAcct.c index 6807e56ea30bda39b063ca59438be60da90f45c7..89cf91789a0852c1565451466058341eaf73bd4c 100644 --- a/source/server/mnode/src/mnodeAcct.c +++ b/source/server/mnode/src/mnodeAcct.c @@ -25,13 +25,8 @@ static void mnodeCreateDefaultAcct() { acctObj.cfg = (SAcctCfg){.maxUsers = 128, .maxDbs = 128, .maxTimeSeries = INT32_MAX, - .maxConnections = 1024, .maxStreams = 1000, - .maxPointsPerSecond = 10000000, .maxStorage = INT64_MAX, - .maxQueryTime = INT64_MAX, - .maxInbound = 0, - .maxOutbound = 0, .accessState = TSDB_VN_ALL_ACCCESS}; acctObj.acctId = 1; acctObj.createdTime = taosGetTimestampMs(); @@ -47,13 +42,8 @@ int32_t mnodeEncodeAcct(SAcctObj *pAcct, char *buf, int32_t maxLen) { len += snprintf(buf + len, maxLen - len, "\"maxUsers\":\"%d\", ", pAcct->cfg.maxUsers); len += snprintf(buf + len, maxLen - len, "\"maxDbs\":\"%d\", ", pAcct->cfg.maxDbs); len += snprintf(buf + len, maxLen - len, "\"maxTimeSeries\":\"%d\", ", pAcct->cfg.maxTimeSeries); - len += snprintf(buf + len, maxLen - len, "\"maxConnections\":\"%d\", ", pAcct->cfg.maxConnections); len += snprintf(buf + len, maxLen - len, "\"maxStreams\":\"%d\", ", pAcct->cfg.maxStreams); - len += snprintf(buf + len, maxLen - len, "\"maxPointsPerSecond\":\"%d\", ", pAcct->cfg.maxPointsPerSecond); - len += snprintf(buf + len, maxLen - len, "\"maxUsers\":\"%" PRIu64 "\", ", pAcct->cfg.maxStorage); - len += snprintf(buf + len, maxLen - len, "\"maxQueryTime\":\"%" PRIu64 "\", ", pAcct->cfg.maxQueryTime); - len += snprintf(buf + len, maxLen - len, "\"maxInbound\"\":%" PRIu64 "\", ", pAcct->cfg.maxInbound); - len += snprintf(buf + len, maxLen - len, "\"maxOutbound\":\"%" PRIu64 "\", ", pAcct->cfg.maxOutbound); + len += snprintf(buf + len, maxLen - len, "\"maxStorage\":\"%" PRIu64 "\", ", pAcct->cfg.maxStorage); len += snprintf(buf + len, maxLen - len, "\"accessState\":\"%d\", ", pAcct->cfg.accessState); len += snprintf(buf + len, maxLen - len, "\"createdTime\":\"%" PRIu64 "\", ", pAcct->createdTime); len += snprintf(buf + len, maxLen - len, "\"updateTime\":\"%" PRIu64 "\"}\n", pAcct->updateTime);