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

added alter

Browse Source
This commit is contained in:
Nikita Vasilev 2019-01-15 17:49:22 +03:00
parent e197697b22
commit 026a30092e
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,7 +321,7 @@ void AlterCommand::apply(ColumnsDescription & columns_description, ASTPtr & orde
if (std::any_of(
indexes_decl_ast->children.cbegin(),
indexes_decl_ast->children.cend(),
[this](const ASTPtr & index_ast){
[this](const ASTPtr & index_ast) {
return typeid_cast<const ASTIndexDeclaration &>(*index_ast).name == index_name;
}))
{
@ -332,12 +332,37 @@ void AlterCommand::apply(ColumnsDescription & columns_description, ASTPtr & orde
ErrorCodes::ILLEGAL_COLUMN};
}
//auto insert_it = indexes_decl_ast->children.end();
// TODO: implementation
auto insert_it = indexes_decl_ast->children.end();
if (!after_index_name.empty())
{
insert_it = std::find_if(
indexes_decl_ast->children.begin(),
indexes_decl_ast->children.end(),
[this](const ASTPtr & index_ast) {
return typeid_cast<const ASTIndexDeclaration &>(*index_ast).name == after_index_name;
});
if (insert_it == indexes_decl_ast->children.end()) {
throw Exception("Wrong index name. Cannot find index `" + after_index_name + "` to insert after.",
ErrorCodes::LOGICAL_ERROR);
}
}
indexes_decl_ast->children.emplace(insert_it, index_decl);
}
else if (type == DROP_INDEX)
{
// TODO: implementation
auto erase_it = std::find_if(
indexes_decl_ast->children.begin(),
indexes_decl_ast->children.end(),
[this](const ASTPtr & index_ast) {
return typeid_cast<const ASTIndexDeclaration &>(*index_ast).name == index_name;
});
if (erase_it == indexes_decl_ast->children.end())
{
throw Exception("Wrong index name. Cannot find index `" + index_name + "` to drop.",
ErrorCodes::LOGICAL_ERROR);
}
indexes_decl_ast->children.erase(erase_it);
}
else
throw Exception("Wrong parameter type in ALTER query", ErrorCodes::LOGICAL_ERROR);

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

@ -245,7 +245,7 @@ void StorageMergeTree::alter(
/// Reinitialize primary key because primary key column types might have changed.
data.setPrimaryKeyAndColumns(new_order_by_ast, new_primary_key_ast, new_columns);
data.setSkipIndexes(data.skip_indexes_ast);
data.setSkipIndexes(new_indexes_ast);
for (auto & transaction : transactions)
transaction->commit();