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

MXS-2304 Use get_enum() instead of config_get_enum()

Browse Source
This commit is contained in:
Esa Korhonen
2019-01-31 11:03:08 +02:00
parent c8a84cebd0
commit f2d2202ea3
21 changed files with 52 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/routing/avrorouter/avro_main.cc
View File

@ -61,9 +61,8 @@ static bool conversion_task_ctl(Avro* inst, bool start);
MXS_ROUTER* createInstance(SERVICE* service, MXS_CONFIG_PARAMETER* params)
{
uint64_t block_size = config_get_size(service->svc_config_param, "block_size");
mxs_avro_codec_type codec = static_cast<mxs_avro_codec_type>(config_get_enum(service->svc_config_param,
"codec",
codec_values));
mxs_avro_codec_type codec = static_cast<mxs_avro_codec_type>(
service->svc_config_param->get_enum("codec", codec_values));
std::string avrodir = config_get_string(service->svc_config_param, "avrodir");
SRowEventHandler handler(new AvroConverter(avrodir, block_size, codec));

4
server/modules/routing/binlogrouter/blr.cc
View File

@ -381,9 +381,7 @@ static MXS_ROUTER* createInstance(SERVICE* service, MXS_CONFIG_PARAMETER* params
/* Binlog encryption */
inst->encryption.enabled = config_get_bool(params, "encrypt_binlog");
inst->encryption.encryption_algorithm = config_get_enum(params,
"encryption_algorithm",
enc_algo_values);
inst->encryption.encryption_algorithm = params->get_enum("encryption_algorithm", enc_algo_values);
inst->encryption.key_management_filename = config_copy_string(params,
"encryption_key_file");

4
server/modules/routing/hintrouter/hintrouter.cc
View File

@ -60,9 +60,7 @@ HintRouter* HintRouter::create(SERVICE* pService, MXS_CONFIG_PARAMETER* params)
{
HR_ENTRY();
HINT_TYPE default_action = (HINT_TYPE)config_get_enum(params,
DEFAULT_ACTION,
default_action_values);
HINT_TYPE default_action = (HINT_TYPE)params->get_enum(DEFAULT_ACTION, default_action_values);
string default_server(config_get_string(params, DEFAULT_SERVER));
int max_slaves = params->get_integer(MAX_SLAVES);
return new HintRouter(pService, default_action, default_server, max_slaves);

9
server/modules/routing/readwritesplit/readwritesplit.hh
View File

@ -134,15 +134,12 @@ struct Config
{
Config(MXS_CONFIG_PARAMETER* params)
: slave_selection_criteria(
(select_criteria_t)config_get_enum(
params, "slave_selection_criteria", slave_selection_criteria_values))
(select_criteria_t)params->get_enum("slave_selection_criteria", slave_selection_criteria_values))
, backend_select_fct(get_backend_select_function(slave_selection_criteria))
, use_sql_variables_in(
(mxs_target_t)config_get_enum(
params, "use_sql_variables_in", use_sql_variables_in_values))
(mxs_target_t)params->get_enum("use_sql_variables_in", use_sql_variables_in_values))
, master_failure_mode(
(enum failure_mode)config_get_enum(
params, "master_failure_mode", master_failure_mode_values))
(enum failure_mode)params->get_enum("master_failure_mode", master_failure_mode_values))
, max_sescmd_history(params->get_integer("max_sescmd_history"))
, disable_sescmd_history(config_get_bool(params, "disable_sescmd_history"))
, master_accept_reads(config_get_bool(params, "master_accept_reads"))