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 66d6fd02c1390c46135aa9642259b1ed0f1792d9 Author: Jerry Hu <[email protected]> AuthorDate: Tue Nov 5 14:57:26 2024 +0800 fix compile error after rebase --- be/src/pipeline/exec/exchange_sink_operator.h | 1 + be/src/pipeline/exec/hashjoin_build_sink.cpp | 7 ++++--- be/src/pipeline/exec/set_sink_operator.cpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/be/src/pipeline/exec/exchange_sink_operator.h b/be/src/pipeline/exec/exchange_sink_operator.h index ee94084e3f2..63d50290005 100644 --- a/be/src/pipeline/exec/exchange_sink_operator.h +++ b/be/src/pipeline/exec/exchange_sink_operator.h @@ -136,6 +136,7 @@ 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/pipeline/exec/hashjoin_build_sink.cpp b/be/src/pipeline/exec/hashjoin_build_sink.cpp index b3595965f12..34f3d56fb46 100644 --- a/be/src/pipeline/exec/hashjoin_build_sink.cpp +++ b/be/src/pipeline/exec/hashjoin_build_sink.cpp @@ -19,6 +19,7 @@ #include <string> +#include "common/cast_set.h" #include "common/exception.h" #include "exprs/bloom_filter_func.h" #include "pipeline/exec/hashjoin_probe_operator.h" @@ -131,13 +132,13 @@ size_t HashJoinBuildSinkLocalState::get_reserve_mem_size(RuntimeState* state, bo const auto estimated_size_of_next_block = bytes_per_row * state->batch_size(); // If the new size is greater than 85% of allocalted bytes, it maybe need to realloc. if (((estimated_size_of_next_block + bytes) * 100 / allocated_bytes) >= 85) { - size_to_reserve += (size_t)(allocated_bytes * 1.15); + size_to_reserve += static_cast<size_t>(static_cast<double>(allocated_bytes) * 1.15); } } if (eos) { const size_t rows = build_block_rows + state->batch_size(); - size_t bucket_size = JoinHashTable<StringRef>::calc_bucket_size(rows); + const auto bucket_size = JoinHashTable<StringRef>::calc_bucket_size(rows); size_to_reserve += bucket_size * sizeof(uint32_t); // JoinHashTable::first size_to_reserve += rows * sizeof(uint32_t); // JoinHashTable::next @@ -187,7 +188,7 @@ size_t HashJoinBuildSinkLocalState::get_reserve_mem_size(RuntimeState* state, bo raw_ptrs, block.rows(), true, true, bucket_size); }}, - *_shared_state->hash_table_variants); + _shared_state->hash_table_variants->method_variant); } } return size_to_reserve; diff --git a/be/src/pipeline/exec/set_sink_operator.cpp b/be/src/pipeline/exec/set_sink_operator.cpp index 09953cf3871..82bf523c60a 100644 --- a/be/src/pipeline/exec/set_sink_operator.cpp +++ b/be/src/pipeline/exec/set_sink_operator.cpp @@ -223,7 +223,7 @@ size_t SetSinkOperatorX<is_intersect>::get_reserve_mem_size(RuntimeState* state, return arg.hash_table->estimate_memory(state->batch_size()); } }, - *local_state._shared_state->hash_table_variants); + local_state._shared_state->hash_table_variants->method_variant); size_to_reserve += local_state._mutable_block.allocated_bytes(); for (auto& _child_expr : _child_exprs) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
