mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-12-11 17:02:25 +00:00
Merge pull request #54671 from ClickHouse/revert-53298-remove-undrop
Revert "Remove flaky tests for the experimental `UNDROP` feature"
This commit is contained in:
Alexander Tokmakov
GitHub
commit
a271f03b95
32
tests/queries/0_stateless/02681_undrop_query.reference
Normal file
32
tests/queries/0_stateless/02681_undrop_query.reference
Normal file
@ -0,0 +1,32 @@
|
||||
test MergeTree undrop
|
||||
02681_undrop_mergetree
|
||||
1
|
||||
2
|
||||
3
|
||||
test detach
|
||||
UPDATE num = 2 WHERE id = 1
|
||||
test MergeTree with cluster
|
||||
02681_undrop_uuid_on_cluster
|
||||
1
|
||||
2
|
||||
3
|
||||
test MergeTree without uuid on cluster
|
||||
02681_undrop_no_uuid_on_cluster
|
||||
1
|
||||
2
|
||||
3
|
||||
test ReplicatedMergeTree undrop
|
||||
02681_undrop_replicatedmergetree
|
||||
1
|
||||
2
|
||||
3
|
||||
test Log undrop
|
||||
02681_undrop_log
|
||||
1
|
||||
2
|
||||
3
|
||||
test Distributed undrop
|
||||
02681_undrop_distributed
|
||||
test MergeTree drop and undrop multiple times
|
||||
02681_undrop_multiple
|
||||
3
|
||||
90
tests/queries/0_stateless/02681_undrop_query.sql
Normal file
90
tests/queries/0_stateless/02681_undrop_query.sql
Normal file
@ -0,0 +1,90 @@
|
||||
-- Tags: no-ordinary-database, no-replicated-database, distributed, zookeeper
|
||||
|
||||
set database_atomic_wait_for_drop_and_detach_synchronously = 0;
|
||||
set allow_experimental_undrop_table_query = 1;
|
||||
|
||||
select 'test MergeTree undrop';
|
||||
drop table if exists 02681_undrop_mergetree sync;
|
||||
create table 02681_undrop_mergetree (id Int32) Engine=MergeTree() order by id;
|
||||
insert into 02681_undrop_mergetree values (1),(2),(3);
|
||||
drop table 02681_undrop_mergetree;
|
||||
select table from system.dropped_tables where table = '02681_undrop_mergetree' limit 1;
|
||||
undrop table 02681_undrop_mergetree;
|
||||
select * from 02681_undrop_mergetree order by id;
|
||||
drop table 02681_undrop_mergetree sync;
|
||||
|
||||
select 'test detach';
|
||||
drop table if exists 02681_undrop_detach sync;
|
||||
create table 02681_undrop_detach (id Int32, num Int32) Engine=MergeTree() order by id;
|
||||
insert into 02681_undrop_detach values (1, 1);
|
||||
detach table 02681_undrop_detach sync;
|
||||
undrop table 02681_undrop_detach; -- { serverError 57 }
|
||||
attach table 02681_undrop_detach;
|
||||
alter table 02681_undrop_detach update num = 2 where id = 1;
|
||||
select command from system.mutations where table='02681_undrop_detach' and database=currentDatabase() limit 1;
|
||||
drop table 02681_undrop_detach sync;
|
||||
|
||||
select 'test MergeTree with cluster';
|
||||
drop table if exists 02681_undrop_uuid_on_cluster on cluster test_shard_localhost sync format Null;
|
||||
create table 02681_undrop_uuid_on_cluster on cluster test_shard_localhost (id Int32) Engine=MergeTree() order by id format Null;
|
||||
insert into 02681_undrop_uuid_on_cluster values (1),(2),(3);
|
||||
drop table 02681_undrop_uuid_on_cluster on cluster test_shard_localhost format Null;
|
||||
select table from system.dropped_tables where table = '02681_undrop_uuid_on_cluster' limit 1;
|
||||
undrop table 02681_undrop_uuid_on_cluster on cluster test_shard_localhost format Null;
|
||||
select * from 02681_undrop_uuid_on_cluster order by id;
|
||||
drop table 02681_undrop_uuid_on_cluster sync;
|
||||
|
||||
select 'test MergeTree without uuid on cluster';
|
||||
drop table if exists 02681_undrop_no_uuid_on_cluster on cluster test_shard_localhost sync format Null;
|
||||
create table 02681_undrop_no_uuid_on_cluster on cluster test_shard_localhost (id Int32) Engine=MergeTree() order by id format Null;
|
||||
insert into 02681_undrop_no_uuid_on_cluster values (1),(2),(3);
|
||||
drop table 02681_undrop_no_uuid_on_cluster on cluster test_shard_localhost format Null;
|
||||
select table from system.dropped_tables where table = '02681_undrop_no_uuid_on_cluster' limit 1;
|
||||
undrop table 02681_undrop_no_uuid_on_cluster on cluster test_shard_localhost format Null;
|
||||
select * from 02681_undrop_no_uuid_on_cluster order by id;
|
||||
drop table 02681_undrop_no_uuid_on_cluster on cluster test_shard_localhost sync format Null;
|
||||
|
||||
select 'test ReplicatedMergeTree undrop';
|
||||
drop table if exists 02681_undrop_replicatedmergetree sync;
|
||||
create table 02681_undrop_replicatedmergetree (id Int32) Engine=ReplicatedMergeTree('/clickhouse/tables/{database}/02681_undrop_replicatedmergetree', 'test_undrop') order by id;
|
||||
insert into 02681_undrop_replicatedmergetree values (1),(2),(3);
|
||||
drop table 02681_undrop_replicatedmergetree;
|
||||
select table from system.dropped_tables where table = '02681_undrop_replicatedmergetree' limit 1;
|
||||
undrop table 02681_undrop_replicatedmergetree;
|
||||
select * from 02681_undrop_replicatedmergetree order by id;
|
||||
drop table 02681_undrop_replicatedmergetree sync;
|
||||
|
||||
select 'test Log undrop';
|
||||
drop table if exists 02681_undrop_log sync;
|
||||
create table 02681_undrop_log (id Int32) Engine=Log();
|
||||
insert into 02681_undrop_log values (1),(2),(3);
|
||||
drop table 02681_undrop_log;
|
||||
select table from system.dropped_tables where table = '02681_undrop_log' limit 1;
|
||||
undrop table 02681_undrop_log;
|
||||
select * from 02681_undrop_log order by id;
|
||||
drop table 02681_undrop_log sync;
|
||||
|
||||
select 'test Distributed undrop';
|
||||
drop table if exists 02681_undrop_distributed sync;
|
||||
create table 02681_undrop_distributed (id Int32) Engine = Distributed(test_shard_localhost, currentDatabase(), 02681_undrop, rand());
|
||||
drop table 02681_undrop_distributed;
|
||||
select table from system.dropped_tables where table = '02681_undrop_distributed' limit 1;
|
||||
undrop table 02681_undrop_distributed;
|
||||
drop table 02681_undrop_distributed sync;
|
||||
|
||||
select 'test MergeTree drop and undrop multiple times';
|
||||
drop table if exists 02681_undrop_multiple sync;
|
||||
create table 02681_undrop_multiple (id Int32) Engine=MergeTree() order by id;
|
||||
insert into 02681_undrop_multiple values (1);
|
||||
drop table 02681_undrop_multiple;
|
||||
create table 02681_undrop_multiple (id Int32) Engine=MergeTree() order by id;
|
||||
insert into 02681_undrop_multiple values (2);
|
||||
drop table 02681_undrop_multiple;
|
||||
create table 02681_undrop_multiple (id Int32) Engine=MergeTree() order by id;
|
||||
insert into 02681_undrop_multiple values (3);
|
||||
drop table 02681_undrop_multiple;
|
||||
select table from system.dropped_tables where table = '02681_undrop_multiple' limit 1;
|
||||
undrop table 02681_undrop_multiple;
|
||||
select * from 02681_undrop_multiple order by id;
|
||||
undrop table 02681_undrop_multiple; -- { serverError 57 }
|
||||
drop table 02681_undrop_multiple sync;
|
||||
@ -0,0 +1,6 @@
|
||||
test MergeTree with uuid
|
||||
02681_undrop_uuid
|
||||
OK
|
||||
1
|
||||
2
|
||||
3
|
||||
19
tests/queries/0_stateless/02681_undrop_query_uuid.sh
Executable file
19
tests/queries/0_stateless/02681_undrop_query_uuid.sh
Executable file
@ -0,0 +1,19 @@
|
||||
#!/usr/bin/env bash
|
||||
# Tags: no-ordinary-database, no-replicated-database
|
||||
|
||||
CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
|
||||
# shellcheck source=../shell_config.sh
|
||||
. "$CURDIR"/../shell_config.sh
|
||||
|
||||
echo 'test MergeTree with uuid'
|
||||
${CLICKHOUSE_CLIENT} -q "drop table if exists 02681_undrop_uuid sync;"
|
||||
uuid=$(${CLICKHOUSE_CLIENT} --query "SELECT generateUUIDv4()")
|
||||
uuid2=$(${CLICKHOUSE_CLIENT} --query "SELECT generateUUIDv4()")
|
||||
${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none -q "create table 02681_undrop_uuid UUID '$uuid' on cluster test_shard_localhost (id Int32) Engine=MergeTree() order by id;"
|
||||
${CLICKHOUSE_CLIENT} -q "insert into 02681_undrop_uuid values (1),(2),(3);"
|
||||
${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none -q "drop table 02681_undrop_uuid on cluster test_shard_localhost settings database_atomic_wait_for_drop_and_detach_synchronously = 0;"
|
||||
${CLICKHOUSE_CLIENT} -q "select table from system.dropped_tables where table = '02681_undrop_uuid' limit 1;"
|
||||
${CLICKHOUSE_CLIENT} -q "undrop table 02681_undrop_uuid UUID '$uuid2' settings allow_experimental_undrop_table_query = 1;" 2>&1| grep -Faq "UNKNOWN_TABLE" && echo OK
|
||||
${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none -q "undrop table 02681_undrop_uuid UUID '$uuid' on cluster test_shard_localhost settings allow_experimental_undrop_table_query = 1;"
|
||||
${CLICKHOUSE_CLIENT} -q "select * from 02681_undrop_uuid order by id;"
|
||||
${CLICKHOUSE_CLIENT} -q "drop table 02681_undrop_uuid sync;"
|
||||
Loading…
Reference in New Issue
Block a user