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

Fix removal bug

Browse Source
This commit is contained in:
alesapin 2020-08-26 22:40:04 +03:00
parent 1fb93a8bf2
commit 3a680dc8fb
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Storages/MergeTree/IMergeTreeDataPart.cpp
View File

@ -475,8 +475,22 @@ NameSet IMergeTreeDataPart::getFileNamesWithoutChecksums() const
return {};
NameSet result = {"checksums.txt", "columns.txt"};
if (volume->getDisk()->exists(getFullRelativePath() + DEFAULT_COMPRESSION_CODEC_FILE_NAME))
String path = getFullRelativePath() + DEFAULT_COMPRESSION_CODEC_FILE_NAME;
if (volume->getDisk()->exists(path))
{
std::cerr << "PATH:" << path << "EXISTS\n";
result.emplace(DEFAULT_COMPRESSION_CODEC_FILE_NAME);
}
else
{
Names files;
volume->getDisk()->listFiles(getFullRelativePath(), files);
std::cerr << "PATH:" << path << " doesn't exists\n";
for (auto & file : files)
{
std::cerr << "FILE:" << file << std::endl;
}
}
return result;
}
@ -847,10 +861,10 @@ void IMergeTreeDataPart::remove() const
# pragma GCC diagnostic pop
#endif
auto files_without_checksums = getFileNamesWithoutChecksums();
for (const auto & file : files_without_checksums)
for (const auto & file : {"checksums.txt", "columns.txt"})
volume->getDisk()->remove(to + "/" + file);
volume->getDisk()->removeIfExists(to + "/" + DEFAULT_COMPRESSION_CODEC_FILE_NAME);
volume->getDisk()->removeIfExists(to + "/" + DELETE_ON_DESTROY_MARKER_FILE_NAME);
volume->getDisk()->remove(to);