database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[refactor](conjuncts) simplify conjuncts in exec node (#19254)

Browse Source 
Co-authored-by: yiguolei <yiguolei@gmail.com>
Currently, exec node save exprcontext**, but the object is in object pool, the code is very unclear. we could just use exprcontext*.
This commit is contained in:
yiguolei
2023-05-04 18:04:32 +08:00
committed by GitHub
parent fa7d86efbd
commit 4e4fb33995
29 changed files with 84 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
be/src/vec/exec/scan/vscan_node.cpp
View File

@ -391,8 +391,8 @@ Status VScanNode::_append_rf_into_conjuncts(std::vector<VExpr*>& vexprs) {
}
VExpr* last_expr = nullptr;
if (_vconjunct_ctx_ptr) {
last_expr = (*_vconjunct_ctx_ptr)->root();
if (_vconjunct_ctx_ptr != nullptr) {
last_expr = _vconjunct_ctx_ptr->root();
} else {
DCHECK(_rf_vexpr_set.find(vexprs[0]) == _rf_vexpr_set.end());
last_expr = vexprs[0];
@ -430,15 +430,14 @@ Status VScanNode::_append_rf_into_conjuncts(std::vector<VExpr*>& vexprs) {
}
auto new_vconjunct_ctx_ptr = _pool->add(VExprContext::create_unique(last_expr).release());
if (_vconjunct_ctx_ptr) {
(*_vconjunct_ctx_ptr)->clone_fn_contexts(new_vconjunct_ctx_ptr);
_vconjunct_ctx_ptr->clone_fn_contexts(new_vconjunct_ctx_ptr);
}
RETURN_IF_ERROR(new_vconjunct_ctx_ptr->prepare(_state, _row_descriptor));
RETURN_IF_ERROR(new_vconjunct_ctx_ptr->open(_state));
if (_vconjunct_ctx_ptr) {
_stale_vexpr_ctxs.push_back(std::move(_vconjunct_ctx_ptr));
_stale_vexpr_ctxs.push_back(_vconjunct_ctx_ptr);
}
_vconjunct_ctx_ptr.reset(new doris::vectorized::VExprContext*);
*_vconjunct_ctx_ptr = new_vconjunct_ctx_ptr;
_vconjunct_ctx_ptr = new_vconjunct_ctx_ptr;
return Status::OK();
}
@ -468,10 +467,10 @@ void VScanNode::release_resource(RuntimeState* state) {
}
for (auto& ctx : _stale_vexpr_ctxs) {
(*ctx)->close(state);
ctx->close(state);
}
if (_common_vexpr_ctxs_pushdown) {
(*_common_vexpr_ctxs_pushdown)->close(state);
_common_vexpr_ctxs_pushdown->close(state);
}
ExecNode::release_resource(state);
@ -538,18 +537,18 @@ Status VScanNode::_normalize_conjuncts() {
}
}
if (_vconjunct_ctx_ptr) {
if ((*_vconjunct_ctx_ptr)->root()) {
if (_vconjunct_ctx_ptr->root()) {
VExpr* new_root;
RETURN_IF_ERROR(_normalize_predicate((*_vconjunct_ctx_ptr)->root(), &new_root));
RETURN_IF_ERROR(_normalize_predicate(_vconjunct_ctx_ptr->root(), &new_root));
if (new_root) {
(*_vconjunct_ctx_ptr)->set_root(new_root);
_vconjunct_ctx_ptr->set_root(new_root);
if (_should_push_down_common_expr()) {
_common_vexpr_ctxs_pushdown = std::move(_vconjunct_ctx_ptr);
_vconjunct_ctx_ptr.reset(nullptr);
_common_vexpr_ctxs_pushdown = _vconjunct_ctx_ptr;
_vconjunct_ctx_ptr = nullptr;
}
} else { // All conjucts are pushed down as predicate column
_stale_vexpr_ctxs.push_back(std::move(_vconjunct_ctx_ptr));
_vconjunct_ctx_ptr.reset(nullptr);
_stale_vexpr_ctxs.push_back(_vconjunct_ctx_ptr);
_vconjunct_ctx_ptr = nullptr;
}
}
}
@ -604,7 +603,7 @@ Status VScanNode::_normalize_predicate(VExpr* conjunct_expr_root, VExpr** output
SlotDescriptor* slot = nullptr;
ColumnValueRangeType* range = nullptr;
PushDownType pdt = PushDownType::UNACCEPTABLE;
RETURN_IF_ERROR(_eval_const_conjuncts(cur_expr, *_vconjunct_ctx_ptr, &pdt));
RETURN_IF_ERROR(_eval_const_conjuncts(cur_expr, _vconjunct_ctx_ptr, &pdt));
if (pdt == PushDownType::ACCEPTABLE) {
*output_expr = nullptr;
return Status::OK();
@ -618,28 +617,23 @@ Status VScanNode::_normalize_predicate(VExpr* conjunct_expr_root, VExpr** output
is_runtimer_filter_predicate);
}};
RETURN_IF_PUSH_DOWN(_normalize_in_and_eq_predicate(
cur_expr, *(_vconjunct_ctx_ptr.get()), slot, value_range,
&pdt));
cur_expr, _vconjunct_ctx_ptr, slot, value_range, &pdt));
RETURN_IF_PUSH_DOWN(_normalize_not_in_and_not_eq_predicate(
cur_expr, *(_vconjunct_ctx_ptr.get()), slot, value_range,
&pdt));
cur_expr, _vconjunct_ctx_ptr, slot, value_range, &pdt));
RETURN_IF_PUSH_DOWN(_normalize_is_null_predicate(
cur_expr, *(_vconjunct_ctx_ptr.get()), slot, value_range,
&pdt));
cur_expr, _vconjunct_ctx_ptr, slot, value_range, &pdt));
RETURN_IF_PUSH_DOWN(_normalize_noneq_binary_predicate(
cur_expr, *(_vconjunct_ctx_ptr.get()), slot, value_range,
&pdt));
cur_expr, _vconjunct_ctx_ptr, slot, value_range, &pdt));
RETURN_IF_PUSH_DOWN(_normalize_match_predicate(
cur_expr, *(_vconjunct_ctx_ptr.get()), slot, value_range,
&pdt));
cur_expr, _vconjunct_ctx_ptr, slot, value_range, &pdt));
if (_is_key_column(slot->col_name())) {
RETURN_IF_PUSH_DOWN(_normalize_bitmap_filter(
cur_expr, *(_vconjunct_ctx_ptr.get()), slot, &pdt));
cur_expr, _vconjunct_ctx_ptr, slot, &pdt));
RETURN_IF_PUSH_DOWN(_normalize_bloom_filter(
cur_expr, *(_vconjunct_ctx_ptr.get()), slot, &pdt));
cur_expr, _vconjunct_ctx_ptr, slot, &pdt));
if (_state->enable_function_pushdown()) {
RETURN_IF_PUSH_DOWN(_normalize_function_filters(
cur_expr, *(_vconjunct_ctx_ptr.get()), slot, &pdt));
cur_expr, _vconjunct_ctx_ptr, slot, &pdt));
}
}
},
@ -648,7 +642,7 @@ Status VScanNode::_normalize_predicate(VExpr* conjunct_expr_root, VExpr** output
if (pdt == PushDownType::UNACCEPTABLE &&
TExprNodeType::COMPOUND_PRED == cur_expr->node_type()) {
_normalize_compound_predicate(cur_expr, *(_vconjunct_ctx_ptr.get()), &pdt,
_normalize_compound_predicate(cur_expr, _vconjunct_ctx_ptr, &pdt,
is_runtimer_filter_predicate, in_predicate_checker,
eq_predicate_checker);
*output_expr = conjunct_expr_root; // remaining in conjunct tree
@ -676,18 +670,18 @@ Status VScanNode::_normalize_predicate(VExpr* conjunct_expr_root, VExpr** output
} else {
if (left_child == nullptr) {
conjunct_expr_root->children()[0]->close(
_state, *_vconjunct_ctx_ptr,
(*_vconjunct_ctx_ptr)->get_function_state_scope());
_state, _vconjunct_ctx_ptr,
_vconjunct_ctx_ptr->get_function_state_scope());
}
if (right_child == nullptr) {
conjunct_expr_root->children()[1]->close(
_state, *_vconjunct_ctx_ptr,
(*_vconjunct_ctx_ptr)->get_function_state_scope());
_state, _vconjunct_ctx_ptr,
_vconjunct_ctx_ptr->get_function_state_scope());
}
// here only close the and expr self, do not close the child
conjunct_expr_root->set_children({});
conjunct_expr_root->close(_state, *_vconjunct_ctx_ptr,
(*_vconjunct_ctx_ptr)->get_function_state_scope());
conjunct_expr_root->close(_state, _vconjunct_ctx_ptr,
_vconjunct_ctx_ptr->get_function_state_scope());
}
// here do not close VExpr* now
@ -1358,7 +1352,7 @@ Status VScanNode::try_append_late_arrival_runtime_filter(int* arrived_rf_num) {
Status VScanNode::clone_vconjunct_ctx(VExprContext** _vconjunct_ctx) {
if (_vconjunct_ctx_ptr) {
std::unique_lock l(_rf_locks);
return (*_vconjunct_ctx_ptr)->clone(_state, _vconjunct_ctx);
return _vconjunct_ctx_ptr->clone(_state, _vconjunct_ctx);
}
return Status::OK();
}