thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 16:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory tracking of aggregate function topK

Browse Source
This commit is contained in:
Alexey Milovidov 2021-06-14 05:26:05 +03:00
parent 39515083e4
commit dbff1edcd3
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/AggregateFunctions/AggregateFunctionTopK.h
View File

@ -118,7 +118,8 @@ struct AggregateFunctionTopKGenericData
* For such columns topK() can be implemented more efficiently (especially for small numeric arrays). * For such columns topK() can be implemented more efficiently (especially for small numeric arrays).
*/ */
template <bool is_plain_column, bool is_weighted> template <bool is_plain_column, bool is_weighted>
class AggregateFunctionTopKGeneric : public IAggregateFunctionDataHelper<AggregateFunctionTopKGenericData, AggregateFunctionTopKGeneric<is_plain_column, is_weighted>> class AggregateFunctionTopKGeneric
: public IAggregateFunctionDataHelper<AggregateFunctionTopKGenericData, AggregateFunctionTopKGeneric<is_plain_column, is_weighted>>
{ {
private: private:
using State = AggregateFunctionTopKGenericData; using State = AggregateFunctionTopKGenericData;

5
src/Common/SpaceSaving.h
View File

@ -5,6 +5,7 @@
#include <boost/range/adaptor/reversed.hpp> #include <boost/range/adaptor/reversed.hpp>
#include <Common/AllocatorWithMemoryTracking.h>
#include <Common/ArenaWithFreeLists.h> #include <Common/ArenaWithFreeLists.h>
#include <Common/HashTable/Hash.h> #include <Common/HashTable/Hash.h>
#include <Common/HashTable/HashMap.h> #include <Common/HashTable/HashMap.h>
@ -382,8 +383,8 @@ private:
using CounterMap = HashMapWithStackMemory<TKey, Counter *, Hash, 4>; using CounterMap = HashMapWithStackMemory<TKey, Counter *, Hash, 4>;
CounterMap counter_map; CounterMap counter_map;
std::vector<Counter *> counter_list; std::vector<Counter *, AllocatorWithMemoryTracking<Counter *>> counter_list;
std::vector<UInt64> alpha_map; std::vector<UInt64, AllocatorWithMemoryTracking<UInt64>> alpha_map;
SpaceSavingArena<TKey> arena; SpaceSavingArena<TKey> arena;
size_t m_capacity; size_t m_capacity;
size_t removed_keys = 0; size_t removed_keys = 0;

0
tests/queries/0_stateless/01910_memory_tracking_topk.reference Normal file
View File

4
tests/queries/0_stateless/01910_memory_tracking_topk.sql Normal file
View File

@ -0,0 +1,4 @@
-- Memory limit must correctly apply, triggering an exception:
SET max_memory_usage = '100M';
SELECT length(topK(5592405)(tuple(number))) FROM numbers(10) GROUP BY number; -- { serverError 241 }