xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix merge errors.

This commit is contained in:
xiao-77 2024-12-16 14:13:23 +08:00
parent b4afa6ff90
commit 9d733c03b4
1 changed files with 4 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
source/dnode/mnode/impl/src/mndConfig.c
View File

@ -854,94 +854,17 @@ static int32_t mndProcessShowVariablesReq(SRpcMsg *pReq) {
SShowVariablesRsp rsp = {0}; SShowVariablesRsp rsp = {0};
int32_t code = -1; int32_t code = -1;
if (mndCheckOperPrivilege(pReq->info.node, pReq->info.conn.user, MND_OPER_SHOW_VARIABLES) != 0) { if ((code = mndCheckOperPrivilege(pReq->info.node, pReq->info.conn.user, MND_OPER_SHOW_VARIABLES)) != 0) {
goto _OVER;
}
rsp.variables = taosArrayInit(16, sizeof(SVariablesInfo));
if (NULL == rsp.variables) {
mError("failed to alloc SVariablesInfo array while process show variables req");
code = terrno;
goto _OVER; goto _OVER;
} }
SVariablesInfo info = {0}; SVariablesInfo info = {0};
tstrncpy(info.name, "statusInterval", sizeof(info.name)); rsp.variables = initVariablesFromItems(taosGetGlobalCfg(tsCfg));
(void)snprintf(info.value, TSDB_CONFIG_VALUE_LEN, "%d", tsStatusInterval); if (rsp.variables == NULL) {
tstrncpy(info.scope, "server", sizeof(info.scope));
// fill info.info
if (taosArrayPush(rsp.variables, &info) == NULL) {
code = terrno; code = terrno;
goto _OVER; goto _OVER;
} }
tstrncpy(info.name, "timezone", sizeof(info.name));
(void)snprintf(info.value, TSDB_CONFIG_VALUE_LEN, "%s", tsTimezoneStr);
tstrncpy(info.scope, "both", sizeof(info.scope));
if (taosArrayPush(rsp.variables, &info) == NULL) {
code = terrno;
goto _OVER;
}
tstrncpy(info.name, "locale", sizeof(info.name));
(void)snprintf(info.value, TSDB_CONFIG_VALUE_LEN, "%s", tsLocale);
tstrncpy(info.scope, "both", sizeof(info.scope));
if (taosArrayPush(rsp.variables, &info) == NULL) {
code = terrno;
goto _OVER;
}
tstrncpy(info.name, "charset", sizeof(info.name));
(void)snprintf(info.value, TSDB_CONFIG_VALUE_LEN, "%s", tsCharset);
tstrncpy(info.scope, "both", sizeof(info.scope));
if (taosArrayPush(rsp.variables, &info) == NULL) {
code = terrno;
goto _OVER;
}
tstrncpy(info.name, "monitor", sizeof(info.name));
(void)snprintf(info.value, TSDB_CONFIG_VALUE_LEN, "%d", tsEnableMonitor);
tstrncpy(info.scope, "server", sizeof(info.scope));
if (taosArrayPush(rsp.variables, &info) == NULL) {
code = terrno;
goto _OVER;
}
tstrncpy(info.name, "monitorInterval", sizeof(info.name));
(void)snprintf(info.value, TSDB_CONFIG_VALUE_LEN, "%d", tsMonitorInterval);
tstrncpy(info.scope, "server", sizeof(info.scope));
if (taosArrayPush(rsp.variables, &info) == NULL) {
code = terrno;
goto _OVER;
}
tstrncpy(info.name, "slowLogThreshold", sizeof(info.name));
(void)snprintf(info.value, TSDB_CONFIG_VALUE_LEN, "%d", tsSlowLogThreshold);
tstrncpy(info.scope, "server", sizeof(info.scope));
if (taosArrayPush(rsp.variables, &info) == NULL) {
code = terrno;
goto _OVER;
}
tstrncpy(info.name, "slowLogMaxLen", sizeof(info.name));
(void)snprintf(info.value, TSDB_CONFIG_VALUE_LEN, "%d", tsSlowLogMaxLen);
tstrncpy(info.scope, "server", sizeof(info.scope));
if (taosArrayPush(rsp.variables, &info) == NULL) {
code = terrno;
goto _OVER;
}
char scopeStr[64] = {0};
getSlowLogScopeString(tsSlowLogScope, scopeStr);
tstrncpy(info.name, "slowLogScope", sizeof(info.name));
(void)snprintf(info.value, TSDB_CONFIG_VALUE_LEN, "%s", scopeStr);
tstrncpy(info.scope, "server", sizeof(info.scope));
if (taosArrayPush(rsp.variables, &info) == NULL) {
code = terrno;
goto _OVER;
}
int32_t rspLen = tSerializeSShowVariablesRsp(NULL, 0, &rsp); int32_t rspLen = tSerializeSShowVariablesRsp(NULL, 0, &rsp);
void *pRsp = rpcMallocCont(rspLen); void *pRsp = rpcMallocCont(rspLen);
if (pRsp == NULL) { if (pRsp == NULL) {
@ -950,6 +873,7 @@ static int32_t mndProcessShowVariablesReq(SRpcMsg *pReq) {
} }
if ((rspLen = tSerializeSShowVariablesRsp(pRsp, rspLen, &rsp)) <= 0) { if ((rspLen = tSerializeSShowVariablesRsp(pRsp, rspLen, &rsp)) <= 0) {
rpcFreeCont(pRsp);
code = rspLen; code = rspLen;
goto _OVER; goto _OVER;
} }