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

squashing refactoring

Browse Source
This commit is contained in:
yariks5s 2024-05-27 11:33:01 +00:00
parent b08ecfe6c0
commit 01a16fd8e2
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Interpreters/Squashing.cpp
View File

@ -153,27 +153,24 @@ void ApplySquashing::append(std::vector<Chunk> & input_chunks)
for (const Chunk & chunk : input_chunks) for (const Chunk & chunk : input_chunks)
rows += chunk.getNumRows(); rows += chunk.getNumRows();
for (auto & input_chunk : input_chunks)
{ {
Columns columns = input_chunk.detachColumns(); auto & first_chunk = input_chunks[0];
if (mutable_columns.empty()) Columns columns = first_chunk.detachColumns();
for (size_t i = 0; i < columns.size(); ++i)
{ {
for (size_t i = 0; i < columns.size(); ++i) mutable_columns.push_back(IColumn::mutate(std::move(columns[i])));
{ mutable_columns[i]->reserve(rows);
if (columns[i]->isNullable())
mutable_columns.push_back(IColumn::mutate(columns[i]));
else
mutable_columns.push_back(columns[i]->assumeMutable());
mutable_columns[i]->reserve(rows);
}
continue;
} }
}
for (size_t i = 0, size = mutable_columns.size(); i < size; ++i) for (size_t i = 1; i < input_chunks.size(); ++i) // We've already processed the first chunk above
{
Columns columns = input_chunks[i].detachColumns();
for (size_t j = 0, size = mutable_columns.size(); j < size; ++j)
{ {
const auto source_column = columns[i]; const auto source_column = columns[j];
mutable_columns[i]->insertRangeFrom(*source_column, 0, source_column->size()); mutable_columns[j]->insertRangeFrom(*source_column, 0, source_column->size());
} }
} }
accumulated_chunk.setColumns(std::move(mutable_columns), rows); accumulated_chunk.setColumns(std::move(mutable_columns), rows);