From d3f3058ecf06aeee9a612bfac77662abc1e55c96 Mon Sep 17 00:00:00 2001 From: "18523270951@163.com" <18523270951@163.com> Date: Fri, 25 Aug 2023 02:47:54 +0000 Subject: [PATCH] fix 3-stage aggr can not dump last group --- .../engine/aggregate/ob_hash_groupby_op.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/sql/engine/aggregate/ob_hash_groupby_op.cpp b/src/sql/engine/aggregate/ob_hash_groupby_op.cpp index db68da7e8..2f8001ea1 100644 --- a/src/sql/engine/aggregate/ob_hash_groupby_op.cpp +++ b/src/sql/engine/aggregate/ob_hash_groupby_op.cpp @@ -1976,11 +1976,11 @@ 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 (!enable_dump_ - || local_group_rows_.size() < MIN_INMEM_GROUPS - || process_check_dump - || (NULL == bloom_filter - && !need_start_dump(input_rows, est_part_cnt, force_check_dump))) { + } 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))) { ++agged_row_cnt_; ++agged_group_cnt_; ObGroupRowItem *tmp_gr_item = NULL; @@ -2267,11 +2267,11 @@ int ObHashGroupByOp::group_child_batch_rows(const ObChunkDatumStore::StoredRow * const_cast(exist_curr_gr_item)->group_row_count_in_batch_++; LOG_DEBUG("exist item", K(gri_cnt_per_batch_), K(*exist_curr_gr_item), K(i), K(agged_row_cnt_)); - } else if (!enable_dump_ - || local_group_rows_.size() < MIN_INMEM_GROUPS - || process_check_dump - || (NULL == bloom_filter - && !need_start_dump(input_rows, est_part_cnt, force_check_dump))) { + } 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))) { // add new local group if (!batch_hash_calculated) { calc_groupby_exprs_hash_batch(dup_groupby_exprs_, child_brs);