fix shared hash join core because of change part count && fix tpch performance regression because of check alive

This commit is contained in:
obdev
2023-03-21 16:01:00 +00:00
committed by ob-robot
parent a0b154e08e
commit 773b55713e
3 changed files with 28 additions and 13 deletions

View File

@ -1452,6 +1452,11 @@ int ObHashJoinOp::get_max_memory_size(int64_t input_size)
}
buf_mgr_->reuse();
buf_mgr_->set_reserve_memory_size(remain_data_memory_size_, 1.0);
if (OB_SUCC(ret)) {
if (OB_FAIL(sync_wait_part_count())) {
LOG_WARN("failed to sync part count", K(ret));
}
}
if (OB_SUCC(ret) && is_vectorized()) {
char *buf = NULL;
if (part_count_ <= 0) {
@ -1467,11 +1472,6 @@ int ObHashJoinOp::get_max_memory_size(int64_t input_size)
sizeof(uint16_t) * (MY_SPEC.max_batch_size_ * part_count_));
}
}
if (OB_SUCC(ret)) {
if (OB_FAIL(sync_wait_part_count())) {
LOG_WARN("failed to sync part count", K(ret));
}
}
return ret;
}