From 14768f21eed2ce1eeaade850442b7f1475b13e1f Mon Sep 17 00:00:00 2001 From: xufei Date: Wed, 14 May 2025 14:00:51 +0800 Subject: [PATCH 1/2] save work Signed-off-by: xufei --- dbms/src/Interpreters/JoinPartition.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbms/src/Interpreters/JoinPartition.cpp b/dbms/src/Interpreters/JoinPartition.cpp index a060878c4f7..e2606376d97 100644 --- a/dbms/src/Interpreters/JoinPartition.cpp +++ b/dbms/src/Interpreters/JoinPartition.cpp @@ -45,7 +45,7 @@ void insertRowToList(JoinArenaPool & pool, List * list, Elem * elem, size_t cach if unlikely (cache_columns_threshold == list->list_length) { auto * cached_column_info - = reinterpret_cast(pool.arena.alloc(sizeof(CachedColumnInfo))); + = reinterpret_cast(pool.arena.alignedAlloc(sizeof(CachedColumnInfo), 16)); new (cached_column_info) CachedColumnInfo(list->next); pool.cached_column_infos.push_back(cached_column_info); list->cached_column_info = cached_column_info; From a4cf7e6ca6b935a0899e29e695b96768c42af09a Mon Sep 17 00:00:00 2001 From: xufei Date: Fri, 16 May 2025 15:07:10 +0800 Subject: [PATCH 2/2] save work Signed-off-by: xufei --- dbms/src/Interpreters/JoinPartition.cpp | 28 ++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dbms/src/Interpreters/JoinPartition.cpp b/dbms/src/Interpreters/JoinPartition.cpp index e2606376d97..fc88a95a6a6 100644 --- a/dbms/src/Interpreters/JoinPartition.cpp +++ b/dbms/src/Interpreters/JoinPartition.cpp @@ -44,8 +44,8 @@ void insertRowToList(JoinArenaPool & pool, List * list, Elem * elem, size_t cach { if unlikely (cache_columns_threshold == list->list_length) { - auto * cached_column_info - = reinterpret_cast(pool.arena.alignedAlloc(sizeof(CachedColumnInfo), 16)); + auto * cached_column_info = reinterpret_cast( + pool.arena.alignedAlloc(sizeof(CachedColumnInfo), alignof(CachedColumnInfo))); new (cached_column_info) CachedColumnInfo(list->next); pool.cached_column_infos.push_back(cached_column_info); list->cached_column_info = cached_column_info; @@ -652,18 +652,18 @@ void NO_INLINE insertBlockIntoMapsTypeCase( insert_indexes.emplace_back(insert_index); } -#define INSERT_TO_MAP(join_partition, segment_index) \ - auto & current_map = (join_partition)->getHashMap(); \ - for (auto & s_i : (segment_index)) \ - { \ - Inserter::insert( \ - current_map, \ - key_getter, \ - stored_block, \ - s_i, \ - pool, \ - sort_key_containers, \ - probe_cache_column_threshold); \ +#define INSERT_TO_MAP(join_partition, segment_index) \ + auto & current_map = (join_partition) -> getHashMap(); \ + for (auto & s_i : (segment_index)) \ + { \ + Inserter::insert( \ + current_map, \ + key_getter, \ + stored_block, \ + s_i, \ + pool, \ + sort_key_containers, \ + probe_cache_column_threshold); \ } #define INSERT_TO_NOT_INSERTED_MAP \