This is an automated email from the ASF dual-hosted git repository. mrhhsg pushed a commit to branch spill_and_reserve in repository https://gitbox.apache.org/repos/asf/doris.git
commit fc1ec0e4b9715c07f53e8874ee23ffe9dcd89ad4 Author: Jerry Hu <[email protected]> AuthorDate: Mon Oct 28 15:07:06 2024 +0800 [fix](scan) Avoid memory allocated by buffered_reader from being traced (#42558) Issue Number: close #xxx <!--Describe your changes.--> --------- Co-authored-by: Pxl <[email protected]> Co-authored-by: Gabriel <[email protected]> --- be/src/pipeline/exec/exchange_sink_buffer.h | 3 +-- be/src/pipeline/exec/exchange_sink_operator.h | 1 - be/src/vec/runtime/partitioner.cpp | 1 + be/src/vec/sink/vdata_stream_sender.cpp | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/be/src/pipeline/exec/exchange_sink_buffer.h b/be/src/pipeline/exec/exchange_sink_buffer.h index 2e6cf60786e..0f78a876b10 100644 --- a/be/src/pipeline/exec/exchange_sink_buffer.h +++ b/be/src/pipeline/exec/exchange_sink_buffer.h @@ -198,12 +198,11 @@ public: _finish_dependency = finish_dependency; } + void set_low_memory_mode() { _queue_capacity = 8; } void set_broadcast_dependency(std::shared_ptr<Dependency> broadcast_dependency) { _broadcast_dependency = broadcast_dependency; } - void set_low_memory_mode() { _queue_capacity = 8; } - private: friend class ExchangeSinkLocalState; diff --git a/be/src/pipeline/exec/exchange_sink_operator.h b/be/src/pipeline/exec/exchange_sink_operator.h index 63d50290005..ee94084e3f2 100644 --- a/be/src/pipeline/exec/exchange_sink_operator.h +++ b/be/src/pipeline/exec/exchange_sink_operator.h @@ -136,7 +136,6 @@ private: int _sender_id; std::shared_ptr<vectorized::BroadcastPBlockHolderMemLimiter> _broadcast_pb_mem_limiter; - size_t _rpc_channels_num = 0; vectorized::BlockSerializer _serializer; std::shared_ptr<Dependency> _queue_dependency = nullptr; diff --git a/be/src/vec/runtime/partitioner.cpp b/be/src/vec/runtime/partitioner.cpp index 671e77e9f1c..5a56c00674f 100644 --- a/be/src/vec/runtime/partitioner.cpp +++ b/be/src/vec/runtime/partitioner.cpp @@ -64,6 +64,7 @@ template <typename ChannelIds> Status Crc32HashPartitioner<ChannelIds>::clone(RuntimeState* state, std::unique_ptr<PartitionerBase>& partitioner) { auto* new_partitioner = new Crc32HashPartitioner<ChannelIds>(cast_set<int>(_partition_count)); + partitioner.reset(new_partitioner); new_partitioner->_partition_expr_ctxs.resize(_partition_expr_ctxs.size()); for (size_t i = 0; i < _partition_expr_ctxs.size(); i++) { diff --git a/be/src/vec/sink/vdata_stream_sender.cpp b/be/src/vec/sink/vdata_stream_sender.cpp index 5d17295c414..dcd103e4d11 100644 --- a/be/src/vec/sink/vdata_stream_sender.cpp +++ b/be/src/vec/sink/vdata_stream_sender.cpp @@ -95,7 +95,6 @@ Status Channel::open(RuntimeState* state) { } } _be_number = state->be_number(); - _brpc_timeout_ms = get_execution_rpc_timeout_ms(state->execution_timeout()); _serializer.set_is_local(_is_local); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
