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

Fix comments

Browse Source
This commit is contained in:
avogar 2022-09-16 16:12:30 +00:00
parent 92979af3bf
commit c9a9ef5b7e
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/AggregateFunctions/AggregateFunctionForEach.h
View File

@ -145,7 +145,7 @@ public:
return nested_func->getDefaultVersion(); return nested_func->getDefaultVersion();
} }
template <bool up_tp_state> template <bool up_to_state>
void destroyImpl(AggregateDataPtr __restrict place) const noexcept void destroyImpl(AggregateDataPtr __restrict place) const noexcept
{ {
AggregateFunctionForEachData & state = data(place); AggregateFunctionForEachData & state = data(place);
@ -153,7 +153,7 @@ public:
char * nested_state = state.array_of_aggregate_datas; char * nested_state = state.array_of_aggregate_datas;
for (size_t i = 0; i < state.dynamic_array_size; ++i) for (size_t i = 0; i < state.dynamic_array_size; ++i)
{ {
if constexpr (up_tp_state) if constexpr (up_to_state)
nested_func->destroyUpToState(nested_state); nested_func->destroyUpToState(nested_state);
else else
nested_func->destroy(nested_state); nested_func->destroy(nested_state);

3
src/AggregateFunctions/AggregateFunctionMap.h
View File

@ -225,8 +225,7 @@ public:
nested_func->destroy(nested_place); nested_func->destroy(nested_place);
} }
auto to_destroy = std::move(state.merged_maps); state.~Data();
this->data(place).~Data();
} }
void destroy(AggregateDataPtr __restrict place) const noexcept override void destroy(AggregateDataPtr __restrict place) const noexcept override

3
src/Interpreters/Aggregator.cpp
View File

@ -1756,6 +1756,9 @@ inline void Aggregator::insertAggregatesIntoColumns(Mapped & mapped, MutableColu
* and ColumnAggregateFunction will take ownership of this state. * and ColumnAggregateFunction will take ownership of this state.
* So, for aggregate functions with "-State" modifier, only states of all combinators that are used * So, for aggregate functions with "-State" modifier, only states of all combinators that are used
* after -State will be destroyed after result has been transferred to ColumnAggregateFunction. * after -State will be destroyed after result has been transferred to ColumnAggregateFunction.
* For example, if we have function `uniqStateForEachMap` after aggregation we should destroy all states that
* were created by combinators `-ForEach` and `-Map`, because resulting ColumnAggregateFunction will be
* responsible only for destruction of the states created by `uniq` function.
* But we should mark that the data no longer owns these states. * But we should mark that the data no longer owns these states.
*/ */