mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 00:30:49 +00:00
Revert "fix SimpleSquashingChunksTransform"
This reverts commit f1f5dfc83a
.
This commit is contained in:
parent
f1f5dfc83a
commit
06734b351e
@ -58,13 +58,14 @@ void SquashingTransform::work()
|
||||
|
||||
SimpleSquashingChunksTransform::SimpleSquashingChunksTransform(
|
||||
const Block & header, size_t min_block_size_rows, size_t min_block_size_bytes)
|
||||
: IInflatingTransform(header, header), squashing(header, min_block_size_rows, min_block_size_bytes)
|
||||
: IInflatingTransform(header, header), squashing(min_block_size_rows, min_block_size_bytes)
|
||||
{
|
||||
}
|
||||
|
||||
void SimpleSquashingChunksTransform::consume(Chunk chunk)
|
||||
{
|
||||
squashed_chunk = squashing.add(std::move(chunk));
|
||||
Block current_block = squashing.add(getInputPort().getHeader().cloneWithColumns(chunk.detachColumns()));
|
||||
squashed_chunk.setColumns(current_block.getColumns(), current_block.rows());
|
||||
}
|
||||
|
||||
Chunk SimpleSquashingChunksTransform::generate()
|
||||
@ -82,7 +83,8 @@ bool SimpleSquashingChunksTransform::canGenerate()
|
||||
|
||||
Chunk SimpleSquashingChunksTransform::getRemaining()
|
||||
{
|
||||
squashed_chunk = squashing.flush();
|
||||
Block current_block = squashing.add({});
|
||||
squashed_chunk.setColumns(current_block.getColumns(), current_block.rows());
|
||||
return std::move(squashed_chunk);
|
||||
}
|
||||
|
||||
|
@ -44,7 +44,7 @@ protected:
|
||||
Chunk getRemaining() override;
|
||||
|
||||
private:
|
||||
Squashing squashing;
|
||||
SquashingTransform squashing;
|
||||
Chunk squashed_chunk;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user