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

fix core in group join buffer

Browse Source
This commit is contained in:
obdev
2023-01-28 19:49:33 +08:00
committed by ob-robot
parent fc53210ebc
commit 67b7f03d59
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/sql/engine/basic/ob_group_join_buffer.cpp
View File

@ -508,16 +508,16 @@ int ObGroupJoinBufffer::batch_fill_group_buffer(const int64_t max_row_cnt,
} }
ignore_end = true; ignore_end = true;
} }
if (OB_SUCC(ret)) { }
if (!rescan_params_->empty()) { if (OB_SUCC(ret)) {
op_->set_pushdown_param_null(*rescan_params_); if (!rescan_params_->empty()) {
} op_->set_pushdown_param_null(*rescan_params_);
if (batch_rows->size_ == 0 && batch_rows->end_) { }
// do nothing if (batch_rows->size_ == 0 && batch_rows->end_) {
} else { // do nothing
last_batch_.from_exprs(*eval_ctx_, batch_rows->skip_, batch_rows->size_); } else {
save_last_batch_ = true; last_batch_.from_exprs(*eval_ctx_, batch_rows->skip_, batch_rows->size_);
} save_last_batch_ = true;
} }
op_->clear_evaluated_flag(); op_->clear_evaluated_flag();
} }
@ -607,6 +607,9 @@ int ObGroupJoinBufffer::get_next_batch_from_store(int64_t max_rows, int64_t &rea
max_rows = tmp_max_rows; max_rows = tmp_max_rows;
} }
if (max_rows > 0) { if (max_rows > 0) {
// since we do not know how many rows we got last time, we need to save all possible
// batch datums and restore them before getting next batch from left child
last_batch_.extend_save(*eval_ctx_, spec_->max_batch_size_);
// we are still reading results for the current rescan param, // we are still reading results for the current rescan param,
// need to rescan right child // need to rescan right child
if (OB_FAIL(left_store_iter_.get_next_batch(left_->get_spec().output_, if (OB_FAIL(left_store_iter_.get_next_batch(left_->get_spec().output_,