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

revert changes made to cube transform

Browse Source
This commit is contained in:
MaxTheHuman 2021-02-09 23:41:42 +03:00 committed by Dmitry Novik
parent 2c3c41d72c
commit aa46ddc3e2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Processors/Transforms/CubeTransform.cpp
View File

@ -45,7 +45,7 @@ Chunk CubeTransform::generate()
consumed_chunks.clear(); consumed_chunks.clear();
auto num_rows = cube_chunk.getNumRows(); auto num_rows = cube_chunk.getNumRows();
mask = (UInt64(1) << keys.size()); mask = (UInt64(1) << keys.size()) - 1;
current_columns = cube_chunk.getColumns(); current_columns = cube_chunk.getColumns();
current_zero_columns.clear(); current_zero_columns.clear();
@ -55,11 +55,11 @@ Chunk CubeTransform::generate()
current_zero_columns.emplace_back(current_columns[key]->cloneEmpty()->cloneResized(num_rows)); current_zero_columns.emplace_back(current_columns[key]->cloneEmpty()->cloneResized(num_rows));
} }
// auto gen_chunk = std::move(cube_chunk); auto gen_chunk = std::move(cube_chunk);
if (mask > 1) if (mask)
{ {
mask = mask >> 1; --mask;
auto columns = current_columns; auto columns = current_columns;
auto size = keys.size(); auto size = keys.size();
@ -72,7 +72,6 @@ Chunk CubeTransform::generate()
chunks.emplace_back(std::move(columns), current_columns.front()->size()); chunks.emplace_back(std::move(columns), current_columns.front()->size());
cube_chunk = merge(std::move(chunks), false); cube_chunk = merge(std::move(chunks), false);
} }
auto gen_chunk = std::move(cube_chunk);
finalizeChunk(gen_chunk); finalizeChunk(gen_chunk);
return gen_chunk; return gen_chunk;