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

Merge branch issue/45691101 into master

Browse Source
This commit is contained in:
obdev
2022-10-25 14:22:53 +08:00
committed by wangzelin.wzl
parent 255f448946
commit 0f95b69cd4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sql/das/ob_das_group_scan_op.cpp
View File

@ -56,6 +56,12 @@ int ObDASGroupScanOp::release_op()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
OZ(ObDASScanOp::release_op()); OZ(ObDASScanOp::release_op());
if (nullptr != group_lookup_op_) {
ObITabletScan &tsc_service = get_tsc_service();
if (OB_FAIL(tsc_service.revert_scan_iter(group_lookup_op_->get_lookup_storage_iter()))) {
LOG_WARN("revert scan iterator failed", K(ret));
}
}
group_lookup_op_ = NULL; group_lookup_op_ = NULL;
iter_.reset(); iter_.reset();
result_iter_ = &iter_; result_iter_ = &iter_;
@ -97,7 +103,6 @@ int ObDASGroupScanOp::do_local_index_lookup()
op->set_rowkey_iter(&this->iter_); op->set_rowkey_iter(&this->iter_);
group_lookup_op_ = op; group_lookup_op_ = op;
result_iter_ = group_lookup_op_; result_iter_ = group_lookup_op_;
result_ = group_lookup_op_; //release scan iterator by result_, so need to hold lookup op by result_
OZ(op->init(get_lookup_ctdef(), OZ(op->init(get_lookup_ctdef(),
get_lookup_rtdef(), get_lookup_rtdef(),
scan_ctdef_, scan_ctdef_,