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

Fix:Session synchronization default value scene forgets to synchronize to sys_var_cache

Browse Source
This commit is contained in:
obdev
2023-02-24 14:39:31 +00:00
committed by ob-robot
parent 6afc32e07c
commit 21a9f7a01f
2 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/sql/session/ob_basic_session_info.cpp
View File

@ -3769,41 +3769,59 @@ int ObBasicSessionInfo::deserialize_sync_sys_vars(int64_t &deserialize_sys_var_c
LOG_WARN("fail to add sys var id", K(sys_var_id), K(ret)); LOG_WARN("fail to add sys var id", K(sys_var_id), K(ret));
} }
} }
const ObIArray<ObSysVarClassType> &ids = sys_var_inc_info_.get_all_sys_var_ids(); if (OB_SUCC(ret)) {
int64_t store_idx = -1; if (OB_FAIL(sync_default_sys_vars(sys_var_inc_info_, tmp_sys_var_inc_info))) {
for (int64_t i = 0; OB_SUCC(ret) && i < ids.count(); ++i) { LOG_WARN("fail to sync default sys vars",K(ret));
ObBasicSysVar *sys_var = NULL; } else if (OB_FAIL(sys_var_inc_info_.assign(tmp_sys_var_inc_info))) {
if (!is_sync_sys_var(ids.at(i))
&& !tmp_sys_var_inc_info.all_has_sys_var_id(ids.at(i))) {
// need set default values
if (OB_FAIL(ObSysVarFactory::calc_sys_var_store_idx(ids.at(i), store_idx))) {
LOG_WARN("fail to calc sys var store idx", K(ret));
} else {
if (OB_FAIL(create_sys_var(ids.at(i), store_idx, sys_var))) {
LOG_WARN("fail to create sys var", K(ids.at(i)), K(ret));
} else if (OB_ISNULL(sys_var)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("create sys var is NULL", K(ret));
} else {
ObObj tmp_obj = ObSysVariables::get_default_value(store_idx);
sys_vars_[store_idx]->set_value(tmp_obj);
LOG_TRACE("sync sys var set default value", K(ids.at(i)), K(tmp_obj),
K(sessid_), K(proxy_sessid_));
}
}
}
}
if (OB_SUCC(ret) && OB_FAIL(sys_var_inc_info_.assign(tmp_sys_var_inc_info))) {
LOG_WARN("fail to assign sys var delta info",K(ret)); LOG_WARN("fail to assign sys var delta info",K(ret));
} else { } else {
//do nothing. //do nothing.
} }
LOG_TRACE("after deserialize sync sys vars", "inc var ids", sys_var_inc_info_.get_all_sys_var_ids(), }
LOG_TRACE("after deserialize sync sys vars", "inc var ids",
sys_var_inc_info_.get_all_sys_var_ids(),
K(sessid_), K(proxy_sessid_)); K(sessid_), K(proxy_sessid_));
} }
return ret; return ret;
} }
// Deserialization scenario, synchronization of default system variables
int ObBasicSessionInfo::sync_default_sys_vars(SysVarIncInfo sys_var_inc_info_,
SysVarIncInfo tmp_sys_var_inc_info)
{
int ret = OB_SUCCESS;
const ObIArray<ObSysVarClassType> &ids = sys_var_inc_info_.get_all_sys_var_ids();
int64_t store_idx = -1;
ObSysVarClassType sys_var_id = SYS_VAR_INVALID;
for (int64_t i = 0; OB_SUCC(ret) && i < ids.count(); ++i) {
ObBasicSysVar *sys_var = NULL;
sys_var_id = ids.at(i);
if (!is_sync_sys_var(sys_var_id)
&& !tmp_sys_var_inc_info.all_has_sys_var_id(sys_var_id)) {
// need set default values
if (OB_FAIL(ObSysVarFactory::calc_sys_var_store_idx(sys_var_id, store_idx))) {
LOG_WARN("fail to calc sys var store idx", K(ret));
} else if (OB_FAIL(create_sys_var(ids.at(i), store_idx, sys_var))) {
LOG_WARN("fail to create sys var", K(ids.at(i)), K(ret));
} else if (OB_ISNULL(sys_var)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("create sys var is NULL", K(ret));
} else if (FALSE_IT(sys_vars_[store_idx]->set_value(
ObSysVariables::get_default_value(store_idx)))) {
// do nothing.
} else if (OB_FAIL(process_session_variable(sys_var_id, sys_vars_[store_idx]->get_value(),
false))) {
LOG_WARN("process system variable error", K(ret), K(sys_var_id));
} else {
LOG_TRACE("sync sys var set default value", K(sys_var_id),
K(sessid_), K(proxy_sessid_));
}
}
}
return ret;
}
int ObBasicSessionInfo::calc_need_serialize_vars(ObIArray<ObSysVarClassType> &sys_var_ids, int ObBasicSessionInfo::calc_need_serialize_vars(ObIArray<ObSysVarClassType> &sys_var_ids,
ObIArray<ObString> &user_var_names) const ObIArray<ObString> &user_var_names) const
{ {

1
src/sql/session/ob_basic_session_info.h
View File

@ -1179,6 +1179,7 @@ public:
// for SESSION_SYNC_SYS_VAR serialize and deserialize. // for SESSION_SYNC_SYS_VAR serialize and deserialize.
int serialize_sync_sys_vars(common::ObIArray<share::ObSysVarClassType> &sys_var_delta_ids, char *buf, const int64_t &buf_len, int64_t &pos); int serialize_sync_sys_vars(common::ObIArray<share::ObSysVarClassType> &sys_var_delta_ids, char *buf, const int64_t &buf_len, int64_t &pos);
int deserialize_sync_sys_vars(int64_t &deserialize_sys_var_count, const char *buf, const int64_t &data_len, int64_t &pos); int deserialize_sync_sys_vars(int64_t &deserialize_sys_var_count, const char *buf, const int64_t &data_len, int64_t &pos);
int sync_default_sys_vars(SysVarIncInfo sys_var_inc_info_, SysVarIncInfo tmp_sys_var_inc_info);
int get_sync_sys_vars(common::ObIArray<share::ObSysVarClassType> &sys_var_delta_ids) const; int get_sync_sys_vars(common::ObIArray<share::ObSysVarClassType> &sys_var_delta_ids) const;
int get_sync_sys_vars_size(common::ObIArray<share::ObSysVarClassType> &sys_var_delta_ids, int64_t &len) const; int get_sync_sys_vars_size(common::ObIArray<share::ObSysVarClassType> &sys_var_delta_ids, int64_t &len) const;
bool is_sync_sys_var(share::ObSysVarClassType sys_var_id) const; bool is_sync_sys_var(share::ObSysVarClassType sys_var_id) const;