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

optimize

Browse Source
This commit is contained in:
CurtizJ 2018-09-20 18:46:37 +03:00
parent f9ff586415
commit 8644853558
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dbms/src/DataStreams/CubeBlockInputStream.cpp
View File

@ -40,18 +40,17 @@ Block CubeBlockInputStream::readImpl()
* we will calculate all subsets of columns on next iterations of readImpl
* by zeroing columns at positions, where bits are zero in current bitmask.
*/
if (mask)
if (mask)
{
--mask;
Block cube_block = source_block;
for (size_t i = 0; i < keys.size(); ++i)
for (size_t i = 0; i < keys.size(); ++i)
{
if (!((mask >> i) & 1))
if (!((mask >> i) & 1))
{
size_t pos = keys.size() - i - 1;
auto & current = cube_block.getByPosition(keys[pos]);
current.column = empty_block.getByPosition(pos).column->cloneResized(cube_block.rows());
current.column = zero_block.getByPosition(pos).column;
}
}
@ -61,7 +60,15 @@ Block CubeBlockInputStream::readImpl()
}
source_block = children[0]->read();
empty_block = source_block.cloneEmpty();
if (!source_block)
return source_block;
zero_block = source_block.cloneEmpty();
for (auto key : keys)
{
auto & current = zero_block.getByPosition(key);
current.column = current.column->cloneResized(source_block.rows());
}
Block finalized = source_block;
finalizeBlock(finalized);
mask = (1 << keys.size()) - 1;

2
dbms/src/DataStreams/CubeBlockInputStream.h
View File

@ -36,7 +36,7 @@ private:
ColumnNumbers keys;
UInt32 mask = 0;
Block source_block;
Block empty_block;
Block zero_block;
};
}

2
dbms/src/Interpreters/InterpreterSelectQuery.cpp
View File

@ -1124,7 +1124,7 @@ void InterpreterSelectQuery::executeRollupOrCube(Pipeline & pipeline, bool is_ro
if (is_rollup)
pipeline.firstStream() = std::make_shared<RollupBlockInputStream>(pipeline.firstStream(), params);
else
else
pipeline.firstStream() = std::make_shared<CubeBlockInputStream>(pipeline.firstStream(), params);
}