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

Added few FIXMEs to not forget.

Browse Source
This commit is contained in:
Vladimir Chebotarev 2019-11-26 11:53:54 +03:00
parent b3e261800d
commit 0da7234d99
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,9 +194,10 @@ void TTLBlockInputStream::removeValuesWithExpiredColumnTTL(Block & block)
column_with_type.column = std::move(result_column); column_with_type.column = std::move(result_column);
} }
for (const auto & elem : storage.column_ttl_entries_by_name) for (const auto & [_, ttl_entry] : storage.column_ttl_entries_by_name)
if (block.has(elem.second.result_column)) if (block.has(ttl_entry.result_column))
block.erase(elem.second.result_column); block.erase(ttl_entry.result_column);
/// FIXME: what if table had legitimate column with this name?
} }
void TTLBlockInputStream::updateMovesTTL(Block & block) void TTLBlockInputStream::updateMovesTTL(Block & block)
@ -217,9 +218,10 @@ void TTLBlockInputStream::updateMovesTTL(Block & block)
} }
} }
for (const auto & elem : storage.move_ttl_entries_by_name) for (const auto & [_, ttl_entry] : storage.move_ttl_entries_by_name)
if (block.has(elem.second.result_column)) if (block.has(ttl_entry.result_column))
block.erase(elem.second.result_column); block.erase(ttl_entry.result_column);
/// FIXME: what if table had legitimate column with this name?
} }
UInt32 TTLBlockInputStream::getTimestampByIndex(const IColumn * column, size_t ind) UInt32 TTLBlockInputStream::getTimestampByIndex(const IColumn * column, size_t ind)

2
dbms/src/Storages/MergeTree/MergeTreeDataWriter.cpp
View File

@ -116,7 +116,7 @@ void updateTTL(const MergeTreeData::TTLEntry & ttl_entry,
ttl_infos.updatePartMinMaxTTL(ttl_info.min, ttl_info.max); ttl_infos.updatePartMinMaxTTL(ttl_info.min, ttl_info.max);
/// FIXME why we don't erase new column from block? /// FIXME: why we don't erase new column from block?
} }
} }