Skip to content

Commit

Permalink
[fix](expr)Remove the _can_fast_execute flag from VExpr. (#45542) (#4…
Browse files Browse the repository at this point in the history
  • Loading branch information
Mryange authored Dec 22, 2024
1 parent 303557a commit 367ecc3
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 12 deletions.
4 changes: 1 addition & 3 deletions be/src/vec/exprs/vcompound_pred.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,13 @@ class VCompoundPred : public VectorizedFnCall {
}

if (all_pass && !res.is_empty()) {
// set fast_execute when expr evaluated by inverted index correctly
_can_fast_execute = true;
context->get_inverted_index_context()->set_inverted_index_result_for_expr(this, res);
}
return Status::OK();
}

Status execute(VExprContext* context, Block* block, int* result_column_id) override {
if (_can_fast_execute && fast_execute(context, block, result_column_id)) {
if (fast_execute(context, block, result_column_id)) {
return Status::OK();
}
if (children().size() == 1 || !_all_child_is_compound_and_not_const()) {
Expand Down
2 changes: 1 addition & 1 deletion be/src/vec/exprs/vectorized_fn_call.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Status VectorizedFnCall::_do_execute(doris::vectorized::VExprContext* context,
if (is_const_and_have_executed()) { // const have executed in open function
return get_result_from_const(block, _expr_name, result_column_id);
}
if (_can_fast_execute && fast_execute(context, block, result_column_id)) {
if (fast_execute(context, block, result_column_id)) {
return Status::OK();
}
DBUG_EXECUTE_IF("VectorizedFnCall.must_in_slow_path", {
Expand Down
2 changes: 0 additions & 2 deletions be/src/vec/exprs/vexpr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -716,8 +716,6 @@ Status VExpr::_evaluate_inverted_index(VExprContext* context, const FunctionBase
for (int column_id : column_ids) {
index_context->set_true_for_inverted_index_status(this, column_id);
}
// set fast_execute when expr evaluated by inverted index correctly
_can_fast_execute = true;
}
return Status::OK();
}
Expand Down
1 change: 0 additions & 1 deletion be/src/vec/exprs/vexpr.h
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,6 @@ class VExpr {

// ensuring uniqueness during index traversal
uint32_t _index_unique_id = 0;
bool _can_fast_execute = false;
bool _enable_inverted_index_query = true;
uint32_t _in_list_value_count_threshold = 10;
};
Expand Down
15 changes: 11 additions & 4 deletions be/src/vec/exprs/vin_predicate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ Status VInPredicate::open(RuntimeState* state, VExprContext* context,
if (scope == FunctionContext::FRAGMENT_LOCAL) {
RETURN_IF_ERROR(VExpr::get_const_col(context, nullptr));
}
_is_args_all_constant = std::all_of(_children.begin() + 1, _children.end(),
[](const VExprSPtr& expr) { return expr->is_constant(); });
_open_finished = true;
return Status::OK();
}
Expand All @@ -113,13 +115,18 @@ Status VInPredicate::execute(VExprContext* context, Block* block, int* result_co
if (is_const_and_have_executed()) { // const have execute in open function
return get_result_from_const(block, _expr_name, result_column_id);
}
if (_can_fast_execute && fast_execute(context, block, result_column_id)) {
if (fast_execute(context, block, result_column_id)) {
return Status::OK();
}
DCHECK(_open_finished || _getting_const_col);
// TODO: not execute const expr again, but use the const column in function context
doris::vectorized::ColumnNumbers arguments(_children.size());
for (int i = 0; i < _children.size(); ++i) {

// This is an optimization. For expressions like colA IN (1, 2, 3, 4),
// where all values inside the IN clause are constants,
// a hash set is created during open, and it will not be accessed again during execute
// Here, _children[0] is colA
const size_t args_size = _is_args_all_constant ? 1 : _children.size();
doris::vectorized::ColumnNumbers arguments(args_size);
for (int i = 0; i < args_size; ++i) {
int column_id = -1;
RETURN_IF_ERROR(_children[i]->execute(context, block, &column_id));
arguments[i] = column_id;
Expand Down
1 change: 1 addition & 0 deletions be/src/vec/exprs/vin_predicate.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,6 @@ class VInPredicate final : public VExpr {

const bool _is_not_in;
static const constexpr char* function_name = "in";
bool _is_args_all_constant = false;
};
} // namespace doris::vectorized
2 changes: 1 addition & 1 deletion be/src/vec/exprs/vmatch_predicate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Status VMatchPredicate::evaluate_inverted_index(VExprContext* context, uint32_t

Status VMatchPredicate::execute(VExprContext* context, Block* block, int* result_column_id) {
DCHECK(_open_finished || _getting_const_col);
if (_can_fast_execute && fast_execute(context, block, result_column_id)) {
if (fast_execute(context, block, result_column_id)) {
return Status::OK();
}
DBUG_EXECUTE_IF("VMatchPredicate.execute", {
Expand Down

0 comments on commit 367ecc3

Please sign in to comment.