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

Fix test with ttl.

Browse Source
This commit is contained in:
Nikolai Kochetov 2022-02-04 16:05:02 +00:00
parent a968c869fd
commit 6436024e08
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
View File

@ -412,6 +412,11 @@ void MergeTreeDataPartWriterWide::validateColumnOfFixedSize(const NameAndTypePai
String escaped_name = escapeForFileName(name);
String mrk_path = part_path + escaped_name + marks_file_extension;
String bin_path = part_path + escaped_name + DATA_FILE_EXTENSION;
/// Some columns may be removed because of ttl. Skip them.
if (!disk->exists(mrk_path))
return;
auto mrk_in = disk->readFile(mrk_path);
DB::CompressedReadBufferFromFile bin_in(disk->readFile(bin_path));
bool must_be_last = false;

7
src/Storages/MergeTree/MergedBlockOutputStream.cpp
View File

@ -66,10 +66,9 @@ struct MergedBlockOutputStream::Finalizer::Impl
void MergedBlockOutputStream::Finalizer::finish()
{
if (impl)
impl->finish();
impl.reset();
std::unique_ptr<Impl> to_finish = std::move(impl);
if (to_finish)
to_finish->finish();
}
void MergedBlockOutputStream::Finalizer::Impl::finish()