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

revert the performance bug fix

Browse Source
This commit is contained in:
Sergi Vladykin 2019-07-29 11:20:11 +03:00
parent c5a42a6948
commit 915092515c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dbms/src/DataStreams/TTLBlockInputStream.cpp
View File

@ -63,6 +63,10 @@ TTLBlockInputStream::TTLBlockInputStream(
Block TTLBlockInputStream::readImpl() Block TTLBlockInputStream::readImpl()
{ {
Block block = children.at(0)->read();
if (!block)
return block;
/// Skip all data if table ttl is expired for part /// Skip all data if table ttl is expired for part
if (storage.hasTableTTL() && old_ttl_infos.table_ttl.max <= current_time) if (storage.hasTableTTL() && old_ttl_infos.table_ttl.max <= current_time)
{ {
@ -70,10 +74,6 @@ Block TTLBlockInputStream::readImpl()
return {}; return {};
} }
Block block = children.at(0)->read();
if (!block)
return block;
if (storage.hasTableTTL() && old_ttl_infos.table_ttl.min <= current_time) if (storage.hasTableTTL() && old_ttl_infos.table_ttl.min <= current_time)
removeRowsWithExpiredTableTTL(block); removeRowsWithExpiredTableTTL(block);