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

fix segfault with -StateResample combinators

Browse Source
This commit is contained in:
Anton Popov 2020-07-06 02:17:46 +03:00
parent a5cbeda1e3
commit e2e92afd98
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Interpreters/Aggregator.cpp
View File

@ -1181,15 +1181,17 @@ Block Aggregator::prepareBlockAndFill(
if (aggregate_functions[i]->isState()) if (aggregate_functions[i]->isState())
{ {
/// The ColumnAggregateFunction column captures the shared ownership of the arena with aggregate function states. /// The ColumnAggregateFunction column captures the shared ownership of the arena with aggregate function states.
ColumnAggregateFunction * column_aggregate_func = nullptr; if (auto * column_aggregate_func = typeid_cast<ColumnAggregateFunction *>(final_aggregate_columns[i].get()))
/// Aggregate state can be wrapped into array if aggregate function ends with -Resample combinator.
if (auto * column_array = typeid_cast<ColumnArray *>(final_aggregate_columns[i].get()))
column_aggregate_func = &assert_cast<ColumnAggregateFunction &>(column_array->getData());
else
column_aggregate_func = &assert_cast<ColumnAggregateFunction &>(*final_aggregate_columns[i]);
for (auto & pool : data_variants.aggregates_pools) for (auto & pool : data_variants.aggregates_pools)
column_aggregate_func->addArena(pool); column_aggregate_func->addArena(pool);
/// Aggregate state can be wrapped into array if aggregate function ends with -Resample combinator.
final_aggregate_columns[i]->forEachSubcolumn([&data_variants](auto & subcolumn)
{
if (auto * column_aggregate_func = typeid_cast<ColumnAggregateFunction *>(subcolumn.get()))
for (auto & pool : data_variants.aggregates_pools)
column_aggregate_func->addArena(pool);
});
} }
} }
} }