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

adjust set op to reentrant

Browse Source
This commit is contained in:
ls0
2022-03-03 14:46:39 +08:00
committed by LINxiansheng
parent 47044f346e
commit 865c7006a6
10 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/engine/set/ob_merge_intersect_op.cpp
View File

@ -71,6 +71,9 @@ int ObMergeIntersectOp::inner_get_next_row()
int cmp = 0;
bool break_outer_loop = false;
const ObIArray<ObExpr*>* left_row = NULL;
if (iter_end_) {
ret = OB_ITER_END;
}
clear_evaluated_flag();
while (OB_SUCC(ret) && OB_SUCC(do_strict_distinct(*left_, last_row_.store_row_, left_row))) {
while (OB_SUCC(ret) && !right_iter_end_) {
@ -111,6 +114,8 @@ int ObMergeIntersectOp::inner_get_next_row()
} else if (OB_FAIL(last_row_.save_store_row(*left_row, eval_ctx_, 0))) {
LOG_WARN("failed to save right row", K(ret));
}
} else if (OB_ITER_END == ret) {
iter_end_ = true;
}
return ret;
}