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

[CP] [CP] Fix the core caused by accessing cur phy plan

Browse Source
This commit is contained in:
obdev 2022-09-13 09:33:55 +00:00 committed by wangzelin.wzl
parent 4e8d8231d3
commit aae19e1f3c
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/observer/virtual_table/ob_virtual_open_cursor_table.cpp
View File

@ -59,13 +59,17 @@ bool ObVirtualOpenCursorTable::ObEachSessionId::operator()(
CK(OB_NOT_NULL(sess_info));
CK(OB_NOT_NULL(allocator_));
if (OB_SUCC(ret)) {
char *sql_id = nullptr;
sql::ObSQLSessionInfo::LockGuard lock_guard(sess_info->get_thread_data_lock());
if (OB_NOT_NULL(sess_info->get_cur_phy_plan())) {
vsp.version = sess_info->get_version();
if (OB_ISNULL(sql_id = reinterpret_cast<char *>(allocator_->alloc(common::OB_MAX_SQL_ID_LENGTH + 1)))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
SERVER_LOG(WARN, "failed to alloc buf", K(ret));
} else if (FALSE_IT(sess_info->get_cur_sql_id(sql_id, OB_MAX_SQL_ID_LENGTH + 1))) {
} else if (sql_id[0] != '\0') {
vsp.id = sess_info->get_sessid();
vsp.addr = reinterpret_cast<uint64_t>(sess_info);
vsp.sql_id.assign(sql_id, common::OB_MAX_SQL_ID_LENGTH);
OZ(ob_write_string(*allocator_, sess_info->get_user_name(), vsp.user_name));
OZ(ob_write_string(*allocator_, sess_info->get_cur_phy_plan()->stat_.sql_id_, vsp.sql_id));
if (vsp.is_valid()) {
SessionInfoArray vsp_arr;
OZ(sids_map_.get_refactored(vsp.sql_id, vsp_arr));

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

@ -1629,12 +1629,7 @@ int ObBasicSessionInfo::sys_variable_exists(const ObString& var, bool& is_exists
return ret;
}
ObPhysicalPlan* ObBasicSessionInfo::get_cur_phy_plan() const
{
return cur_phy_plan_;
}
int ObBasicSessionInfo::set_cur_phy_plan(ObPhysicalPlan* cur_phy_plan)
int ObBasicSessionInfo::set_cur_phy_plan(ObPhysicalPlan *cur_phy_plan)
{
int ret = OB_SUCCESS;
if (OB_ISNULL(cur_phy_plan)) {

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

@ -1030,8 +1030,6 @@ public:
int clean_all_sys_vars();
SysVarIncInfo sys_var_inc_info_;
// current executing physical plan
ObPhysicalPlan* get_cur_phy_plan() const;
void get_cur_sql_id(char *sql_id_buf, int64_t sql_id_buf_size) const;
int set_cur_phy_plan(ObPhysicalPlan *cur_phy_plan);
void reset_cur_phy_plan_to_null();