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

discard _enable_hash_join_hasher

Browse Source
This commit is contained in:
18523270951@163.com
2024-10-29 10:48:08 +00:00
committed by ob-robot
parent 0fa613ffd6
commit 57098f705c
2 changed files with 18 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/sql/engine/join/ob_hash_join_op.cpp
View File

@ -316,35 +316,10 @@ ObHashJoinOp::ObHashJoinOp(ObExecContext &ctx_, const ObOpSpec &spec, ObOpInput
get_next_left_batch_func_ = &ObHashJoinOp::get_next_left_row_batch;
}
int ObHashJoinOp::set_hash_function(int8_t hash_join_hasher)
int ObHashJoinOp::set_hash_function()
{
int ret = OB_SUCCESS;
const common::ObIArray<common::ObHashFunc> *cur_hash_funcs = &MY_SPEC.all_hash_funcs_;
if (DEFAULT_MURMUR_HASH != (hash_join_hasher & HASH_FUNCTION_MASK)) {
ObHashFunc hash_func;
if (OB_FAIL(tmp_hash_funcs_.init(MY_SPEC.all_hash_funcs_.count()))) {
LOG_WARN("failed to init tmp hash func", K(ret));
} else {
for (int64_t i = 0; i < MY_SPEC.all_hash_funcs_.count() && OB_SUCC(ret); ++i) {
if (ENABLE_WY_HASH == (hash_join_hasher & HASH_FUNCTION_MASK)) {
hash_func.hash_func_ = MY_SPEC.all_join_keys_.at(i)->basic_funcs_->wy_hash_;
} else if (ENABLE_XXHASH64 == (hash_join_hasher & HASH_FUNCTION_MASK)) {
hash_func.hash_func_ = MY_SPEC.all_join_keys_.at(i)->basic_funcs_->xx_hash_;
} else {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected status: hash join hasher is invalid", K(ret), K(hash_join_hasher));
}
if (OB_FAIL(ret)) {
} else if (OB_FAIL(tmp_hash_funcs_.push_back(hash_func))) {
LOG_WARN("failed to push back wy hash func", K(ret));
} else {
LOG_DEBUG("debug hash function", K(hash_func), K(i), K(*MY_SPEC.all_join_keys_.at(i)));
}
}
cur_hash_funcs = &tmp_hash_funcs_;
}
}
if (OB_SUCC(ret)) {
int64_t all_cnt = cur_hash_funcs->count();
left_hash_funcs_.init(
all_cnt / 2, const_cast<ObHashFunc*>(&cur_hash_funcs->at(0)), all_cnt / 2);
@ -360,7 +335,6 @@ int ObHashJoinOp::set_hash_function(int8_t hash_join_hasher)
LOG_WARN("unexpected status: hash func is not match", K(ret), K(cur_hash_funcs->count()),
K(MY_SPEC.all_join_keys_.count()));
}
}
return ret;
}
@ -432,7 +406,7 @@ int ObHashJoinOp::inner_open()
if (0 == (hash_join_processor_ & HJ_PROCESSOR_MASK)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpect hash join processor", K(ret), K(hash_join_processor_));
} else if (OB_FAIL(set_hash_function(tenant_config->_enable_hash_join_hasher))) {
} else if (OB_FAIL(set_hash_function())) {
LOG_WARN("unexpect hash join function", K(ret));
}
} else {

3
src/sql/engine/join/ob_hash_join_op.h
View File

@ -840,7 +840,7 @@ private:
int inner_join_read_hashrow_func_end();
int other_join_read_hashrow_func_end();
int set_hash_function(int8_t hash_join_hasher);
int set_hash_function();
int next();
int join_end_operate();
@ -1288,6 +1288,7 @@ inline int ObHashJoinOp::init_mem_context(uint64_t tenant_id)
if (OB_FAIL(CURRENT_CONTEXT->CREATE_CONTEXT(mem_context_, param))) {
SQL_ENG_LOG(WARN, "create entity failed", K(ret));
} else if (OB_ISNULL(mem_context_)) {
ret = OB_ERR_UNEXPECTED;
SQL_ENG_LOG(WARN, "mem entity is null", K(ret));
} else {
alloc_ = &mem_context_->get_malloc_allocator();