thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 17:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56331 from ucasfl/alter

Browse Source 
Support create and materialized index in the same alter query
This commit is contained in:
Alexey Milovidov 2023-11-18 17:23:11 +01:00 committed by GitHub
commit 2efa5ab172
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Interpreters/InterpreterAlterQuery.cpp
View File

@ -114,7 +114,6 @@ BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
if (table->isStaticStorage()) if (table->isStaticStorage())
throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is read-only"); throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is read-only");
auto table_lock = table->lockForShare(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout); auto table_lock = table->lockForShare(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
auto metadata_snapshot = table->getInMemoryMetadataPtr();
/// Add default database to table identifiers that we can encounter in e.g. default expressions, mutation expression, etc. /// Add default database to table identifiers that we can encounter in e.g. default expressions, mutation expression, etc.
AddDefaultDatabaseVisitor visitor(getContext(), table_id.getDatabaseName()); AddDefaultDatabaseVisitor visitor(getContext(), table_id.getDatabaseName());
@ -137,10 +136,6 @@ BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
} }
else if (auto mut_command = MutationCommand::parse(command_ast)) else if (auto mut_command = MutationCommand::parse(command_ast))
{ {
if (mut_command->type == MutationCommand::MATERIALIZE_TTL && !metadata_snapshot->hasAnyTTL())
throw Exception(ErrorCodes::INCORRECT_QUERY, "Cannot MATERIALIZE TTL as there is no TTL set for table {}",
table->getStorageID().getNameForLogs());
if (mut_command->type == MutationCommand::UPDATE || mut_command->type == MutationCommand::DELETE) if (mut_command->type == MutationCommand::UPDATE || mut_command->type == MutationCommand::DELETE)
{ {
/// TODO: add a check for result query size. /// TODO: add a check for result query size.
@ -171,8 +166,30 @@ BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
"to execute ALTERs of different types (replicated and non replicated) in single query"); "to execute ALTERs of different types (replicated and non replicated) in single query");
} }
if (!alter_commands.empty())
{
auto alter_lock = table->lockForAlter(getContext()->getSettingsRef().lock_acquire_timeout);
StorageInMemoryMetadata metadata = table->getInMemoryMetadata();
alter_commands.validate(table, getContext());
alter_commands.prepare(metadata);
table->checkAlterIsPossible(alter_commands, getContext());
table->alter(alter_commands, getContext(), alter_lock);
}
/// Get newest metadata_snapshot after execute ALTER command, in order to
/// support like materialize index in the same ALTER query that creates it.
auto metadata_snapshot = table->getInMemoryMetadataPtr();
if (mutation_commands.hasNonEmptyMutationCommands()) if (mutation_commands.hasNonEmptyMutationCommands())
{ {
for (const auto & command : mutation_commands)
{
/// Check it after alter finished, so we can add TTL and materialize TTL in the same ALTER query.
if (command.type == MutationCommand::MATERIALIZE_TTL && !metadata_snapshot->hasAnyTTL())
throw Exception(ErrorCodes::INCORRECT_QUERY, "Cannot MATERIALIZE TTL as there is no TTL set for table {}",
table->getStorageID().getNameForLogs());
}
table->checkMutationIsPossible(mutation_commands, getContext()->getSettingsRef()); table->checkMutationIsPossible(mutation_commands, getContext()->getSettingsRef());
MutationsInterpreter::Settings settings(false); MutationsInterpreter::Settings settings(false);
MutationsInterpreter(table, metadata_snapshot, mutation_commands, getContext(), settings).validate(); MutationsInterpreter(table, metadata_snapshot, mutation_commands, getContext(), settings).validate();
@ -187,16 +204,6 @@ BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
res.pipeline = QueryPipeline(std::move(partition_commands_pipe)); res.pipeline = QueryPipeline(std::move(partition_commands_pipe));
} }
if (!alter_commands.empty())
{
auto alter_lock = table->lockForAlter(getContext()->getSettingsRef().lock_acquire_timeout);
StorageInMemoryMetadata metadata = table->getInMemoryMetadata();
alter_commands.validate(table, getContext());
alter_commands.prepare(metadata);
table->checkAlterIsPossible(alter_commands, getContext());
table->alter(alter_commands, getContext(), alter_lock);
}
return res; return res;
} }

0
tests/queries/0_stateless/02911_add_index_and_materialize_index.reference Normal file
View File

18
tests/queries/0_stateless/02911_add_index_and_materialize_index.sql Normal file
View File

@ -0,0 +1,18 @@
-- Tags: no-replicated-database
DROP TABLE IF EXISTS index_test;
CREATE TABLE index_test
(
x UInt32,
y UInt32,
z UInt32
) ENGINE = MergeTree order by x;
ALTER TABLE index_test
ADD INDEX i_x mortonDecode(2, z).1 TYPE minmax GRANULARITY 1,
ADD INDEX i_y mortonDecode(2, z).2 TYPE minmax GRANULARITY 1,
MATERIALIZE INDEX i_x,
MATERIALIZE INDEX i_y;
drop table index_test;