hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix error from parser all_server_list config

Browse Source
This commit is contained in:
ly0
2022-03-14 20:31:10 +08:00
committed by LINxiansheng
parent b6333008b5
commit 7076b575bf
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/share/config/ob_common_config.cpp
View File

@ -49,6 +49,7 @@ int ObCommonConfig::add_extra_config(const char* config_str, int64_t version /*
char* buf = NULL; char* buf = NULL;
char* saveptr = NULL; char* saveptr = NULL;
char* token = NULL; char* token = NULL;
bool split_by_comma = false;
if (OB_ISNULL(config_str)) { if (OB_ISNULL(config_str)) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
@ -62,7 +63,11 @@ int ObCommonConfig::add_extra_config(const char* config_str, int64_t version /*
} else { } else {
MEMCPY(buf, config_str, config_str_length); MEMCPY(buf, config_str, config_str_length);
buf[config_str_length] = '\0'; buf[config_str_length] = '\0';
token = STRTOK_R(buf, ",\n", &saveptr); token = STRTOK_R(buf, "\n", &saveptr);
if (0 == STRLEN(saveptr)) {
token = STRTOK_R(buf, ",\n", &saveptr);
split_by_comma = true;
}
} }
char external_info_val[OB_MAX_CONFIG_VALUE_LEN]; char external_info_val[OB_MAX_CONFIG_VALUE_LEN];
external_info_val[0] = '\0'; external_info_val[0] = '\0';
@ -102,7 +107,7 @@ int ObCommonConfig::add_extra_config(const char* config_str, int64_t version /*
(*pp_item)->set_version(version); (*pp_item)->set_version(version);
LOG_INFO("Load config succ", K(name), K(value)); LOG_INFO("Load config succ", K(name), K(value));
} }
token = STRTOK_R(NULL, ",\n", &saveptr); token = (true == split_by_comma) ? STRTOK_R(NULL, ",\n", &saveptr) : STRTOK_R(NULL, "\n", &saveptr);
} }
if (NULL != buf) { if (NULL != buf) {