Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disallow configuring compression CODECs for alias columns #49363

Merged
merged 10 commits into from May 3, 2023
Merged

Disallow configuring compression CODECs for alias columns #49363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e49842f
block setting codec for alias columns
tsolodov May 1, 2023
fc5b078
fix for linter
tsolodov May 1, 2023
503f099
Merge branch 'master' into master
nikitamikhaylov May 1, 2023
6566ed7
removed loop & added tests
tsolodov May 1, 2023
9be60b4
Merge branch 'master' into master
tsolodov May 1, 2023
c7295db
nit
tsolodov May 1, 2023
eb8dd7f
Merge branch 'master' of github.com:tsolodov/ClickHouse
tsolodov May 1, 2023
1ec176c
Update 02725_alias_columns_should_not_allow_compression_codec.sql
nikitamikhaylov May 1, 2023
c1f95f3
few more tests:
tsolodov May 1, 2023
e58a63b
addressing PR comments
tsolodov May 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Storages/AlterCommands.cpp
View file
Open in desktop
Expand Up @@ -1090,7 +1090,11 @@ void AlterCommands::validate(const StoragePtr & table, ContextPtr context) const
"in a single ALTER query", backQuote(column_name));

if (command.codec)
tsolodov marked this conversation as resolved.
Show resolved Hide resolved
{
if (all_columns.hasAlias(column_name))
throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot specify codec for column type ALIAS");
CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(command.codec, command.data_type, !context->getSettingsRef().allow_suspicious_codecs, context->getSettingsRef().allow_experimental_codecs);
}
auto column_default = all_columns.getDefault(column_name);
if (column_default)
{
Expand Down
6 changes: 6 additions & 0 deletions src/Storages/ColumnsDescription.cpp
View file
Open in desktop
Expand Up @@ -659,6 +659,12 @@ bool ColumnsDescription::hasPhysical(const String & column_name) const
it->default_desc.kind != ColumnDefaultKind::Alias && it->default_desc.kind != ColumnDefaultKind::Ephemeral;
}

bool ColumnsDescription::hasAlias(const String & column_name) const
{
auto it = columns.get<1>().find(column_name);
return it != columns.get<1>().end() && it->default_desc.kind == ColumnDefaultKind::Alias;
}

bool ColumnsDescription::hasColumnOrSubcolumn(GetColumnsOptions::Kind kind, const String & column_name) const
{
auto it = columns.get<1>().find(column_name);
Expand Down
1 change: 1 addition & 0 deletions src/Storages/ColumnsDescription.h
View file
Open in desktop
Expand Up @@ -177,6 +177,7 @@ class ColumnsDescription : public IHints<1, ColumnsDescription>
Names getNamesOfPhysical() const;

bool hasPhysical(const String & column_name) const;
bool hasAlias(const String & column_name) const;
bool hasColumnOrSubcolumn(GetColumnsOptions::Kind kind, const String & column_name) const;
bool hasColumnOrNested(GetColumnsOptions::Kind kind, const String & column_name) const;

Expand Down
Empty file added tests/queries/0_stateless/02725_alias_columns_should_not_allow_compression_codec.reference
View file
Open in desktop
Empty file.
7 changes: 7 additions & 0 deletions tests/queries/0_stateless/02725_alias_columns_should_not_allow_compression_codec.sql
View file
Open in desktop
@@ -0,0 +1,7 @@
drop table if exists alias_column_should_not_allow_compression;
create table if not exists alias_column_should_not_allow_compression ( user_id UUID, user_id_hashed ALIAS (cityHash64(user_id))) engine=MergeTree() order by tuple();
create table if not exists alias_column_should_not_allow_compression_fail ( user_id UUID, user_id_hashed ALIAS (cityHash64(user_id)) codec(LZ4HC(1))) engine=MergeTree() order by tuple(); -- { serverError BAD_ARGUMENTS }
alter table alias_column_should_not_allow_compression modify column user_id codec(LZ4HC(1));
alter table alias_column_should_not_allow_compression modify column user_id_hashed codec(LZ4HC(1)); -- { serverError BAD_ARGUMENTS }
alter table alias_column_should_not_allow_compression add column user_id_hashed_1 UInt64 ALIAS (cityHash64(user_id)) codec(LZ4HC(1)); -- { serverError BAD_ARGUMENTS }
drop table if exists alias_column_should_not_allow_compression;