update

apache · Aug 9, 2023 · 6cfe661 · 6cfe661
1 parent d49f107
commit 6cfe661
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -763,16 +763,19 @@ 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; }
         bool operator!=(const IteratorBase& rhs) const { return index != rhs.index; }
 
         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<Derived&>(*this);
         }
 

diff --git a/be/src/vec/utils/template_helpers.hpp b/be/src/vec/utils/template_helpers.hpp
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <limits>
+#include <variant>
 
 namespace doris::vectorized {
 

diff --git 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