From a597e62d3b7bfacfbac815734c0bc90748683736 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 15 May 2020 22:27:18 +0300 Subject: [PATCH] nested_columns_holder is not destoyed --- src/Interpreters/Aggregator.cpp | 7 +++---- src/Interpreters/Aggregator.h | 4 +++- src/Processors/Transforms/AggregatingInOrderTransform.cpp | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp index 85b31c033f2..d44c171d639 100644 --- a/src/Interpreters/Aggregator.cpp +++ b/src/Interpreters/Aggregator.cpp @@ -548,7 +548,7 @@ void NO_INLINE Aggregator::executeOnIntervalWithoutKeyImpl( void Aggregator::prepareAggregateInstructions(Columns columns, AggregateColumns & aggregate_columns, Columns & materialized_columns, - AggregateFunctionInstructions & aggregate_functions_instructions) + AggregateFunctionInstructions & aggregate_functions_instructions, NestedColumnsHolder & nested_columns_holder) { for (size_t i = 0; i < params.aggregates_size; ++i) aggregate_columns[i].resize(params.aggregates[i].arguments.size()); @@ -556,7 +556,6 @@ void Aggregator::prepareAggregateInstructions(Columns columns, AggregateColumns aggregate_functions_instructions.resize(params.aggregates_size + 1); aggregate_functions_instructions[params.aggregates_size].that = nullptr; - std::vector> nested_columns_holder; for (size_t i = 0; i < params.aggregates_size; ++i) { for (size_t j = 0; j < aggregate_columns[i].size(); ++j) @@ -650,9 +649,9 @@ bool Aggregator::executeOnBlock(Columns columns, UInt64 num_rows, AggregatedData } } } - + NestedColumnsHolder nested_columns_holder; AggregateFunctionInstructions aggregate_functions_instructions; - prepareAggregateInstructions(columns, aggregate_columns, materialized_columns, aggregate_functions_instructions); + prepareAggregateInstructions(columns, aggregate_columns, materialized_columns, aggregate_functions_instructions, nested_columns_holder); if (isCancelled()) return true; diff --git a/src/Interpreters/Aggregator.h b/src/Interpreters/Aggregator.h index b43ed911b5d..6962e019a00 100644 --- a/src/Interpreters/Aggregator.h +++ b/src/Interpreters/Aggregator.h @@ -1034,6 +1034,7 @@ protected: }; using AggregateFunctionInstructions = std::vector; + using NestedColumnsHolder = std::vector>; Sizes offsets_of_aggregate_states; /// The offset to the n-th aggregate function in a row of aggregate functions. size_t total_size_of_aggregate_states = 0; /// The total size of the row from the aggregate functions. @@ -1263,7 +1264,8 @@ protected: Columns columns, AggregateColumns & aggregate_columns, Columns & materialized_columns, - AggregateFunctionInstructions & instructions); + AggregateFunctionInstructions & instructions, + NestedColumnsHolder & nested_columns_holder); void fillAggregateColumnsWithSingleKey( AggregatedDataVariants & data_variants, diff --git a/src/Processors/Transforms/AggregatingInOrderTransform.cpp b/src/Processors/Transforms/AggregatingInOrderTransform.cpp index e8c4029e222..5ebfb740c6b 100644 --- a/src/Processors/Transforms/AggregatingInOrderTransform.cpp +++ b/src/Processors/Transforms/AggregatingInOrderTransform.cpp @@ -69,8 +69,9 @@ void AggregatingInOrderTransform::consume(Chunk chunk) key_columns[i] = materialized_columns.back(); } + Aggregator::NestedColumnsHolder nested_columns_holder; Aggregator::AggregateFunctionInstructions aggregate_function_instructions; - params->aggregator.prepareAggregateInstructions(chunk.getColumns(), aggregate_columns, materialized_columns, aggregate_function_instructions); + params->aggregator.prepareAggregateInstructions(chunk.getColumns(), aggregate_columns, materialized_columns, aggregate_function_instructions, nested_columns_holder); size_t key_end = 0; size_t key_begin = 0;