thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-03 04:52:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add alter move part command

Browse Source
This commit is contained in:
Igr Mineev 2019-07-18 18:19:03 +03:00
parent 770b74ac17
commit 52bca488dc
9 changed files with 108 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dbms/src/Parsers/ASTAlterQuery.cpp
View File

@ -124,6 +124,26 @@ void ASTAlterCommand::formatImpl(
<< (part ? "PART " : "PARTITION ") << (settings.hilite ? hilite_none : "");
partition->formatImpl(settings, state, frame);
}
else if (type == ASTAlterCommand::MOVE_PARTITION)
{
settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "MOVE "
<< (part ? "PART " : "PARTITION ") << (settings.hilite ? hilite_none : "");
partition->formatImpl(settings, state, frame);
settings.ostr << "TO ";
switch (space_to_move)
{
case SpaceToMove::DISK:
settings.ostr << "DISK ";
break;
case SpaceToMove::VOLUME:
settings.ostr << "VOLUME ";
break;
case SpaceToMove::NONE:
default:
break;
}
settings.ostr << space_to_move_name;
}
else if (type == ASTAlterCommand::REPLACE_PARTITION)
{
settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << (replace ? "REPLACE" : "ATTACH") << " PARTITION "

14
dbms/src/Parsers/ASTAlterQuery.h
View File

@ -34,6 +34,7 @@ public:
DROP_PARTITION,
ATTACH_PARTITION,
MOVE_PARTITION,
REPLACE_PARTITION,
FETCH_PARTITION,
FREEZE_PARTITION,
@ -69,7 +70,7 @@ public:
/** The ADD INDEX query stores the name of the index following AFTER.
* The DROP INDEX query stores the name for deletion.
*/
ASTPtr index;
ASTPtr index;
/** Used in DROP PARTITION and ATTACH PARTITION FROM queries.
* The value or ID of the partition is stored here.
@ -98,6 +99,17 @@ public:
bool if_exists = false; /// option for DROP_COLUMN, MODIFY_COLUMN, COMMENT_COLUMN
enum SpaceToMove
{
DISK,
VOLUME,
NONE,
};
SpaceToMove space_to_move = SpaceToMove::NONE;
String space_to_move_name;
/** For FETCH PARTITION - the path in ZK to the shard, from which to download the partition.
*/
String from;

24
dbms/src/Parsers/ParserAlterQuery.cpp
View File

@ -36,6 +36,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
ParserKeyword s_detach_partition("DETACH PARTITION");
ParserKeyword s_drop_partition("DROP PARTITION");
ParserKeyword s_attach_part("ATTACH PART");
ParserKeyword s_move_part("MOVE PART");
ParserKeyword s_fetch_partition("FETCH PARTITION");
ParserKeyword s_replace_partition("REPLACE PARTITION");
ParserKeyword s_freeze("FREEZE");
@ -49,6 +50,9 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
ParserKeyword s_with("WITH");
ParserKeyword s_name("NAME");
ParserKeyword s_to_disk("TO DISK");
ParserKeyword s_to_volume("TO VOLUME");
ParserKeyword s_delete_where("DELETE WHERE");
ParserKeyword s_update("UPDATE");
ParserKeyword s_where("WHERE");
@ -191,6 +195,26 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
command->part = true;
command->type = ASTAlterCommand::ATTACH_PARTITION;
}
else if (s_move_part.ignore(pos, expected))
{
if (!parser_string_literal.parse(pos, command->partition, expected))
return false;
command->type = ASTAlterCommand::MOVE_PARTITION;
if (s_to_disk.ignore(pos))
command->space_to_move = ASTAlterCommand::SpaceToMove::DISK;
else if (s_to_volume.ignore(pos))
command->space_to_move = ASTAlterCommand::SpaceToMove::VOLUME;
else
return false;
ASTPtr ast_space_name;
if (!parser_string_literal.parse(pos, ast_space_name, expected))
return false;
command->space_to_move_name = ast_space_name->as<ASTLiteral &>().value.get<const String &>();
}
else if (s_fetch_partition.ignore(pos, expected))
{
if (!parser_partition.parse(pos, command->partition, expected))

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

@ -2571,6 +2571,13 @@ void MergeTreeData::freezePartition(const ASTPtr & partition_ast, const String &
}
void MergeTreeData::movePartitionToDisk(const ASTPtr & partition, const String & name, const Context & /*context*/)
{
String partition_id = partition->as<ASTLiteral &>().value.safeGet<String>();
move(partition_id, name);
}
String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, const Context & context)
{
const auto & partition_ast = ast->as<ASTPartition &>();

3
dbms/src/Storages/MergeTree/MergeTreeData.h
View File

@ -545,6 +545,9 @@ public:
*/
void freezePartition(const ASTPtr & partition, const String & with_name, const Context & context);
/// Moves partition to specified space
void movePartitionToDisk(const ASTPtr & partition, const String & name, const Context & context);
size_t getColumnCompressedSize(const std::string & name) const
{
auto lock = lockParts();

21
dbms/src/Storages/PartitionCommands.cpp
View File

@ -31,6 +31,27 @@ std::optional<PartitionCommand> PartitionCommand::parse(const ASTAlterCommand *
res.part = command_ast->part;
return res;
}
else if (command_ast->type == ASTAlterCommand::MOVE_PARTITION)
{
PartitionCommand res;
res.type = MOVE_PARTITION;
res.partition = command_ast->partition;
res.part = command_ast->part;
switch (command_ast->space_to_move)
{
case ASTAlterCommand::SpaceToMove::DISK:
res.space_to_move = PartitionCommand::SpaceToMove::DISK;
break;
case ASTAlterCommand::SpaceToMove::VOLUME:
res.space_to_move = PartitionCommand::SpaceToMove::VOLUME;
break;
case ASTAlterCommand::SpaceToMove::NONE:
res.space_to_move = PartitionCommand::SpaceToMove::NONE;
break;
}
res.space_to_move_name = command_ast->space_to_move_name;
return res;
}
else if (command_ast->type == ASTAlterCommand::REPLACE_PARTITION)
{
PartitionCommand res;

12
dbms/src/Storages/PartitionCommands.h
View File

@ -19,6 +19,7 @@ struct PartitionCommand
enum Type
{
ATTACH_PARTITION,
MOVE_PARTITION,
CLEAR_COLUMN,
DROP_PARTITION,
FETCH_PARTITION,
@ -49,6 +50,17 @@ struct PartitionCommand
/// For FREEZE PARTITION
String with_name;
enum SpaceToMove
{
DISK,
VOLUME,
NONE,
};
SpaceToMove space_to_move = SpaceToMove::NONE;
String space_to_move_name;
static std::optional<PartitionCommand> parse(const ASTAlterCommand * command);
};

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

@ -1060,6 +1060,10 @@ void StorageMergeTree::alterPartition(const ASTPtr & query, const PartitionComma
attachPartition(command.partition, command.part, context);
break;
case PartitionCommand::MOVE_PARTITION:
movePartitionToDisk(command.partition, command.space_to_move_name, context);
break;
case PartitionCommand::REPLACE_PARTITION:
{
checkPartitionCanBeDropped(command.partition);

4
dbms/src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -3347,6 +3347,10 @@ void StorageReplicatedMergeTree::alterPartition(const ASTPtr & query, const Part
attachPartition(command.partition, command.part, query_context);
break;
case PartitionCommand::MOVE_PARTITION:
movePartitionToDisk(command.partition, command.space_to_move_name, query_context);
break;
case PartitionCommand::REPLACE_PARTITION:
{
checkPartitionCanBeDropped(command.partition);