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

[FEAT MERGE]parameters support data_type

Browse Source
This commit is contained in:
obdev
2023-11-06 08:09:24 +00:00
committed by ob-robot
parent 0c8e9d598d
commit f6b86ce6ad
9 changed files with 121 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/rootserver/ob_system_admin_util.cpp
View File

@ -1055,13 +1055,15 @@ int ObAdminSetConfig::update_config(obrpc::ObAdminSetConfigArg &arg, int64_t new
LOG_WARN("tenant not exist", KR(ret), K(tenant_id));
} else if (!tenant_schema->is_normal()) {
//tenant not normal, maybe tenant not ready, cannot add tenant config
} else if (OB_FAIL(dml.add_pk_column("tenant_id", tenant_id))
|| OB_FAIL(dml.add_pk_column("zone", item->zone_.ptr()))
} else if (0 == ObString(table_name).case_compare(OB_TENANT_PARAMETER_TNAME) &&
OB_FAIL(dml.add_pk_column("tenant_id", tenant_id))) {
// __all_seed_parameter does not have column 'tenant_id'
LOG_WARN("add column failed", KR(ret));
} else if (OB_FAIL(dml.add_pk_column("zone", item->zone_.ptr()))
|| OB_FAIL(dml.add_pk_column("svr_type", print_server_role(OB_SERVER)))
|| OB_FAIL(dml.add_pk_column(K(svr_ip)))
|| OB_FAIL(dml.add_pk_column(K(svr_port)))
|| OB_FAIL(dml.add_pk_column("name", item->name_.ptr()))
|| OB_FAIL(dml.add_column("data_type", "varchar"))
|| OB_FAIL(dml.add_column("value", item->value_.ptr()))
|| OB_FAIL(dml.add_column("info", item->comment_.ptr()))
|| OB_FAIL(dml.add_column("config_version", new_version))) {
@ -1089,7 +1091,8 @@ int ObAdminSetConfig::update_config(obrpc::ObAdminSetConfigArg &arg, int64_t new
if (OB_FAIL(dml.add_column("section", ci->section()))
|| OB_FAIL(dml.add_column("scope", ci->scope()))
|| OB_FAIL(dml.add_column("source", ci->source()))
|| OB_FAIL(dml.add_column("edit_level", ci->edit_level()))) {
|| OB_FAIL(dml.add_column("edit_level", ci->edit_level()))
|| OB_FAIL(dml.add_column("data_type", ci->data_type()))) {
LOG_WARN("add column failed", KR(ret));
} else if (OB_FAIL(exec.exec_insert_update(table_name,
dml, affected_rows))) {
@ -1118,7 +1121,6 @@ int ObAdminSetConfig::update_config(obrpc::ObAdminSetConfigArg &arg, int64_t new
|| OB_FAIL(dml.add_pk_column(K(svr_ip)))
|| OB_FAIL(dml.add_pk_column(K(svr_port)))
|| OB_FAIL(dml.add_pk_column("name", item->name_.ptr()))
|| OB_FAIL(dml.add_column("data_type", "varchar"))
|| OB_FAIL(dml.add_column("value", item->value_.ptr()))
|| OB_FAIL(dml.add_column("info", item->comment_.ptr()))
|| OB_FAIL(dml.add_column("config_version", new_version))) {
@ -1141,7 +1143,8 @@ int ObAdminSetConfig::update_config(obrpc::ObAdminSetConfigArg &arg, int64_t new
if (OB_FAIL(dml.add_column("section", ci->section()))
|| OB_FAIL(dml.add_column("scope", ci->scope()))
|| OB_FAIL(dml.add_column("source", ci->source()))
|| OB_FAIL(dml.add_column("edit_level", ci->edit_level()))) {
|| OB_FAIL(dml.add_column("edit_level", ci->edit_level()))
|| OB_FAIL(dml.add_column("data_type", ci->data_type()))) {
LOG_WARN("add column failed", KR(ret));
} else if (OB_FAIL(exec.exec_insert_update(OB_ALL_SYS_PARAMETER_TNAME,
dml, affected_rows))) {