This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 9ee7fa45d1 [Refactor](multi-catalog) Refactor to process splitted
conjuncts for dict filter. (#21459)
9ee7fa45d1 is described below
commit 9ee7fa45d1e9fb73d18cabe92473dcc24ea8053e
Author: Qi Chen <kaka11.c...@gmail.com>
AuthorDate: Fri Jul 7 09:19:08 2023 +0800
[Refactor](multi-catalog) Refactor to process splitted conjuncts for dict
filter. (#21459)
Conjuncts are currently split, so refactor source code to handle split
conjuncts for dict filters.
---
be/src/vec/exec/scan/vfile_scanner.cpp | 61 ++++++++++++----------------------
be/src/vec/exec/scan/vfile_scanner.h | 4 +--
2 files changed, 23 insertions(+), 42 deletions(-)
diff --git a/be/src/vec/exec/scan/vfile_scanner.cpp
b/be/src/vec/exec/scan/vfile_scanner.cpp
index 359e05624e..b95d2aa773 100644
--- a/be/src/vec/exec/scan/vfile_scanner.cpp
+++ b/be/src/vec/exec/scan/vfile_scanner.cpp
@@ -156,47 +156,30 @@ Status VFileScanner::prepare(
return Status::OK();
}
-Status VFileScanner::_split_conjuncts() {
+Status VFileScanner::_process_conjuncts_for_dict_filter() {
for (auto& conjunct : _conjuncts) {
- RETURN_IF_ERROR(_split_conjuncts_expr(conjunct, conjunct->root()));
- }
- return Status::OK();
-}
-Status VFileScanner::_split_conjuncts_expr(const VExprContextSPtr& context,
- const VExprSPtr&
conjunct_expr_root) {
- static constexpr auto is_leaf = [](const auto& expr) { return
!expr->is_and_expr(); };
- if (conjunct_expr_root) {
- if (is_leaf(conjunct_expr_root)) {
- auto impl = conjunct_expr_root->get_impl();
- // If impl is not null, which means this a conjuncts from runtime
filter.
- auto cur_expr = impl ? impl : conjunct_expr_root;
- VExprContextSPtr new_ctx = VExprContext::create_shared(cur_expr);
- context->clone_fn_contexts(new_ctx.get());
- RETURN_IF_ERROR(new_ctx->prepare(_state, *_default_val_row_desc));
- RETURN_IF_ERROR(new_ctx->open(_state));
-
- std::vector<int> slot_ids;
- _get_slot_ids(cur_expr.get(), &slot_ids);
- if (slot_ids.size() == 0) {
- _not_single_slot_filter_conjuncts.emplace_back(new_ctx);
- return Status::OK();
- }
- bool single_slot = true;
- for (int i = 1; i < slot_ids.size(); i++) {
- if (slot_ids[i] != slot_ids[0]) {
- single_slot = false;
- break;
- }
- }
- if (single_slot) {
- SlotId slot_id = slot_ids[0];
- _slot_id_to_filter_conjuncts[slot_id].emplace_back(new_ctx);
- } else {
- _not_single_slot_filter_conjuncts.emplace_back(new_ctx);
+ auto impl = conjunct->root()->get_impl();
+ // If impl is not null, which means this a conjuncts from runtime
filter.
+ auto cur_expr = impl ? impl : conjunct->root();
+
+ std::vector<int> slot_ids;
+ _get_slot_ids(cur_expr.get(), &slot_ids);
+ if (slot_ids.size() == 0) {
+ _not_single_slot_filter_conjuncts.emplace_back(conjunct);
+ return Status::OK();
+ }
+ bool single_slot = true;
+ for (int i = 1; i < slot_ids.size(); i++) {
+ if (slot_ids[i] != slot_ids[0]) {
+ single_slot = false;
+ break;
}
+ }
+ if (single_slot) {
+ SlotId slot_id = slot_ids[0];
+ _slot_id_to_filter_conjuncts[slot_id].emplace_back(conjunct);
} else {
- RETURN_IF_ERROR(_split_conjuncts_expr(context,
conjunct_expr_root->children()[0]));
- RETURN_IF_ERROR(_split_conjuncts_expr(context,
conjunct_expr_root->children()[1]));
+ _not_single_slot_filter_conjuncts.emplace_back(conjunct);
}
}
return Status::OK();
@@ -918,7 +901,7 @@ Status VFileScanner::_init_expr_ctxes() {
// TODO: It should can move to scan node to process.
if (!_conjuncts.empty()) {
- _split_conjuncts();
+ _process_conjuncts_for_dict_filter();
}
return Status::OK();
}
diff --git a/be/src/vec/exec/scan/vfile_scanner.h
b/be/src/vec/exec/scan/vfile_scanner.h
index 8d9567c067..0b1d7a558a 100644
--- a/be/src/vec/exec/scan/vfile_scanner.h
+++ b/be/src/vec/exec/scan/vfile_scanner.h
@@ -185,9 +185,7 @@ private:
Status _convert_to_output_block(Block* block);
Status _generate_fill_columns();
Status _handle_dynamic_block(Block* block);
- Status _split_conjuncts();
- Status _split_conjuncts_expr(const VExprContextSPtr& context,
- const VExprSPtr& conjunct_expr_root);
+ Status _process_conjuncts_for_dict_filter();
void _get_slot_ids(VExpr* expr, std::vector<int>* slot_ids);
void _reset_counter() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
