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

Simplier alter modify logic

Browse Source
This commit is contained in:
alesapin 2020-02-19 17:39:01 +03:00
parent 6f266c94ed
commit 3f29ea0756
7 changed files with 141 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -630,13 +630,11 @@ void AlterCommands::prepare(const StorageInMemoryMetadata & metadata, const Cont
for (size_t i = 0; i < size(); ++i) for (size_t i = 0; i < size(); ++i)
{ {
auto & command = (*this)[i]; auto & command = (*this)[i];
bool has_column = columns.has(command.column_name); bool has_column = columns.has(command.column_name) || columns.hasNested(command.column_name);
if (command.type == AlterCommand::MODIFY_COLUMN) if (command.type == AlterCommand::MODIFY_COLUMN)
{ {
if (!has_column && command.if_exists) if (!has_column && command.if_exists)
{
command.ignore = true; command.ignore = true;
}
if (has_column) if (has_column)
{ {
@ -648,9 +646,13 @@ void AlterCommands::prepare(const StorageInMemoryMetadata & metadata, const Cont
} }
} }
} }
else if (command.type == AlterCommand::ADD_COLUMN else if (command.type == AlterCommand::ADD_COLUMN)
|| command.type == AlterCommand::DROP_COLUMN {
|| command.type == AlterCommand::COMMENT_COLUMN) if (has_column && command.if_not_exists)
command.ignore = true;
}
else if (command.type == AlterCommand::DROP_COLUMN
|| command.type == AlterCommand::COMMENT_COLUMN)
{ {
if (!has_column && command.if_exists) if (!has_column && command.if_exists)
command.ignore = true; command.ignore = true;
@ -662,6 +664,7 @@ void AlterCommands::prepare(const StorageInMemoryMetadata & metadata, const Cont
void AlterCommands::validate(const StorageInMemoryMetadata & metadata, const Context & context) const void AlterCommands::validate(const StorageInMemoryMetadata & metadata, const Context & context) const
{ {
auto all_columns = metadata.columns;
for (size_t i = 0; i < size(); ++i) for (size_t i = 0; i < size(); ++i)
{ {
auto & command = (*this)[i]; auto & command = (*this)[i];
@ -670,29 +673,45 @@ void AlterCommands::validate(const StorageInMemoryMetadata & metadata, const Con
if (command.type == AlterCommand::ADD_COLUMN) if (command.type == AlterCommand::ADD_COLUMN)
{ {
if (metadata.columns.has(column_name) || metadata.columns.hasNested(column_name)) if (metadata.columns.has(column_name) || metadata.columns.hasNested(column_name))
{
if (!command.if_not_exists) if (!command.if_not_exists)
throw Exception{"Cannot add column " + column_name + ": column with this name already exists", ErrorCodes::ILLEGAL_COLUMN}; throw Exception{"Cannot add column " + column_name + ": column with this name already exists", ErrorCodes::ILLEGAL_COLUMN};
else
continue;
}
if (!command.data_type) if (!command.data_type)
throw Exception{"Data type have to be specified for column " + column_name + " to add", ErrorCodes::ILLEGAL_COLUMN}; throw Exception{"Data type have to be specified for column " + column_name + " to add", ErrorCodes::ILLEGAL_COLUMN};
if (command.default_expression) if (command.default_expression)
validateDefaultExpressionForNewColumn(command.default_expression, column_name, command.data_type, metadata.columns, context); validateDefaultExpressionForNewColumn(command.default_expression, column_name, command.data_type, all_columns, context);
all_columns.add(ColumnDescription(column_name, command.data_type, false));
} }
else if (command.type == AlterCommand::MODIFY_COLUMN) else if (command.type == AlterCommand::MODIFY_COLUMN)
{ {
if (!metadata.columns.has(column_name)) if (!metadata.columns.has(column_name))
{
if (!command.if_exists) if (!command.if_exists)
throw Exception{"Wrong column name. Cannot find column " + column_name + " to modify", ErrorCodes::ILLEGAL_COLUMN}; throw Exception{"Wrong column name. Cannot find column " + column_name + " to modify", ErrorCodes::ILLEGAL_COLUMN};
else
continue;
}
auto column_in_table = metadata.columns.get(column_name);
if (command.default_expression) if (command.default_expression)
{ {
if (!command.data_type) if (!command.data_type)
validateDefaultExpressionForNewColumn( validateDefaultExpressionForNewColumn(
command.default_expression, column_name, metadata.columns.get(column_name).type, metadata.columns, context); command.default_expression, column_name, column_in_table.type, all_columns, context);
else else
validateDefaultExpressionForNewColumn( validateDefaultExpressionForNewColumn(
command.default_expression, column_name, command.data_type, metadata.columns, context); command.default_expression, column_name, command.data_type, all_columns, context);
}
else if (column_in_table.default_desc.expression && command.data_type)
{
validateDefaultExpressionForNewColumn(
column_in_table.default_desc.expression, column_name, command.data_type, all_columns, context);
} }
} }
else if (command.type == AlterCommand::DROP_COLUMN) else if (command.type == AlterCommand::DROP_COLUMN)

24
dbms/tests/queries/0_stateless/00061_merge_tree_alter.reference
View File

@ -38,8 +38,8 @@ k UInt64
i32 Int32 i32 Int32
n.ui8 Array(UInt8) n.ui8 Array(UInt8)
n.s Array(String) n.s Array(String)
s Int64 s Int64 DEFAULT \'0\'
CREATE TABLE default.alter_00061 (`d` Date, `k` UInt64, `i32` Int32, `n.ui8` Array(UInt8), `n.s` Array(String), `s` Int64) ENGINE = MergeTree(d, k, 8192) CREATE TABLE default.alter_00061 (`d` Date, `k` UInt64, `i32` Int32, `n.ui8` Array(UInt8), `n.s` Array(String), `s` Int64 DEFAULT \'0\') ENGINE = MergeTree(d, k, 8192)
2015-01-01 6 38 [10,20,30] ['asd','qwe','qwe'] 100500 2015-01-01 6 38 [10,20,30] ['asd','qwe','qwe'] 100500
2015-01-01 7 39 [10,20,30] ['120','130','140'] 0 2015-01-01 7 39 [10,20,30] ['120','130','140'] 0
2015-01-01 8 40 [1,2,3] ['12','13','14'] 0 2015-01-01 8 40 [1,2,3] ['12','13','14'] 0
@ -49,9 +49,9 @@ k UInt64
i32 Int32 i32 Int32
n.ui8 Array(UInt8) n.ui8 Array(UInt8)
n.s Array(String) n.s Array(String)
s UInt32 s UInt32 DEFAULT \'0\'
n.d Array(Date) n.d Array(Date)
CREATE TABLE default.alter_00061 (`d` Date, `k` UInt64, `i32` Int32, `n.ui8` Array(UInt8), `n.s` Array(String), `s` UInt32, `n.d` Array(Date)) ENGINE = MergeTree(d, k, 8192) CREATE TABLE default.alter_00061 (`d` Date, `k` UInt64, `i32` Int32, `n.ui8` Array(UInt8), `n.s` Array(String), `s` UInt32 DEFAULT \'0\', `n.d` Array(Date)) ENGINE = MergeTree(d, k, 8192)
2015-01-01 6 38 [10,20,30] ['asd','qwe','qwe'] 100500 ['0000-00-00','0000-00-00','0000-00-00'] 2015-01-01 6 38 [10,20,30] ['asd','qwe','qwe'] 100500 ['0000-00-00','0000-00-00','0000-00-00']
2015-01-01 7 39 [10,20,30] ['120','130','140'] 0 ['0000-00-00','0000-00-00','0000-00-00'] 2015-01-01 7 39 [10,20,30] ['120','130','140'] 0 ['0000-00-00','0000-00-00','0000-00-00']
2015-01-01 8 40 [1,2,3] ['12','13','14'] 0 ['0000-00-00','0000-00-00','0000-00-00'] 2015-01-01 8 40 [1,2,3] ['12','13','14'] 0 ['0000-00-00','0000-00-00','0000-00-00']
@ -64,8 +64,8 @@ d Date
k UInt64 k UInt64
i32 Int32 i32 Int32
n.s Array(String) n.s Array(String)
s UInt32 s UInt32 DEFAULT \'0\'
CREATE TABLE default.alter_00061 (`d` Date, `k` UInt64, `i32` Int32, `n.s` Array(String), `s` UInt32) ENGINE = MergeTree(d, k, 8192) CREATE TABLE default.alter_00061 (`d` Date, `k` UInt64, `i32` Int32, `n.s` Array(String), `s` UInt32 DEFAULT \'0\') ENGINE = MergeTree(d, k, 8192)
2015-01-01 6 38 ['asd','qwe','qwe'] 100500 2015-01-01 6 38 ['asd','qwe','qwe'] 100500
2015-01-01 7 39 ['120','130','140'] 0 2015-01-01 7 39 ['120','130','140'] 0
2015-01-01 8 40 ['12','13','14'] 0 2015-01-01 8 40 ['12','13','14'] 0
@ -73,8 +73,8 @@ CREATE TABLE default.alter_00061 (`d` Date, `k` UInt64, `i32` Int32, `n.s` Array
d Date d Date
k UInt64 k UInt64
i32 Int32 i32 Int32
s UInt32 s UInt32 DEFAULT \'0\'
CREATE TABLE default.alter_00061 (`d` Date, `k` UInt64, `i32` Int32, `s` UInt32) ENGINE = MergeTree(d, k, 8192) CREATE TABLE default.alter_00061 (`d` Date, `k` UInt64, `i32` Int32, `s` UInt32 DEFAULT \'0\') ENGINE = MergeTree(d, k, 8192)
2015-01-01 6 38 100500 2015-01-01 6 38 100500
2015-01-01 7 39 0 2015-01-01 7 39 0
2015-01-01 8 40 0 2015-01-01 8 40 0
@ -82,10 +82,10 @@ CREATE TABLE default.alter_00061 (`d` Date, `k` UInt64, `i32` Int32, `s` UInt32)
d Date d Date
k UInt64 k UInt64
i32 Int32 i32 Int32
s UInt32 s UInt32 DEFAULT \'0\'
n.s Array(String) n.s Array(String)
n.d Array(Date) n.d Array(Date)
CREATE TABLE default.alter_00061 (`d` Date, `k` UInt64, `i32` Int32, `s` UInt32, `n.s` Array(String), `n.d` Array(Date)) ENGINE = MergeTree(d, k, 8192) CREATE TABLE default.alter_00061 (`d` Date, `k` UInt64, `i32` Int32, `s` UInt32 DEFAULT \'0\', `n.s` Array(String), `n.d` Array(Date)) ENGINE = MergeTree(d, k, 8192)
2015-01-01 6 38 100500 [] [] 2015-01-01 6 38 100500 [] []
2015-01-01 7 39 0 [] [] 2015-01-01 7 39 0 [] []
2015-01-01 8 40 0 [] [] 2015-01-01 8 40 0 [] []
@ -93,8 +93,8 @@ CREATE TABLE default.alter_00061 (`d` Date, `k` UInt64, `i32` Int32, `s` UInt32,
d Date d Date
k UInt64 k UInt64
i32 Int32 i32 Int32
s UInt32 s UInt32 DEFAULT \'0\'
CREATE TABLE default.alter_00061 (`d` Date, `k` UInt64, `i32` Int32, `s` UInt32) ENGINE = MergeTree(d, k, 8192) CREATE TABLE default.alter_00061 (`d` Date, `k` UInt64, `i32` Int32, `s` UInt32 DEFAULT \'0\') ENGINE = MergeTree(d, k, 8192)
2015-01-01 6 38 100500 2015-01-01 6 38 100500
2015-01-01 7 39 0 2015-01-01 7 39 0
2015-01-01 8 40 0 2015-01-01 8 40 0

56
dbms/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.reference
View File

@ -85,16 +85,16 @@ i32 Int32
dt DateTime dt DateTime
n.ui8 Array(UInt8) n.ui8 Array(UInt8)
n.s Array(String) n.s Array(String)
s Int64 s Int64 DEFAULT \'0\'
CREATE TABLE test.replicated_alter1 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), `s` Int64) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192) CREATE TABLE test.replicated_alter1 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), `s` Int64 DEFAULT \'0\') ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
d Date d Date
k UInt64 k UInt64
i32 Int32 i32 Int32
dt DateTime dt DateTime
n.ui8 Array(UInt8) n.ui8 Array(UInt8)
n.s Array(String) n.s Array(String)
s Int64 s Int64 DEFAULT \'0\'
CREATE TABLE test.replicated_alter2 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), `s` Int64) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192) CREATE TABLE test.replicated_alter2 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), `s` Int64 DEFAULT \'0\') ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
2015-01-01 6 38 2014-07-15 13:26:50 [10,20,30] ['asd','qwe','qwe'] 100500 2015-01-01 6 38 2014-07-15 13:26:50 [10,20,30] ['asd','qwe','qwe'] 100500
2015-01-01 7 39 2014-07-14 13:26:50 [10,20,30] ['120','130','140'] 0 2015-01-01 7 39 2014-07-14 13:26:50 [10,20,30] ['120','130','140'] 0
2015-01-01 8 40 2012-12-12 12:12:12 [1,2,3] ['12','13','14'] 0 2015-01-01 8 40 2012-12-12 12:12:12 [1,2,3] ['12','13','14'] 0
@ -106,18 +106,18 @@ i32 Int32
dt DateTime dt DateTime
n.ui8 Array(UInt8) n.ui8 Array(UInt8)
n.s Array(String) n.s Array(String)
s UInt32 s UInt32 DEFAULT \'0\'
n.d Array(Date) n.d Array(Date)
CREATE TABLE test.replicated_alter1 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), `s` UInt32, `n.d` Array(Date)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192) CREATE TABLE test.replicated_alter1 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), `s` UInt32 DEFAULT \'0\', `n.d` Array(Date)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
d Date d Date
k UInt64 k UInt64
i32 Int32 i32 Int32
dt DateTime dt DateTime
n.ui8 Array(UInt8) n.ui8 Array(UInt8)
n.s Array(String) n.s Array(String)
s UInt32 s UInt32 DEFAULT \'0\'
n.d Array(Date) n.d Array(Date)
CREATE TABLE test.replicated_alter2 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), `s` UInt32, `n.d` Array(Date)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192) CREATE TABLE test.replicated_alter2 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), `s` UInt32 DEFAULT \'0\', `n.d` Array(Date)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
2015-01-01 6 38 2014-07-15 13:26:50 [10,20,30] ['asd','qwe','qwe'] 100500 ['0000-00-00','0000-00-00','0000-00-00'] 2015-01-01 6 38 2014-07-15 13:26:50 [10,20,30] ['asd','qwe','qwe'] 100500 ['0000-00-00','0000-00-00','0000-00-00']
2015-01-01 7 39 2014-07-14 13:26:50 [10,20,30] ['120','130','140'] 0 ['0000-00-00','0000-00-00','0000-00-00'] 2015-01-01 7 39 2014-07-14 13:26:50 [10,20,30] ['120','130','140'] 0 ['0000-00-00','0000-00-00','0000-00-00']
2015-01-01 8 40 2012-12-12 12:12:12 [1,2,3] ['12','13','14'] 0 ['0000-00-00','0000-00-00','0000-00-00'] 2015-01-01 8 40 2012-12-12 12:12:12 [1,2,3] ['12','13','14'] 0 ['0000-00-00','0000-00-00','0000-00-00']
@ -128,15 +128,15 @@ k UInt64
i32 Int32 i32 Int32
dt DateTime dt DateTime
n.s Array(String) n.s Array(String)
s UInt32 s UInt32 DEFAULT \'0\'
CREATE TABLE test.replicated_alter1 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.s` Array(String), `s` UInt32) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192) CREATE TABLE test.replicated_alter1 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.s` Array(String), `s` UInt32 DEFAULT \'0\') ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
d Date d Date
k UInt64 k UInt64
i32 Int32 i32 Int32
dt DateTime dt DateTime
n.s Array(String) n.s Array(String)
s UInt32 s UInt32 DEFAULT \'0\'
CREATE TABLE test.replicated_alter2 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.s` Array(String), `s` UInt32) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192) CREATE TABLE test.replicated_alter2 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.s` Array(String), `s` UInt32 DEFAULT \'0\') ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
2015-01-01 6 38 2014-07-15 13:26:50 ['asd','qwe','qwe'] 100500 2015-01-01 6 38 2014-07-15 13:26:50 ['asd','qwe','qwe'] 100500
2015-01-01 7 39 2014-07-14 13:26:50 ['120','130','140'] 0 2015-01-01 7 39 2014-07-14 13:26:50 ['120','130','140'] 0
2015-01-01 8 40 2012-12-12 12:12:12 ['12','13','14'] 0 2015-01-01 8 40 2012-12-12 12:12:12 ['12','13','14'] 0
@ -146,14 +146,14 @@ d Date
k UInt64 k UInt64
i32 Int32 i32 Int32
dt DateTime dt DateTime
s UInt32 s UInt32 DEFAULT \'0\'
CREATE TABLE test.replicated_alter1 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `s` UInt32) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192) CREATE TABLE test.replicated_alter1 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `s` UInt32 DEFAULT \'0\') ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
d Date d Date
k UInt64 k UInt64
i32 Int32 i32 Int32
dt DateTime dt DateTime
s UInt32 s UInt32 DEFAULT \'0\'
CREATE TABLE test.replicated_alter2 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `s` UInt32) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192) CREATE TABLE test.replicated_alter2 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `s` UInt32 DEFAULT \'0\') ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
2015-01-01 6 38 2014-07-15 13:26:50 100500 2015-01-01 6 38 2014-07-15 13:26:50 100500
2015-01-01 7 39 2014-07-14 13:26:50 0 2015-01-01 7 39 2014-07-14 13:26:50 0
2015-01-01 8 40 2012-12-12 12:12:12 0 2015-01-01 8 40 2012-12-12 12:12:12 0
@ -163,18 +163,18 @@ d Date
k UInt64 k UInt64
i32 Int32 i32 Int32
dt DateTime dt DateTime
s UInt32 s UInt32 DEFAULT \'0\'
n.s Array(String) n.s Array(String)
n.d Array(Date) n.d Array(Date)
CREATE TABLE test.replicated_alter1 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `s` UInt32, `n.s` Array(String), `n.d` Array(Date)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192) CREATE TABLE test.replicated_alter1 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `s` UInt32 DEFAULT \'0\', `n.s` Array(String), `n.d` Array(Date)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
d Date d Date
k UInt64 k UInt64
i32 Int32 i32 Int32
dt DateTime dt DateTime
s UInt32 s UInt32 DEFAULT \'0\'
n.s Array(String) n.s Array(String)
n.d Array(Date) n.d Array(Date)
CREATE TABLE test.replicated_alter2 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `s` UInt32, `n.s` Array(String), `n.d` Array(Date)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192) CREATE TABLE test.replicated_alter2 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `s` UInt32 DEFAULT \'0\', `n.s` Array(String), `n.d` Array(Date)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
2015-01-01 6 38 2014-07-15 13:26:50 100500 [] [] 2015-01-01 6 38 2014-07-15 13:26:50 100500 [] []
2015-01-01 7 39 2014-07-14 13:26:50 0 [] [] 2015-01-01 7 39 2014-07-14 13:26:50 0 [] []
2015-01-01 8 40 2012-12-12 12:12:12 0 [] [] 2015-01-01 8 40 2012-12-12 12:12:12 0 [] []
@ -184,14 +184,14 @@ d Date
k UInt64 k UInt64
i32 Int32 i32 Int32
dt DateTime dt DateTime
s UInt32 s UInt32 DEFAULT \'0\'
CREATE TABLE test.replicated_alter1 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `s` UInt32) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192) CREATE TABLE test.replicated_alter1 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `s` UInt32 DEFAULT \'0\') ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
d Date d Date
k UInt64 k UInt64
i32 Int32 i32 Int32
dt DateTime dt DateTime
s UInt32 s UInt32 DEFAULT \'0\'
CREATE TABLE test.replicated_alter2 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `s` UInt32) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192) CREATE TABLE test.replicated_alter2 (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `s` UInt32 DEFAULT \'0\') ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
2015-01-01 6 38 2014-07-15 13:26:50 100500 2015-01-01 6 38 2014-07-15 13:26:50 100500
2015-01-01 7 39 2014-07-14 13:26:50 0 2015-01-01 7 39 2014-07-14 13:26:50 0
2015-01-01 8 40 2012-12-12 12:12:12 0 2015-01-01 8 40 2012-12-12 12:12:12 0
@ -201,14 +201,14 @@ d Date
k UInt64 k UInt64
i32 Int32 i32 Int32
dt Date dt Date
s DateTime s DateTime DEFAULT \'0000-00-00 00:00:00\'
CREATE TABLE test.replicated_alter1 (`d` Date, `k` UInt64, `i32` Int32, `dt` Date, `s` DateTime) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192) CREATE TABLE test.replicated_alter1 (`d` Date, `k` UInt64, `i32` Int32, `dt` Date, `s` DateTime DEFAULT \'0000-00-00 00:00:00\') ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
d Date d Date
k UInt64 k UInt64
i32 Int32 i32 Int32
dt Date dt Date
s DateTime s DateTime DEFAULT \'0000-00-00 00:00:00\'
CREATE TABLE test.replicated_alter2 (`d` Date, `k` UInt64, `i32` Int32, `dt` Date, `s` DateTime) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192) CREATE TABLE test.replicated_alter2 (`d` Date, `k` UInt64, `i32` Int32, `dt` Date, `s` DateTime DEFAULT \'0000-00-00 00:00:00\') ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
2015-01-01 6 38 2014-07-15 1970-01-02 06:55:00 2015-01-01 6 38 2014-07-15 1970-01-02 06:55:00
2015-01-01 7 39 2014-07-14 0000-00-00 00:00:00 2015-01-01 7 39 2014-07-14 0000-00-00 00:00:00
2015-01-01 8 40 2012-12-12 0000-00-00 00:00:00 2015-01-01 8 40 2012-12-12 0000-00-00 00:00:00

2
dbms/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.sql
View File

@ -98,7 +98,7 @@ DESC TABLE test.replicated_alter2;
SHOW CREATE TABLE test.replicated_alter2; SHOW CREATE TABLE test.replicated_alter2;
SELECT * FROM test.replicated_alter1 ORDER BY k; SELECT * FROM test.replicated_alter1 ORDER BY k;
ALTER TABLE test.replicated_alter1 MODIFY COLUMN dt Date, MODIFY COLUMN s DateTime; ALTER TABLE test.replicated_alter1 MODIFY COLUMN dt Date, MODIFY COLUMN s DateTime DEFAULT '0000-00-00 00:00:00';
DESC TABLE test.replicated_alter1; DESC TABLE test.replicated_alter1;
SHOW CREATE TABLE test.replicated_alter1; SHOW CREATE TABLE test.replicated_alter1;

2
dbms/tests/queries/0_stateless/00262_alter_alias.sql
View File

@ -11,7 +11,7 @@ select array from aliases_test;
alter table aliases_test modify column array default [0, 1, 2]; alter table aliases_test modify column array default [0, 1, 2];
select array from aliases_test; select array from aliases_test;
alter table aliases_test add column struct.key default [0, 1, 2], add column struct.value default array; alter table aliases_test add column struct.key Array(UInt8) default [0, 1, 2], add column struct.value Array(UInt8) default array;
select struct.key, struct.value from aliases_test; select struct.key, struct.value from aliases_test;
alter table aliases_test modify column struct.value alias array; alter table aliases_test modify column struct.value alias array;

11
dbms/tests/queries/0_stateless/01079_alter_default_zookeeper.reference Normal file
View File

@ -0,0 +1,11 @@
CREATE TABLE default.alter_default (`date` Date, `key` UInt64, `value` String DEFAULT \'10\') ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\') ORDER BY key SETTINGS index_granularity = 8192
1000
CREATE TABLE default.alter_default (`date` Date, `key` UInt64, `value` UInt64 DEFAULT \'10\') ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\') ORDER BY key SETTINGS index_granularity = 8192
CREATE TABLE default.alter_default (`date` Date, `key` UInt64, `value` UInt64 DEFAULT 10) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\') ORDER BY key SETTINGS index_granularity = 8192
1000
CREATE TABLE default.alter_default (`date` Date, `key` UInt64, `value` UInt64 DEFAULT 100) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\') ORDER BY key SETTINGS index_granularity = 8192
CREATE TABLE default.alter_default (`date` Date, `key` UInt64, `value` UInt16 DEFAULT 100) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\') ORDER BY key SETTINGS index_granularity = 8192
10000
CREATE TABLE default.alter_default (`date` Date, `key` UInt64, `value` UInt8 DEFAULT 10) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\') ORDER BY key SETTINGS index_granularity = 8192
CREATE TABLE default.alter_default (`date` Date, `key` UInt64, `value` UInt8 DEFAULT 10, `better_column` UInt8 DEFAULT \'1\') ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\') ORDER BY key SETTINGS index_granularity = 8192
CREATE TABLE default.alter_default (`date` Date, `key` UInt64, `value` UInt8 DEFAULT 10, `better_column` UInt8 DEFAULT \'1\', `other_date` String DEFAULT 1) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\') ORDER BY key SETTINGS index_granularity = 8192

60
dbms/tests/queries/0_stateless/01079_alter_default_zookeeper.sql Normal file
View File

@ -0,0 +1,60 @@
DROP TABLE IF EXISTS alter_default;
CREATE TABLE alter_default
(
date Date,
key UInt64
)
ENGINE ReplicatedMergeTree('/clickhouse/tables/alter_default', '1')
ORDER BY key;
INSERT INTO alter_default select toDate('2020-01-05'), number from system.numbers limit 100;
-- Cannot add column without type
ALTER TABLE alter_default ADD COLUMN value DEFAULT '10'; --{serverError 44}
ALTER TABLE alter_default ADD COLUMN value String DEFAULT '10';
SHOW CREATE TABLE alter_default;
SELECT sum(cast(value as UInt64)) FROM alter_default;
ALTER TABLE alter_default MODIFY COLUMN value UInt64;
SHOW CREATE TABLE alter_default;
ALTER TABLE alter_default MODIFY COLUMN value UInt64 DEFAULT 10;
SHOW CREATE TABLE alter_default;
SELECT sum(value) from alter_default;
ALTER TABLE alter_default MODIFY COLUMN value DEFAULT 100;
SHOW CREATE TABLE alter_default;
ALTER TABLE alter_default MODIFY COLUMN value UInt16 DEFAULT 100;
SHOW CREATE TABLE alter_default;
SELECT sum(value) from alter_default;
ALTER TABLE alter_default MODIFY COLUMN value UInt8 DEFAULT 10;
SHOW CREATE TABLE alter_default;
ALTER TABLE alter_default ADD COLUMN bad_column UInt8 DEFAULT 'q'; --{serverError 6}
ALTER TABLE alter_default ADD COLUMN better_column UInt8 DEFAULT '1';
SHOW CREATE TABLE alter_default;
ALTER TABLE alter_default ADD COLUMN other_date String DEFAULT '0';
ALTER TABLE alter_default MODIFY COLUMN other_date DateTime; --{serverError 41}
ALTER TABLE alter_default MODIFY COLUMN other_date DEFAULT 1;
SHOW CREATE TABLE alter_default;
DROP TABLE IF EXISTS alter_default;