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

[CP] fix mysqltest of testing ob_tcp_invited_nodes

Browse Source
This commit is contained in:
zhjc1124
2023-10-18 03:39:30 +00:00
committed by ob-robot
parent eb7a594855
commit 1442a4beee
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/engine/cmd/ob_tenant_executor.cpp
View File

@ -382,8 +382,8 @@ int check_sys_var_options(ObExecContext &ctx,
int64_t sys_var_val_length = OB_MAX_SYS_VAR_VAL_LENGTH; int64_t sys_var_val_length = OB_MAX_SYS_VAR_VAL_LENGTH;
if (set_var.var_name_ == OB_SV_TCP_INVITED_NODES) { if (set_var.var_name_ == OB_SV_TCP_INVITED_NODES) {
uint64_t data_version = 0; uint64_t data_version = 0;
if (OB_FAIL(GET_MIN_DATA_VERSION(set_var.actual_tenant_id_, data_version))) { if (OB_FAIL(GET_MIN_DATA_VERSION(session->get_effective_tenant_id(), data_version))) {
LOG_WARN("fail to get sys data version", KR(ret)); LOG_WARN("fail to get tenant data version", KR(ret));
} else if (data_version >= DATA_VERSION_4_2_1_1) { } else if (data_version >= DATA_VERSION_4_2_1_1) {
sys_var_val_length = OB_MAX_TCP_INVITED_NODES_LENGTH; sys_var_val_length = OB_MAX_TCP_INVITED_NODES_LENGTH;
} }

2
src/sql/engine/cmd/ob_variable_set_executor.cpp
View File

@ -720,7 +720,7 @@ int ObVariableSetExecutor::update_global_variables(ObExecContext &ctx,
if (set_var.var_name_ == OB_SV_TCP_INVITED_NODES) { if (set_var.var_name_ == OB_SV_TCP_INVITED_NODES) {
uint64_t data_version = 0; uint64_t data_version = 0;
if (OB_FAIL(GET_MIN_DATA_VERSION(set_var.actual_tenant_id_, data_version))) { if (OB_FAIL(GET_MIN_DATA_VERSION(set_var.actual_tenant_id_, data_version))) {
LOG_WARN("fail to get sys data version", KR(ret)); LOG_WARN("fail to get tenant data version", KR(ret));
} else if (data_version >= DATA_VERSION_4_2_1_1) { } else if (data_version >= DATA_VERSION_4_2_1_1) {
sys_var_val_length = OB_MAX_TCP_INVITED_NODES_LENGTH; sys_var_val_length = OB_MAX_TCP_INVITED_NODES_LENGTH;
} }

2
src/sql/engine/expr/ob_expr_get_sys_var.cpp
View File

@ -84,7 +84,7 @@ int ObExprGetSysVar::calc_result_type2(ObExprResType &type,
if (0 == var_name.compare(OB_SV_TCP_INVITED_NODES)) { if (0 == var_name.compare(OB_SV_TCP_INVITED_NODES)) {
uint64_t data_version = 0; uint64_t data_version = 0;
if (OB_FAIL(GET_MIN_DATA_VERSION(session->get_effective_tenant_id(), data_version))) { if (OB_FAIL(GET_MIN_DATA_VERSION(session->get_effective_tenant_id(), data_version))) {
LOG_WARN("fail to get sys data version", KR(ret)); LOG_WARN("fail to get tenant data version", KR(ret));
} else if (data_version >= DATA_VERSION_4_2_1_1) { } else if (data_version >= DATA_VERSION_4_2_1_1) {
sys_var_val_length = OB_MAX_TCP_INVITED_NODES_LENGTH; sys_var_val_length = OB_MAX_TCP_INVITED_NODES_LENGTH;
} }