diff --git a/be/src/vec/exec/vaggregation_node.cpp b/be/src/vec/exec/vaggregation_node.cpp index bfaa5f09aeb0575..835759c93f1ba0c 100644 --- a/be/src/vec/exec/vaggregation_node.cpp +++ b/be/src/vec/exec/vaggregation_node.cpp @@ -931,6 +931,7 @@ void AggregationNode::_emplace_into_hash_table(AggregateDataPtr* places, ColumnR places); } } else { + SCOPED_TIMER(_hash_table_emplace_timer); for (size_t i = 0; i < num_rows; ++i) { AggregateDataPtr mapped = nullptr; if constexpr (ColumnsHashing::IsSingleNullableColumnMethod< diff --git a/be/src/vec/exec/vaggregation_node.h b/be/src/vec/exec/vaggregation_node.h index 6679c1255788ec0..cd763b62b52c787 100644 --- a/be/src/vec/exec/vaggregation_node.h +++ b/be/src/vec/exec/vaggregation_node.h @@ -763,7 +763,7 @@ struct AggregateDataContainer { IteratorBase(Container* container_, uint32_t index_) : container(container_), index(index_) { sub_container_index = index / SUB_CONTAINER_CAPACITY; - index_in_sub_container = index % SUB_CONTAINER_CAPACITY; + index_in_sub_container = index - sub_container_index * SUB_CONTAINER_CAPACITY; } bool operator==(const IteratorBase& rhs) const { return index == rhs.index; } @@ -771,8 +771,11 @@ struct AggregateDataContainer { Derived& operator++() { index++; - sub_container_index = index / SUB_CONTAINER_CAPACITY; - index_in_sub_container = index % SUB_CONTAINER_CAPACITY; + index_in_sub_container++; + if (index_in_sub_container == SUB_CONTAINER_CAPACITY) { + index_in_sub_container = 0; + sub_container_index++; + } return static_cast(*this); } diff --git a/be/src/vec/utils/template_helpers.hpp b/be/src/vec/utils/template_helpers.hpp index 99ac2f8ac4a7954..05dcd9a3d203dad 100644 --- a/be/src/vec/utils/template_helpers.hpp +++ b/be/src/vec/utils/template_helpers.hpp @@ -18,6 +18,7 @@ #pragma once #include +#include namespace doris::vectorized { diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh index a9548c6b0ffdceb..89532b199420452 100755 --- a/thirdparty/build-thirdparty.sh +++ b/thirdparty/build-thirdparty.sh @@ -1524,7 +1524,7 @@ build_opentelemetry() { cd "${BUILD_DIR}" "${CMAKE_CMD}" -G "${GENERATOR}" -DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" -DCMAKE_PREFIX_PATH="${TP_INSTALL_DIR}" -DBUILD_TESTING=OFF \ - -DWITH_OTLP=ON -DWITH_OTLP_GRPC=OFF -DWITH_OTLP_HTTP=ON -DWITH_ZIPKIN=ON -DWITH_EXAMPLES=OFF .. + -DWITH_OTLP=ON -DWITH_OTLP_GRPC=OFF -DWITH_OTLP_HTTP=ON -DWITH_ZIPKIN=ON -DWITH_EXAMPLES=OFF -DWITH_ABSEIL=ON .. "${BUILD_SYSTEM}" -j "${PARALLEL}" "${BUILD_SYSTEM}" install