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

fix shared hj hang when 1 of worker is interrupted in sync_open && fix 3-stage aggr do not reset distinct info leads 4005

Browse Source
This commit is contained in:
obdev
2023-02-08 11:11:16 +08:00
committed by ob-robot
parent c91a1e8f70
commit 9bd86a8db4
5 changed files with 57 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,7 @@ void ObHashGroupByOp::reset()
first_batch_from_store_ = true;
is_init_distinct_data_ = false;
use_distinct_data_ = false;
distinct_data_set_.reset();
reset_distinct_info();
bypass_ctrl_.reset();
by_pass_nth_group_ = 0;
by_pass_child_brs_ = nullptr;
@ -736,6 +736,17 @@ int ObHashGroupByOp::init_distinct_info(bool is_part)
return ret;
}
void ObHashGroupByOp::reset_distinct_info()
{
hash_funcs_.destroy();
cmp_funcs_.destroy();
sort_collations_.destroy();
distinct_data_set_.destroy_my_skip();
distinct_data_set_.destroy_items();
distinct_data_set_.destroy_distinct_map();
distinct_data_set_.reset();
}
int ObHashGroupByOp::finish_insert_distinct_data()
{
int ret = OB_SUCCESS;
@ -760,6 +771,7 @@ int ObHashGroupByOp::insert_distinct_data()
bool inserted = false;
const ObChunkDatumStore::StoredRow *store_row = nullptr;
if (!is_init_distinct_data_ && OB_FAIL(init_distinct_info(false))) {
LOG_WARN("failed to init distinct info", K(ret));
} else if (OB_FAIL(distinct_data_set_.insert_row(distinct_origin_exprs_, has_exists, inserted))) {
LOG_WARN("failed to insert row", K(ret));
} else {

1
src/sql/engine/aggregate/ob_hash_groupby_op.h
View File

@ -363,6 +363,7 @@ private:
int insert_distinct_data();
int finish_insert_distinct_data();
int init_distinct_info(bool is_part);
void reset_distinct_info();
int batch_insert_distinct_data(const ObBatchRows &child_brs);
int batch_insert_all_distinct_data(const int64_t batch_size);