This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 66780887670 [cherry-pick](branch-21) reuse the join block to reduce
malloc memory (#43738) (#44349)
66780887670 is described below
commit 667808876706e0d68cbde71638e46134348e0d23
Author: zhangstar333 <zhangs...@selectdb.com>
AuthorDate: Sat Nov 23 03:29:52 2024 +0800
[cherry-pick](branch-21) reuse the join block to reduce malloc memory
(#43738) (#44349)
cherry-pick from master https://github.com/apache/doris/pull/43738/
---
be/src/pipeline/exec/nested_loop_join_probe_operator.cpp | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/be/src/pipeline/exec/nested_loop_join_probe_operator.cpp
b/be/src/pipeline/exec/nested_loop_join_probe_operator.cpp
index dd441e7db22..c33c231a6ca 100644
--- a/be/src/pipeline/exec/nested_loop_join_probe_operator.cpp
+++ b/be/src/pipeline/exec/nested_loop_join_probe_operator.cpp
@@ -523,24 +523,20 @@ Status NestedLoopJoinProbeOperatorX::pull(RuntimeState*
state, vectorized::Block
local_state._matched_rows_done
: local_state._matched_rows_done);
+ size_t join_block_column_size = local_state._join_block.columns();
{
- vectorized::Block tmp_block = local_state._join_block;
-
- // Here make _join_block release the columns' ptr
-
local_state._join_block.set_columns(local_state._join_block.clone_empty_columns());
-
- local_state.add_tuple_is_null_column(&tmp_block);
+ local_state.add_tuple_is_null_column(&local_state._join_block);
{
SCOPED_TIMER(local_state._join_filter_timer);
RETURN_IF_ERROR(vectorized::VExprContext::filter_block(
- local_state._conjuncts, &tmp_block,
tmp_block.columns()));
+ local_state._conjuncts, &local_state._join_block,
+ local_state._join_block.columns()));
}
RETURN_IF_ERROR_OR_CATCH_EXCEPTION(
- local_state._build_output_block(&tmp_block, block, false));
+ local_state._build_output_block(&local_state._join_block,
block, false));
local_state._reset_tuple_is_null_column();
}
- local_state._join_block.clear_column_data();
-
+ local_state._join_block.clear_column_data(join_block_column_size);
if (!(*eos) and !local_state._need_more_input_data) {
auto func = [&](auto&& join_op_variants, auto set_build_side_flag,
auto set_probe_side_flag) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
