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

draft for StorageMergeTree

Browse Source
This commit is contained in:
Alexander Tokmakov 2019-07-23 23:18:18 +03:00
parent ad787938f5
commit 6e4aabbb1a
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dbms/src/Storages/StorageMergeTree.cpp
View File

@ -921,8 +921,8 @@ void StorageMergeTree::alterPartition(const ASTPtr & query, const PartitionComma
break; break;
case PartitionCommand::DROP_DETACHED_PARTITION: case PartitionCommand::DROP_DETACHED_PARTITION:
// TODO dropDetached(command.partition, command.part, context);
throw DB::Exception("Not implemented yet", ErrorCodes::NOT_IMPLEMENTED); break;
case PartitionCommand::ATTACH_PARTITION: case PartitionCommand::ATTACH_PARTITION:
attachPartition(command.partition, command.part, context); attachPartition(command.partition, command.part, context);
@ -993,6 +993,34 @@ void StorageMergeTree::dropPartition(const ASTPtr & partition, bool detach, cons
} }
void StorageMergeTree::dropDetached(const ASTPtr & partition, bool part, const Context & /*context*/)
{
if (!part) // TODO
throw DB::Exception("DROP DETACHED PARTITION is not implemented, use DROP DETACHED PART", ErrorCodes::NOT_IMPLEMENTED);
String part_id = partition->as<ASTLiteral &>().value.safeGet<String>();
Poco::Path part_path(part_id);
const bool file_zero_depth = part_path.isFile() && part_path.depth() == 0 && part_path.getFileName() != "..";
const bool dir_zero_depth = part_path.isDirectory() && part_path.depth() == 1 && part_path.directory(0) != "..";
const bool zero_depth = file_zero_depth || dir_zero_depth;
if (!part_path.isRelative() || !zero_depth)
throw DB::Exception("Part name must contain exactly one path component: name of detached part", ErrorCodes::INCORRECT_FILE_NAME);
part_id = part_path.isFile() ? part_path.getFileName() : part_path.directory(0);
Poco::Path base_dir(full_path + "detached");
Poco::File detached_part_dir(Poco::Path(base_dir, part_id));
if (!detached_part_dir.exists())
throw DB::Exception("Detached part \"" + part_id + "\" not found" , ErrorCodes::INCORRECT_FILE_NAME);
DetachedPartInfo info;
DetachedPartInfo::tryParseDetachedPartName(part_id, &info, format_version);
MergeTreeDataPart detached_part(*this, part_id, info);
detached_part.relative_path = "detached/" + part_id;
// TODO make sure it's ok
detached_part.remove();
}
void StorageMergeTree::attachPartition(const ASTPtr & partition, bool attach_part, const Context & context) void StorageMergeTree::attachPartition(const ASTPtr & partition, bool attach_part, const Context & context)
{ {
// TODO: should get some locks to prevent race with 'alter … modify column' // TODO: should get some locks to prevent race with 'alter … modify column'
@ -1039,6 +1067,7 @@ void StorageMergeTree::attachPartition(const ASTPtr & partition, bool attach_par
LOG_DEBUG(log, "Checking data"); LOG_DEBUG(log, "Checking data");
MutableDataPartPtr part = loadPartAndFixMetadata(source_path); MutableDataPartPtr part = loadPartAndFixMetadata(source_path);
// TODO fix race with DROP DETACHED PARTITION
LOG_INFO(log, "Attaching part " << source_part_name << " from " << source_path); LOG_INFO(log, "Attaching part " << source_part_name << " from " << source_path);
renameTempPartAndAdd(part, &increment); renameTempPartAndAdd(part, &increment);

1
dbms/src/Storages/StorageMergeTree.h
View File

@ -120,6 +120,7 @@ private:
// Partition helpers // Partition helpers
void dropPartition(const ASTPtr & partition, bool detach, const Context & context); void dropPartition(const ASTPtr & partition, bool detach, const Context & context);
void dropDetached(const ASTPtr & partition, bool part, const Context & context);
void clearColumnInPartition(const ASTPtr & partition, const Field & column_name, const Context & context); void clearColumnInPartition(const ASTPtr & partition, const Field & column_name, const Context & context);
void attachPartition(const ASTPtr & partition, bool part, const Context & context); void attachPartition(const ASTPtr & partition, bool part, const Context & context);
void replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, const Context & context); void replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, const Context & context);