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

Try fix header for TTLBlockInputStream.

Browse Source
This commit is contained in:
Nikolai Kochetov 2020-11-03 17:26:47 +03:00
parent feccf47f27
commit 9f7de6a1a4
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/DataStreams/TTLBlockInputStream.cpp
View File

@ -103,6 +103,15 @@ bool TTLBlockInputStream::isTTLExpired(time_t ttl) const
return (ttl && (ttl <= current_time)); return (ttl && (ttl <= current_time));
} }
Block reorderColumns(Block block, const Block & header)
{
Block res;
for (const auto & col : header)
res.insert(block.getByName(col.name));
return res;
}
Block TTLBlockInputStream::readImpl() Block TTLBlockInputStream::readImpl()
{ {
/// Skip all data if table ttl is expired for part /// Skip all data if table ttl is expired for part
@ -136,7 +145,7 @@ Block TTLBlockInputStream::readImpl()
updateMovesTTL(block); updateMovesTTL(block);
updateRecompressionTTL(block); updateRecompressionTTL(block);
return block; return reorderColumns(std::move(block), header);
} }
void TTLBlockInputStream::readSuffixImpl() void TTLBlockInputStream::readSuffixImpl()