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

Fix some review errors.

This commit is contained in:
xiao-77 2024-12-10 18:56:59 +08:00
parent ea767b28fe
commit b34dd6f347
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source/common/src/tglobal.c
View File

@ -21,9 +21,11 @@
#include "tconfig.h" #include "tconfig.h"
#include "tglobal.h" #include "tglobal.h"
#include "tgrant.h" #include "tgrant.h"
#include "tjson.h"
#include "tlog.h" #include "tlog.h"
#include "tmisce.h" #include "tmisce.h"
#include "tunit.h" #include "tunit.h"
#include "tutil.h" #include "tutil.h"
#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL) #if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL)
@ -2042,27 +2044,32 @@ int32_t readCfgFile(const char *path, bool isGlobal) {
} }
uInfo("start to read config file:%s", filename); uInfo("start to read config file:%s", filename);
int64_t fileSize = 0; if (!taosCheckExistFile(filename)) {
char *buf = NULL;
if (taosStatFile(filename, &fileSize, NULL, NULL) < 0) {
if (terrno != ENOENT) {
code = terrno;
uError("failed to stat file:%s , since %s", filename, tstrerror(code));
TAOS_RETURN(TSDB_CODE_SUCCESS);
}
uInfo("config file:%s does not exist", filename); uInfo("config file:%s does not exist", filename);
TAOS_RETURN(TSDB_CODE_SUCCESS); TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
int64_t fileSize = 0;
char *buf = NULL;
if (taosStatFile(filename, &fileSize, NULL, NULL) < 0) {
code = terrno;
uError("failed to stat file:%s , since %s", filename, tstrerror(code));
TAOS_RETURN(code);
}
TdFilePtr pFile = taosOpenFile(filename, TD_FILE_READ); TdFilePtr pFile = taosOpenFile(filename, TD_FILE_READ);
if (pFile == NULL) { if (pFile == NULL) {
uError("failed to open file:%s , since %s", filename, tstrerror(code));
code = terrno; code = terrno;
uError("failed to open file:%s , since %s", filename, tstrerror(code));
goto _exit; goto _exit;
} }
buf = (char *)taosMemoryMalloc(fileSize + 1); buf = (char *)taosMemoryMalloc(fileSize + 1);
if (taosReadFile(pFile, buf, fileSize) != fileSize) { if (buf == NULL) {
uError("failed to read file:%s , config since %s", filename, tstrerror(code));
code = terrno; code = terrno;
uError("failed to malloc memory for file:%s , since %s", filename, tstrerror(code));
goto _exit;
}
if (taosReadFile(pFile, buf, fileSize) != fileSize) {
code = terrno;
uError("failed to read file:%s , config since %s", filename, tstrerror(code));
goto _exit; goto _exit;
} }
buf[fileSize] = 0; buf[fileSize] = 0;
@ -2761,7 +2768,6 @@ int32_t globalConfigSerialize(int32_t version, SArray *array, char **serialized)
cJSON *json = cJSON_CreateObject(); cJSON *json = cJSON_CreateObject();
if (json == NULL) goto _exit; if (json == NULL) goto _exit;
if (cJSON_AddNumberToObject(json, "version", version) == NULL) goto _exit; if (cJSON_AddNumberToObject(json, "version", version) == NULL) goto _exit;
if (json == NULL) goto _exit;
int sz = taosArrayGetSize(array); int sz = taosArrayGetSize(array);
cJSON *cField = cJSON_CreateObject(); cJSON *cField = cJSON_CreateObject();
@ -2802,7 +2808,7 @@ int32_t globalConfigSerialize(int32_t version, SArray *array, char **serialized)
} }
} }
} }
char *pSerialized = cJSON_Print(json); char *pSerialized = tjsonToString(json);
_exit: _exit:
if (terrno != TSDB_CODE_SUCCESS) { if (terrno != TSDB_CODE_SUCCESS) {
uError("failed to serialize global config since %s", tstrerror(terrno)); uError("failed to serialize global config since %s", tstrerror(terrno));
@ -2833,6 +2839,7 @@ int32_t localConfigSerialize(SArray *array, char **serialized) {
cJSON *dataDirs = cJSON_CreateArray(); cJSON *dataDirs = cJSON_CreateArray();
if (!cJSON_AddItemToObject(cField, item->name, dataDirs)) { if (!cJSON_AddItemToObject(cField, item->name, dataDirs)) {
uError("failed to serialize global config since %s", tstrerror(terrno)); uError("failed to serialize global config since %s", tstrerror(terrno));
goto _exit;
} }
for (int j = 0; j < sz; j++) { for (int j = 0; j < sz; j++) {
SDiskCfg *disk = (SDiskCfg *)taosArrayGet(item->array, j); SDiskCfg *disk = (SDiskCfg *)taosArrayGet(item->array, j);
@ -2840,6 +2847,7 @@ int32_t localConfigSerialize(SArray *array, char **serialized) {
if (dataDir == NULL) goto _exit; if (dataDir == NULL) goto _exit;
if (!cJSON_AddItemToArray(dataDirs, dataDir)) { if (!cJSON_AddItemToArray(dataDirs, dataDir)) {
uError("failed to serialize global config since %s", tstrerror(terrno)); uError("failed to serialize global config since %s", tstrerror(terrno));
goto _exit;
} }
if (cJSON_AddStringToObject(dataDir, "dir", disk->dir) == NULL) goto _exit; if (cJSON_AddStringToObject(dataDir, "dir", disk->dir) == NULL) goto _exit;
if (cJSON_AddNumberToObject(dataDir, "level", disk->level) == NULL) goto _exit; if (cJSON_AddNumberToObject(dataDir, "level", disk->level) == NULL) goto _exit;
@ -2885,7 +2893,7 @@ int32_t localConfigSerialize(SArray *array, char **serialized) {
} }
} }
} }
char *pSerialized = cJSON_Print(json); char *pSerialized = tjsonToString(json);
_exit: _exit:
if (terrno != TSDB_CODE_SUCCESS) { if (terrno != TSDB_CODE_SUCCESS) {
uError("failed to serialize local config since %s", tstrerror(terrno)); uError("failed to serialize local config since %s", tstrerror(terrno));