thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: tiny improved performance of aggregation [#METR-2944].

Browse Source
This commit is contained in:
Alexey Milovidov 2014-05-10 05:37:12 +04:00
parent 47afe8bd9c
commit 82a44f8eec
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dbms/include/DB/Interpreters/Aggregator.h
View File

@ -91,7 +91,7 @@ struct AggregationMethodKey64
/** Разместить дополнительные данные, если это необходимо, в случае, когда в хэш-таблицу был вставлен новый ключ.
*/
void onNewKey(iterator & it, size_t keys_size, size_t i, StringRefs & keys)
void onNewKey(iterator & it, size_t keys_size, size_t i, StringRefs & keys, Arena & pool)
{
}
@ -114,7 +114,6 @@ struct AggregationMethodString
typedef Data::const_iterator const_iterator;
Data data;
Arena string_pool; /// NOTE Может быть лучше вместо этого использовать aggregates_pool?
const ColumnString::Offsets_t * offsets;
const ColumnString::Chars_t * chars;
@ -140,9 +139,9 @@ struct AggregationMethodString
static AggregateDataPtr & getAggregateData(Mapped & value) { return value; }
static const AggregateDataPtr & getAggregateData(const Mapped & value) { return value; }
void onNewKey(iterator & it, size_t keys_size, size_t i, StringRefs & keys)
void onNewKey(iterator & it, size_t keys_size, size_t i, StringRefs & keys, Arena & pool)
{
it->first.data = string_pool.insert(it->first.data, it->first.size);
it->first.data = pool.insert(it->first.data, it->first.size);
}
static void insertKeyIntoColumns(const_iterator & it, ColumnPlainPtrs & key_columns, size_t keys_size, const Sizes & key_sizes)
@ -162,7 +161,6 @@ struct AggregationMethodFixedString
typedef Data::const_iterator const_iterator;
Data data;
Arena string_pool; /// NOTE Может быть лучше вместо этого использовать aggregates_pool?
size_t n;
const ColumnFixedString::Chars_t * chars;
@ -188,9 +186,9 @@ struct AggregationMethodFixedString
static AggregateDataPtr & getAggregateData(Mapped & value) { return value; }
static const AggregateDataPtr & getAggregateData(const Mapped & value) { return value; }
void onNewKey(iterator & it, size_t keys_size, size_t i, StringRefs & keys)
void onNewKey(iterator & it, size_t keys_size, size_t i, StringRefs & keys, Arena & pool)
{
it->first.data = string_pool.insert(it->first.data, it->first.size);
it->first.data = pool.insert(it->first.data, it->first.size);
}
static void insertKeyIntoColumns(const_iterator & it, ColumnPlainPtrs & key_columns, size_t keys_size, const Sizes & key_sizes)
@ -228,7 +226,7 @@ struct AggregationMethodKeys128
static AggregateDataPtr & getAggregateData(Mapped & value) { return value; }
static const AggregateDataPtr & getAggregateData(const Mapped & value) { return value; }
void onNewKey(iterator & it, size_t keys_size, size_t i, StringRefs & keys)
void onNewKey(iterator & it, size_t keys_size, size_t i, StringRefs & keys, Arena & pool)
{
}
@ -255,7 +253,6 @@ struct AggregationMethodHashed
typedef Data::const_iterator const_iterator;
Data data;
Arena keys_pool; /// NOTE Может быть лучше вместо этого использовать aggregates_pool?
void init(ConstColumnPlainPtrs & key_columns)
{
@ -274,9 +271,9 @@ struct AggregationMethodHashed
static AggregateDataPtr & getAggregateData(Mapped & value) { return value.second; }
static const AggregateDataPtr & getAggregateData(const Mapped & value) { return value.second; }
void onNewKey(iterator & it, size_t keys_size, size_t i, StringRefs & keys)
void onNewKey(iterator & it, size_t keys_size, size_t i, StringRefs & keys, Arena & pool)
{
it->second.first = placeKeysInPool(i, keys_size, keys, keys_pool);
it->second.first = placeKeysInPool(i, keys_size, keys, pool);
}
static void insertKeyIntoColumns(const_iterator & it, ColumnPlainPtrs & key_columns, size_t keys_size, const Sizes & key_sizes)

4
dbms/src/Interpreters/Aggregator.cpp
View File

@ -185,7 +185,7 @@ void Aggregator::executeImpl(
/// Если вставили новый ключ - инициализируем состояния агрегатных функций, и возможно, что-нибудь связанное с ключём.
if (inserted)
{
method.onNewKey(it, keys_size, i, keys);
method.onNewKey(it, keys_size, i, keys, *aggregates_pool);
AggregateDataPtr & aggregate_data = Method::getAggregateData(it->second);
aggregate_data = aggregates_pool->alloc(total_size_of_aggregate_states);
@ -296,7 +296,7 @@ void Aggregator::mergeStreamsImpl(
if (inserted)
{
method.onNewKey(it, keys_size, i, keys);
method.onNewKey(it, keys_size, i, keys, *aggregates_pool);
AggregateDataPtr & aggregate_data = Method::getAggregateData(it->second);
aggregate_data = aggregates_pool->alloc(total_size_of_aggregate_states);

6
dbms/src/Interpreters/SplittingAggregator.cpp
View File

@ -312,7 +312,7 @@ void SplittingAggregator::aggregateThread(
if (inserted)
{
it->first.data = result.key_string->string_pool.insert(ref.data, ref.size);
it->first.data = result.aggregates_pool->insert(ref.data, ref.size);
it->second = result.aggregates_pool->alloc(total_size_of_aggregate_states);
for (size_t j = 0; j < aggregates_size; ++j)
@ -350,7 +350,7 @@ void SplittingAggregator::aggregateThread(
if (inserted)
{
it->first.data = result.key_fixed_string->string_pool.insert(ref.data, ref.size);
it->first.data = result.aggregates_pool->insert(ref.data, ref.size);
it->second = result.aggregates_pool->alloc(total_size_of_aggregate_states);
for (size_t j = 0; j < aggregates_size; ++j)
@ -424,7 +424,7 @@ void SplittingAggregator::aggregateThread(
if (inserted)
{
it->second.first = extractKeysAndPlaceInPool(i, keys_size, key_columns, key, result.hashed->keys_pool);
it->second.first = extractKeysAndPlaceInPool(i, keys_size, key_columns, key, *result.aggregates_pool);
it->second.second = result.aggregates_pool->alloc(total_size_of_aggregate_states);
for (size_t j = 0; j < aggregates_size; ++j)