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

to issue<50007276>:fix memory leak of execute protocol params

Browse Source
This commit is contained in:
hanr881
2023-05-30 10:12:01 +00:00
committed by ob-robot
parent f76fbc4eea
commit 5fe8470308
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/observer/mysql/obmp_stmt_execute.cpp
View File

@ -321,25 +321,19 @@ int ObMPStmtExecute::construct_execute_param_for_arraybinding(int64_t pos)
return ret; return ret;
} }
void ObMPStmtExecute::reset_collection_param_for_arraybinding() void ObMPStmtExecute::reset_complex_param_memory(ParamStore *params, ObSQLSessionInfo &session_info)
{ {
if (OB_NOT_NULL(arraybinding_params_)) { if (OB_NOT_NULL(params)) {
for (int64_t i = 0; i < arraybinding_params_->count(); ++i) { for (int64_t i = 0; i < params->count(); ++i) {
ObObjParam &obj = arraybinding_params_->at(i); ObObjParam &obj = params->at(i);
ObPLCollection *coll = NULL; if (obj.is_pl_extend()) {
if (obj.is_ext() int ret = ObUserDefinedType::destruct_obj(obj, &session_info);
&& OB_NOT_NULL(coll = reinterpret_cast<ObPLCollection*>(obj.get_ext()))) { if (OB_SUCCESS != ret) {
if (OB_NOT_NULL(coll->get_allocator())) { LOG_WARN("fail to destruct obj", K(ret), K(i));
coll->get_allocator()->reset(); }
}
coll->set_data(NULL);
coll->set_count(0);
coll->set_first(OB_INVALID_INDEX);
coll->set_last(OB_INVALID_INDEX);
} }
} }
} }
return ;
} }
int ObMPStmtExecute::send_eof_packet_for_arraybinding(ObSQLSessionInfo &session_info) int ObMPStmtExecute::send_eof_packet_for_arraybinding(ObSQLSessionInfo &session_info)
@ -1680,7 +1674,7 @@ int ObMPStmtExecute::process_execute_stmt(const ObMultiStmtItem &multi_stmt_item
} }
} }
// 释放数组内存避免内存泄漏 // 释放数组内存避免内存泄漏
reset_collection_param_for_arraybinding(); reset_complex_param_memory(arraybinding_params_, session);
OZ (response_result_for_arraybinding(session, exception_array)); OZ (response_result_for_arraybinding(session, exception_array));
} else { } else {
need_response_error = false; need_response_error = false;
@ -1710,6 +1704,7 @@ int ObMPStmtExecute::process_execute_stmt(const ObMultiStmtItem &multi_stmt_item
} }
ret = OB_SUCC(bak_ret) ? ret : bak_ret; ret = OB_SUCC(bak_ret) ? ret : bak_ret;
} }
reset_complex_param_memory(params_, session);
} }
if (enable_trace_log) { if (enable_trace_log) {
ObThreadLogLevelUtils::clear(); ObThreadLogLevelUtils::clear();

2
src/observer/mysql/obmp_stmt_execute.h
View File

@ -242,7 +242,7 @@ private:
sql::ObSQLSessionInfo *session_info, sql::ParamTypeInfoArray &param_type_infos); sql::ObSQLSessionInfo *session_info, sql::ParamTypeInfoArray &param_type_infos);
int check_param_value_for_arraybinding(ObObjParam &param); int check_param_value_for_arraybinding(ObObjParam &param);
int construct_execute_param_for_arraybinding(int64_t pos); int construct_execute_param_for_arraybinding(int64_t pos);
void reset_collection_param_for_arraybinding(); void reset_complex_param_memory(ParamStore *params, sql::ObSQLSessionInfo &session_info);
int save_exception_for_arraybinding( int save_exception_for_arraybinding(
int64_t pos, int error_code, ObIArray<ObSavedException> &exception_array); int64_t pos, int error_code, ObIArray<ObSavedException> &exception_array);
//int after_do_process_for_arraybinding(ObMySQLResultSet &result); //int after_do_process_for_arraybinding(ObMySQLResultSet &result);