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

Fix: master re placeholder

Browse Source
This commit is contained in:
yaojing624
2023-11-15 03:40:39 +00:00
committed by ob-robot
parent f62d0dbc9f
commit 1b7fb61f48
6 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,7 +149,8 @@ ObBasicSessionInfo::ObBasicSessionInfo(const uint64_t tenant_id)
thread_id_(0),
is_password_expired_(false),
process_query_time_(0),
last_update_tz_time_(0)
last_update_tz_time_(0),
is_client_sessid_support_(false)
{
thread_data_.reset();
MEMSET(sys_vars_, 0, sizeof(sys_vars_));
@ -433,6 +434,7 @@ void ObBasicSessionInfo::reset(bool skip_sys_var)
is_password_expired_ = false;
process_query_time_ = 0;
last_update_tz_time_ = 0;
is_client_sessid_support_ = false;
sess_bt_buff_pos_ = 0;
ATOMIC_SET(&sess_ref_cnt_ , 0);
// 最后再重置所有allocator
@ -4393,7 +4395,8 @@ OB_DEF_SERIALIZE(ObBasicSessionInfo)
flt_vars_.last_flt_trace_id_,
flt_vars_.row_traceformat_,
flt_vars_.last_flt_span_id_,
exec_min_cluster_version_);
exec_min_cluster_version_,
is_client_sessid_support_);
}();
return ret;
}
@ -4593,6 +4596,10 @@ OB_DEF_DESERIALIZE(ObBasicSessionInfo)
} else {
exec_min_cluster_version_ = CLUSTER_VERSION_4_0_0_0;
}
if (OB_SUCC(ret) && pos < data_len) {
LST_DO_CODE(OB_UNIS_DECODE,
is_client_sessid_support_);
}
// deep copy string.
if (OB_SUCC(ret)) {
if (OB_FAIL(name_pool_.write_string(app_trace_id_, &app_trace_id_))) {
@ -4905,7 +4912,8 @@ OB_DEF_SERIALIZE_SIZE(ObBasicSessionInfo)
flt_vars_.last_flt_trace_id_,
flt_vars_.row_traceformat_,
flt_vars_.last_flt_span_id_,
exec_min_cluster_version_);
exec_min_cluster_version_,
is_client_sessid_support_);
return len;
}