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

fix hash gby can not dump in 1st stage when close by pass && splite expr in hash map memory into user tenant

Browse Source
This commit is contained in:
18523270951@163.com
2023-11-13 12:09:09 +00:00
committed by ob-robot
parent ccbaaa781d
commit 81b3514d20
3 changed files with 35 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sql/engine/aggregate/ob_hash_groupby_op.cpp
View File

@ -981,6 +981,9 @@ int ObHashGroupByOp::load_data()
int64_t nth_dup_data = 0;
bool last_group = false;
bool insert_group_ht = false;
bool can_insert_ht = !is_dump_enabled
|| local_group_rows_.size() < MIN_INMEM_GROUPS
|| (!start_dump && !need_start_dump(input_rows, est_part_cnt, check_dump));
do {
// one-dup-data
if (OB_FAIL(ret)) {
@ -1014,9 +1017,7 @@ int ObHashGroupByOp::load_data()
LOG_WARN("fail to process row", K(ret), KPC(exist_curr_gr_item));
}
} else {
if (!is_dump_enabled
|| local_group_rows_.size() < MIN_INMEM_GROUPS
|| (!start_dump && !need_start_dump(input_rows, est_part_cnt, check_dump))) {
if (can_insert_ht) {
++agged_row_cnt_;
++agged_group_cnt_;
ObGroupRowItem *tmp_gr_item = NULL;
@ -1942,6 +1943,11 @@ int ObHashGroupByOp::batch_process_duplicate_data(
ObEvalCtx::BatchInfoScopeGuard batch_info_guard(eval_ctx_);
batch_info_guard.set_batch_size(child_brs.size_);
MEMSET(is_dumped_, 0, sizeof(bool) * child_brs.size_);
bool can_insert_ht = NULL == bloom_filter
&& (!enable_dump_
|| local_group_rows_.size() < MIN_INMEM_GROUPS
|| process_check_dump
|| !need_start_dump(input_rows, est_part_cnt, force_check_dump));
do {
// firstly process duplicate data
if (OB_FAIL(next_duplicate_data_permutation(nth_dup_data, last_group, &child_brs, insert_group_ht))) {
@ -1978,11 +1984,7 @@ int ObHashGroupByOp::batch_process_duplicate_data(
agged_row_cnt_++;
LOG_DEBUG("exist item", K(gri_cnt_per_batch_), K(*exist_curr_gr_item),
K(i), K(agged_row_cnt_));
} else if (NULL == bloom_filter
&& (!enable_dump_
|| local_group_rows_.size() < MIN_INMEM_GROUPS
|| process_check_dump
|| !need_start_dump(input_rows, est_part_cnt, force_check_dump))) {
} else if (can_insert_ht) {
++agged_row_cnt_;
++agged_group_cnt_;
ObGroupRowItem *tmp_gr_item = NULL;
@ -2032,7 +2034,6 @@ int ObHashGroupByOp::batch_process_duplicate_data(
K(parts[part_idx]->datum_store_.get_row_cnt()), K(i));
}
}
force_check_dump = false;
} // for end
if (OB_SUCC(ret) && 0 < tmp_group_cnt) {
if (OB_FAIL(group_store_.add_batch(dup_groupby_exprs_, eval_ctx_, *child_brs.skip_,