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

fix no close bug for global index

Browse Source
This commit is contained in:
shibin-xu
2023-06-08 04:48:02 +00:00
committed by ob-robot
parent 7fcdd9533f
commit 60cef12e3e
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/sql/engine/table/ob_table_scan_op.cpp
View File

@ -1330,22 +1330,24 @@ int ObTableScanOp::inner_open()
int ObTableScanOp::inner_close() int ObTableScanOp::inner_close()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (das_ref_.has_task()) { if (das_ref_.has_task()) {
ObTaskExecutorCtx &task_exec_ctx = ctx_.get_task_exec_ctx(); int tmp_ret = fill_storage_feedback_info();
if (OB_FAIL(fill_storage_feedback_info())) { if (OB_UNLIKELY(OB_SUCCESS != tmp_ret)) {
LOG_WARN("failed to fill storage feedback info", K(ret)); LOG_WARN("fill storage feedback info failed", KR(tmp_ret));
} else if (OB_FAIL(das_ref_.close_all_task())) { }
LOG_WARN("close all das task failed", K(ret)); if (OB_FAIL(das_ref_.close_all_task())) {
LOG_WARN("close all das task failed", KR(ret));
} }
} }
if (OB_SUCC(ret) && MY_SPEC.is_global_index_back()) { if (MY_SPEC.is_global_index_back()) {
int save_ret = ret;
if (OB_ISNULL(global_index_lookup_op_)) { if (OB_ISNULL(global_index_lookup_op_)) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid arguments",K(ret)); LOG_WARN("invalid arguments", KR(ret));
} else if (OB_FAIL(global_index_lookup_op_->close())) { } else if (OB_FAIL(global_index_lookup_op_->close())) {
LOG_WARN("failed to get next batch",K(ret)); LOG_WARN("close global index lookup op failed", KR(ret));
} }
ret = (OB_SUCCESS == save_ret) ? ret : save_ret;
} }
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
fill_sql_plan_monitor_info(); fill_sql_plan_monitor_info();
@ -1354,7 +1356,6 @@ int ObTableScanOp::inner_close()
iter_end_ = false; iter_end_ = false;
need_init_before_get_row_ = true; need_init_before_get_row_ = true;
} }
return ret; return ret;
} }