From 074a27943d4d5161cc690a9fee5150bd9da82deb Mon Sep 17 00:00:00 2001 From: HappenLee Date: Tue, 1 Oct 2024 10:54:26 +0800 Subject: [PATCH] disable mem save code in shuffle --- be/src/pipeline/exec/hashjoin_build_sink.cpp | 2 +- be/src/vec/core/block.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/be/src/pipeline/exec/hashjoin_build_sink.cpp b/be/src/pipeline/exec/hashjoin_build_sink.cpp index bd618d245984a2f..2ad7dfb899b97ca 100644 --- a/be/src/pipeline/exec/hashjoin_build_sink.cpp +++ b/be/src/pipeline/exec/hashjoin_build_sink.cpp @@ -123,7 +123,7 @@ Status HashJoinBuildSinkLocalState::close(RuntimeState* state, Status exec_statu if (_shared_state->build_block) { // release the memory of unused column in probe stage _shared_state->build_block->clear_column_mem_not_keep( - p._should_keep_column_flags, p._shared_hash_table_context.get() != nullptr); + p._should_keep_column_flags, bool(p._shared_hashtable_controller)); } } diff --git a/be/src/vec/core/block.cpp b/be/src/vec/core/block.cpp index 6f07a8e9c6f3243..e4c5ba795b1ab7d 100644 --- a/be/src/vec/core/block.cpp +++ b/be/src/vec/core/block.cpp @@ -759,7 +759,9 @@ void Block::clear_column_mem_not_keep(const std::vector& column_keep_flags } } - if (need_keep_first && data[0].column->size() != origin_rows) { + if (need_keep_first && data.size() == column_keep_flags.size() && + std::all_of(column_keep_flags.begin(), column_keep_flags.end(), + [](bool v) { return v; })) { auto first_column = data[0].column->clone_empty(); first_column->resize(origin_rows); data[0].column = std::move(first_column);