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

fix memory-leak bug of insert into select with direct-mode

Browse Source
This commit is contained in:
leftgeek
2023-08-10 09:12:22 +00:00
committed by ob-robot
parent 73a9b49ea4
commit b49c3559a2
4 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/sql/engine/cmd/ob_table_direct_insert_service.cpp
View File

@ -74,12 +74,16 @@ int ObTableDirectInsertService::finish_direct_insert(ObExecContext &ctx,
return ret;
}
int ObTableDirectInsertService::open_task(const uint64_t table_id, const int64_t task_id)
int ObTableDirectInsertService::open_task(const uint64_t table_id,
const int64_t task_id,
ObTableLoadTableCtx *&table_ctx)
{
int ret = OB_SUCCESS;
ObTableLoadTableCtx *table_ctx = nullptr;
ObTableLoadKey key(MTL_ID(), table_id);
if (OB_FAIL(ObTableLoadService::get_ctx(key, table_ctx))) {
if (OB_NOT_NULL(table_ctx)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("table_ctx should be null", KR(ret), KP(table_ctx));
} else if (OB_FAIL(ObTableLoadService::get_ctx(key, table_ctx))) {
if (OB_UNLIKELY(OB_ENTRY_NOT_EXIST != ret)) {
LOG_WARN("fail to get table ctx", KR(ret), K(key));
} else {
@ -100,7 +104,7 @@ int ObTableDirectInsertService::open_task(const uint64_t table_id, const int64_t
LOG_WARN("fail to start direct load trans", KR(ret), K(trans_id));
}
}
if (OB_NOT_NULL(table_ctx)) {
if (OB_FAIL(ret) && OB_NOT_NULL(table_ctx)) {
ObTableLoadService::put_ctx(table_ctx);
table_ctx = nullptr;
}
@ -109,14 +113,11 @@ int ObTableDirectInsertService::open_task(const uint64_t table_id, const int64_t
int ObTableDirectInsertService::close_task(const uint64_t table_id,
const int64_t task_id,
ObTableLoadTableCtx *table_ctx,
const int error_code)
{
int ret = OB_SUCCESS;
ObTableLoadTableCtx *table_ctx = nullptr;
ObTableLoadKey key(MTL_ID(), table_id);
if (OB_FAIL(ObTableLoadService::get_ctx(key, table_ctx))) {
LOG_WARN("fail to get table ctx", KR(ret), K(key), K(table_id));
} else {
if (OB_NOT_NULL(table_ctx)) {
table::ObTableLoadTransId trans_id;
trans_id.segment_id_ = task_id;
trans_id.trans_gid_ = 1;
@ -134,10 +135,7 @@ int ObTableDirectInsertService::close_task(const uint64_t table_id,
LOG_WARN("fail to abandon direct load trans", KR(tmp_ret), K(trans_id));
}
}
}
if (OB_NOT_NULL(table_ctx)) {
ObTableLoadService::put_ctx(table_ctx);
table_ctx = nullptr;
}
return ret;
}