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

to issue<51345956>:fix memory leak when executing store procedure which has pure out complex type in ps mode

Browse Source
This commit is contained in:
hanr881 2023-08-07 04:18:30 +00:00 committed by ob-robot
parent e112ed684d
commit 8fa99e93d4
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/observer/mysql/ob_sync_cmd_driver.cpp
View File

@ -22,6 +22,7 @@
#include "rpc/obmysql/packet/ompk_eof.h"
#include "share/ob_lob_access_utils.h"
#include "observer/mysql/obmp_stmt_prexecute.h"
#include "src/pl/ob_pl_user_type.h"
namespace oceanbase
{
@ -102,6 +103,20 @@ int ObSyncCmdDriver::response_query_result(sql::ObResultSet &result,
result, is_ps_protocol, has_more_result, can_retry, fetch_limit);
}
void ObSyncCmdDriver::free_output_row(ObMySQLResultSet &result)
{
if (OB_NOT_NULL(result.get_exec_context().get_output_row())) {
const ObNewRow *row = result.get_exec_context().get_output_row();
for (int64_t i = 0; i < row->get_count(); ++i) {
ObObj &obj = row->cells_[i];
if (obj.is_pl_extend()) {
(void)pl::ObUserDefinedType::destruct_obj(obj, &session_);
}
}
}
}
int ObSyncCmdDriver::response_result(ObMySQLResultSet &result)
{
ObActiveSessionGuard::get_stat().in_sql_execution_ = true;
@ -138,6 +153,7 @@ int ObSyncCmdDriver::response_result(ObMySQLResultSet &result)
LOG_ERROR("Not SELECT, should not have any row!!!", K(ret));
} else if (OB_FAIL(response_query_result(result))) {
LOG_WARN("response query result fail", K(ret));
free_output_row(result);
int cret = result.close();
if (cret != OB_SUCCESS) {
LOG_WARN("close result set fail", K(cret));
@ -160,7 +176,7 @@ int ObSyncCmdDriver::response_result(ObMySQLResultSet &result)
// for CRUD SQL
// must be called before result.close()
process_schema_version_changes(result);
free_output_row(result);
if (OB_FAIL(result.close())) {
LOG_WARN("close result set fail", K(ret));
} else if (!result.is_with_rows()

1
src/observer/mysql/ob_sync_cmd_driver.h
View File

@ -58,6 +58,7 @@ private:
int process_schema_version_changes(const ObMySQLResultSet &result);
int check_and_refresh_schema(uint64_t tenant_id);
int response_query_result(ObMySQLResultSet &result);
void free_output_row(ObMySQLResultSet &result);
/* variables */
/* const */
/* disallow copy & assign */