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
commit 1aa7a914e19153d1b3da658d7f57f478747ffdf0 Author: Pxl <[email protected]> AuthorDate: Thu Feb 1 08:18:25 2024 +0800 fix wrong profile on distinct agg and pass reference on uint136's compare (#30661) --- be/src/vec/common/uint128.h | 2 +- be/src/vec/exec/distinct_vaggregation_node.cpp | 2 +- be/src/vec/exec/vaggregation_node.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/be/src/vec/common/uint128.h b/be/src/vec/common/uint128.h index 540323c264d..a9c30328ab7 100644 --- a/be/src/vec/common/uint128.h +++ b/be/src/vec/common/uint128.h @@ -177,7 +177,7 @@ struct UInt136 { UInt64 b; UInt64 c; - bool operator==(const UInt136 rhs) const { return a == rhs.a && b == rhs.b && c == rhs.c; } + bool operator==(const UInt136& rhs) const { return a == rhs.a && b == rhs.b && c == rhs.c; } }; #pragma pack() diff --git a/be/src/vec/exec/distinct_vaggregation_node.cpp b/be/src/vec/exec/distinct_vaggregation_node.cpp index 09439010327..bacfb91e961 100644 --- a/be/src/vec/exec/distinct_vaggregation_node.cpp +++ b/be/src/vec/exec/distinct_vaggregation_node.cpp @@ -35,7 +35,6 @@ DistinctAggregationNode::DistinctAggregationNode(ObjectPool* pool, const TPlanNo Status DistinctAggregationNode::_distinct_pre_agg_with_serialized_key( doris::vectorized::Block* in_block, doris::vectorized::Block* out_block) { - SCOPED_TIMER(_exec_timer); DCHECK(!_probe_expr_ctxs.empty()); size_t key_size = _probe_expr_ctxs.size(); @@ -59,6 +58,7 @@ Status DistinctAggregationNode::_distinct_pre_agg_with_serialized_key( RETURN_IF_CATCH_EXCEPTION( _emplace_into_hash_table_to_distinct(_distinct_row, key_columns, rows)); + SCOPED_TIMER(_insert_keys_to_column_timer); bool mem_reuse = _make_nullable_keys.empty() && out_block->mem_reuse(); if (mem_reuse) { for (int i = 0; i < key_size; ++i) { diff --git a/be/src/vec/exec/vaggregation_node.h b/be/src/vec/exec/vaggregation_node.h index 30eb8aa9d33..bbb0ea62019 100644 --- a/be/src/vec/exec/vaggregation_node.h +++ b/be/src/vec/exec/vaggregation_node.h @@ -437,6 +437,7 @@ protected: RuntimeProfile::Counter* _hash_table_emplace_timer = nullptr; RuntimeProfile::Counter* _hash_table_input_counter = nullptr; RuntimeProfile::Counter* _expr_timer = nullptr; + RuntimeProfile::Counter* _insert_keys_to_column_timer = nullptr; private: friend class pipeline::AggSinkOperator; @@ -479,7 +480,6 @@ private: RuntimeProfile::Counter* _serialize_result_timer = nullptr; RuntimeProfile::Counter* _deserialize_data_timer = nullptr; RuntimeProfile::Counter* _hash_table_iterate_timer = nullptr; - RuntimeProfile::Counter* _insert_keys_to_column_timer = nullptr; RuntimeProfile::Counter* _streaming_agg_timer = nullptr; RuntimeProfile::Counter* _hash_table_size_counter = nullptr; RuntimeProfile::Counter* _max_row_size_counter = nullptr; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
