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

fixed

Browse Source
This commit is contained in:
lgbo-ustc 2024-03-13 17:20:56 +08:00
parent 6ebc1e4522
commit 87a03ae219
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Interpreters/Aggregator.cpp
View File

@ -2104,7 +2104,7 @@ Aggregator::ConvertToBlockResVariant Aggregator::convertToBlockImplFinal(
/// Mark the cell as destroyed so it will not be destroyed in destructor. /// Mark the cell as destroyed so it will not be destroyed in destructor.
mapped = nullptr; mapped = nullptr;
if (return_single_block && places.size() >= max_block_size) if (!return_single_block && places.size() >= max_block_size)
{ {
blocks.emplace_back( blocks.emplace_back(
insertResultsIntoColumns(places, std::move(out_cols.value()), arena, has_null_key_data, use_compiled_functions)); insertResultsIntoColumns(places, std::move(out_cols.value()), arena, has_null_key_data, use_compiled_functions));
@ -2181,7 +2181,7 @@ Aggregator::convertToBlockImplNotFinal(Method & method, Table & data, Arenas & a
mapped = nullptr; mapped = nullptr;
++rows_in_current_block; ++rows_in_current_block;
if (return_single_block && rows_in_current_block >= max_block_size) if (!return_single_block && rows_in_current_block >= max_block_size)
{ {
res_blocks.emplace_back(finalizeBlock(params, getHeader(final), std::move(out_cols.value()), final, rows_in_current_block)); res_blocks.emplace_back(finalizeBlock(params, getHeader(final), std::move(out_cols.value()), final, rows_in_current_block));
out_cols.reset(); out_cols.reset();
@ -2199,7 +2199,6 @@ Aggregator::convertToBlockImplNotFinal(Method & method, Table & data, Arenas & a
res_blocks.emplace_back(finalizeBlock(params, getHeader(final), std::move(out_cols).value(), final, rows_in_current_block)); res_blocks.emplace_back(finalizeBlock(params, getHeader(final), std::move(out_cols).value(), final, rows_in_current_block));
return res_blocks; return res_blocks;
} }
return res_blocks;
} }
void Aggregator::addSingleKeyToAggregateColumns( void Aggregator::addSingleKeyToAggregateColumns(