thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-29 21:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better

Browse Source
This commit is contained in:
alesapin 2020-05-25 20:25:18 +03:00
parent d7c59bb4aa
commit 62e9f67639
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/DataStreams/TTLBlockInputStream.cpp
View File

@ -156,8 +156,7 @@ void TTLBlockInputStream::removeValuesWithExpiredColumnTTL(Block & block)
} }
std::vector<String> columns_to_remove; std::vector<String> columns_to_remove;
const auto & column_ttl_entries_by_name = storage.getColumnTTLs(); for (const auto & [name, ttl_entry] : storage.getColumnTTLs())
for (const auto & [name, ttl_entry] : column_ttl_entries_by_name)
{ {
/// If we read not all table columns. E.g. while mutation. /// If we read not all table columns. E.g. while mutation.
if (!block.has(name)) if (!block.has(name))
@ -217,9 +216,8 @@ void TTLBlockInputStream::removeValuesWithExpiredColumnTTL(Block & block)
void TTLBlockInputStream::updateMovesTTL(Block & block) void TTLBlockInputStream::updateMovesTTL(Block & block)
{ {
const auto & move_ttl_entries = storage.getMoveTTLs();
std::vector<String> columns_to_remove; std::vector<String> columns_to_remove;
for (const auto & ttl_entry : move_ttl_entries) for (const auto & ttl_entry : storage.getMoveTTLs())
{ {
auto & new_ttl_info = new_ttl_infos.moves_ttl[ttl_entry.result_column]; auto & new_ttl_info = new_ttl_infos.moves_ttl[ttl_entry.result_column];