thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-30 03:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed FREEZE PARTITION: using only active data parts; acquire snapshot of parts [#CLICKHOUSE-3369].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-10-12 21:21:17 +03:00
parent dfb64cf0c0
commit d468473d62
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dbms/src/Storages/MergeTree/MergeTreeData.cpp
View File

@ -1732,6 +1732,7 @@ void MergeTreeData::freezePartition(const ASTPtr & partition_ast, const String &
{ {
std::experimental::optional<String> prefix; std::experimental::optional<String> prefix;
String partition_id; String partition_id;
if (format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING) if (format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
{ {
const auto & partition = dynamic_cast<const ASTPartition &>(*partition_ast); const auto & partition = dynamic_cast<const ASTPartition &>(*partition_ast);
@ -1762,24 +1763,23 @@ void MergeTreeData::freezePartition(const ASTPtr & partition_ast, const String &
LOG_DEBUG(log, "Snapshot will be placed at " + backup_path); LOG_DEBUG(log, "Snapshot will be placed at " + backup_path);
/// Acquire a snapshot of active data parts to prevent removing while doing backup.
const auto data_parts = getDataParts();
size_t parts_processed = 0; size_t parts_processed = 0;
Poco::DirectoryIterator end; for (const auto & part : data_parts)
for (Poco::DirectoryIterator it(full_path); it != end; ++it)
{ {
MergeTreePartInfo part_info;
if (!MergeTreePartInfo::tryParsePartName(it.name(), &part_info, format_version))
continue;
if (prefix) if (prefix)
{ {
if (!startsWith(part_info.partition_id, prefix.value())) if (!startsWith(part->info.partition_id, prefix.value()))
continue; continue;
} }
else if (part_info.partition_id != partition_id) else if (part->info.partition_id != partition_id)
continue; continue;
LOG_DEBUG(log, "Freezing part " << it.name()); LOG_DEBUG(log, "Freezing part " << part->name);
String part_absolute_path = it.path().absolute().toString(); String part_absolute_path = Poco::Path(part->getFullPath()).absolute().toString();
if (!startsWith(part_absolute_path, clickhouse_path)) if (!startsWith(part_absolute_path, clickhouse_path))
throw Exception("Part path " + part_absolute_path + " is not inside " + clickhouse_path, ErrorCodes::LOGICAL_ERROR); throw Exception("Part path " + part_absolute_path + " is not inside " + clickhouse_path, ErrorCodes::LOGICAL_ERROR);