From eb555fc719815f1535d064a5ba54a93ff781e3b7 Mon Sep 17 00:00:00 2001 From: terrylin Date: Sun, 1 Aug 2021 21:34:30 +0800 Subject: [PATCH] modify test cases --- .../0_stateless/01070_materialize_ttl.sql | 39 ++++----------- .../queries/0_stateless/01070_modify_ttl.sql | 50 ++++++------------- .../01070_mutations_with_dependencies.sql | 27 +++------- .../01378_alter_rename_with_ttl_zookeeper.sql | 2 +- 4 files changed, 34 insertions(+), 84 deletions(-) diff --git a/tests/queries/0_stateless/01070_materialize_ttl.sql b/tests/queries/0_stateless/01070_materialize_ttl.sql index 49c6324e6ce..19684f028a7 100644 --- a/tests/queries/0_stateless/01070_materialize_ttl.sql +++ b/tests/queries/0_stateless/01070_materialize_ttl.sql @@ -4,8 +4,7 @@ set materialize_ttl_after_modify = 0; drop table if exists ttl; create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDayOfMonth(d) -SETTINGS merge_with_ttl_timeout=0; -SYSTEM STOP TTL MERGES ttl; +SETTINGS max_number_of_merges_with_ttl_in_pool=0; insert into ttl values (toDateTime('2000-10-10 00:00:00'), 1); insert into ttl values (toDateTime('2000-10-10 00:00:00'), 2); @@ -21,15 +20,13 @@ select * from ttl order by a; alter table ttl materialize ttl; select * from ttl order by a; -SYSTEM START TTL MERGES ttl; -optimize table ttl; +optimize table ttl final; select * from ttl order by a; drop table if exists ttl; create table ttl (i Int, s String) engine = MergeTree order by i -SETTINGS merge_with_ttl_timeout=0; -SYSTEM STOP TTL MERGES ttl; +SETTINGS max_number_of_merges_with_ttl_in_pool=0; insert into ttl values (1, 'a') (2, 'b') (3, 'c') (4, 'd'); @@ -37,25 +34,20 @@ alter table ttl modify ttl i % 2 = 0 ? today() - 10 : toDate('2100-01-01'); alter table ttl materialize ttl; select * from ttl order by i; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select * from ttl order by i; alter table ttl modify ttl toDate('2000-01-01'); alter table ttl materialize ttl; select * from ttl order by i; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select * from ttl order by i; drop table if exists ttl; create table ttl (i Int, s String) engine = MergeTree order by i -SETTINGS merge_with_ttl_timeout=0; -SYSTEM STOP TTL MERGES ttl; +SETTINGS max_number_of_merges_with_ttl_in_pool=0; insert into ttl values (1, 'a') (2, 'b') (3, 'c') (4, 'd'); @@ -66,25 +58,20 @@ select * from ttl order by i; alter table ttl materialize ttl; select * from ttl order by i; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select * from ttl order by i; alter table ttl modify column s String ttl toDate('2000-01-01'); alter table ttl materialize ttl; select * from ttl order by i; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select * from ttl order by i; drop table if exists ttl; create table ttl (d Date, i Int, s String) engine = MergeTree order by i -SETTINGS merge_with_ttl_timeout=0; -SYSTEM STOP TTL MERGES ttl; +SETTINGS max_number_of_merges_with_ttl_in_pool=0; insert into ttl values (toDate('2000-01-02'), 1, 'a') (toDate('2000-01-03'), 2, 'b') (toDate('2080-01-01'), 3, 'c') (toDate('2080-01-03'), 4, 'd'); @@ -92,18 +79,14 @@ alter table ttl modify ttl i % 3 = 0 ? today() - 10 : toDate('2100-01-01'); alter table ttl materialize ttl; select i, s from ttl order by i; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select i, s from ttl order by i; alter table ttl modify column s String ttl d + interval 1 month; alter table ttl materialize ttl; select i, s from ttl order by i; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select i, s from ttl order by i; drop table if exists ttl; diff --git a/tests/queries/0_stateless/01070_modify_ttl.sql b/tests/queries/0_stateless/01070_modify_ttl.sql index 2e904f64274..f4228b886ba 100644 --- a/tests/queries/0_stateless/01070_modify_ttl.sql +++ b/tests/queries/0_stateless/01070_modify_ttl.sql @@ -2,8 +2,7 @@ drop table if exists ttl; set mutations_sync = 2; create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDayOfMonth(d) -SETTINGS merge_with_ttl_timeout=0; -SYSTEM STOP TTL MERGES ttl; +SETTINGS max_number_of_merges_with_ttl_in_pool=0; insert into ttl values (toDateTime('2000-10-10 00:00:00'), 1); insert into ttl values (toDateTime('2000-10-10 00:00:00'), 2); @@ -13,95 +12,77 @@ insert into ttl values (toDateTime('2100-10-10 00:00:00'), 4); alter table ttl modify ttl d + interval 1 day; select * from ttl order by a; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select * from ttl order by a; select '============='; drop table if exists ttl; create table ttl (i Int, s String) engine = MergeTree order by i -SETTINGS merge_with_ttl_timeout=0; -SYSTEM STOP TTL MERGES ttl; +SETTINGS max_number_of_merges_with_ttl_in_pool=0; insert into ttl values (1, 'a') (2, 'b') (3, 'c') (4, 'd'); alter table ttl modify ttl i % 2 = 0 ? today() - 10 : toDate('2100-01-01'); select * from ttl order by i; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select * from ttl order by i; select '============='; alter table ttl modify ttl toDate('2000-01-01'); select * from ttl order by i; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select * from ttl order by i; select '============='; drop table if exists ttl; create table ttl (i Int, s String) engine = MergeTree order by i -SETTINGS merge_with_ttl_timeout=0; -SYSTEM STOP TTL MERGES ttl; +SETTINGS max_number_of_merges_with_ttl_in_pool=0; insert into ttl values (1, 'a') (2, 'b') (3, 'c') (4, 'd'); alter table ttl modify column s String ttl i % 2 = 0 ? today() - 10 : toDate('2100-01-01'); select * from ttl order by i; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select * from ttl order by i; select '============='; alter table ttl modify column s String ttl toDate('2000-01-01'); select * from ttl order by i; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select * from ttl order by i; select '============='; drop table if exists ttl; create table ttl (d Date, i Int, s String) engine = MergeTree order by i -SETTINGS merge_with_ttl_timeout=0; -SYSTEM STOP TTL MERGES ttl; +SETTINGS max_number_of_merges_with_ttl_in_pool=0; insert into ttl values (toDate('2000-01-02'), 1, 'a') (toDate('2000-01-03'), 2, 'b') (toDate('2080-01-01'), 3, 'c') (toDate('2080-01-03'), 4, 'd'); alter table ttl modify ttl i % 3 = 0 ? today() - 10 : toDate('2100-01-01'); select i, s from ttl order by i; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select i, s from ttl order by i; select '============='; alter table ttl modify column s String ttl d + interval 1 month; select i, s from ttl order by i; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select i, s from ttl order by i; select '============='; drop table if exists ttl; create table ttl (i Int, s String, t String) engine = MergeTree order by i -SETTINGS merge_with_ttl_timeout=0; -SYSTEM STOP TTL MERGES ttl; +SETTINGS max_number_of_merges_with_ttl_in_pool=0; insert into ttl values (1, 'a', 'aa') (2, 'b', 'bb') (3, 'c', 'cc') (4, 'd', 'dd'); @@ -109,9 +90,7 @@ alter table ttl modify column s String ttl i % 3 = 0 ? today() - 10 : toDate('21 modify column t String ttl i % 3 = 1 ? today() - 10 : toDate('2100-01-01'); select i, s, t from ttl order by i; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select i, s, t from ttl order by i; -- MATERIALIZE TTL ran only once @@ -122,8 +101,7 @@ drop table if exists ttl; -- Nothing changed, don't run mutation create table ttl (i Int, s String ttl toDate('2000-01-02')) engine = MergeTree order by i -SETTINGS merge_with_ttl_timeout=0; -SYSTEM STOP TTL MERGES ttl; +SETTINGS max_number_of_merges_with_ttl_in_pool=0; alter table ttl modify column s String ttl toDate('2000-01-02'); select count() from system.mutations where table = 'ttl' and is_done; diff --git a/tests/queries/0_stateless/01070_mutations_with_dependencies.sql b/tests/queries/0_stateless/01070_mutations_with_dependencies.sql index bbb79f4c5d6..f56f25b5e77 100644 --- a/tests/queries/0_stateless/01070_mutations_with_dependencies.sql +++ b/tests/queries/0_stateless/01070_mutations_with_dependencies.sql @@ -3,8 +3,7 @@ set mutations_sync = 2; -- check that ttl info was updated after mutation. create table ttl (i Int, a Int, s String) engine = MergeTree order by i -SETTINGS merge_with_ttl_timeout=0; -SYSTEM STOP TTL MERGES ttl; +SETTINGS max_number_of_merges_with_ttl_in_pool=0; insert into ttl values (1, 1, 'a') (2, 1, 'b') (3, 1, 'c') (4, 1, 'd'); @@ -12,17 +11,13 @@ alter table ttl modify ttl a % 2 = 0 ? today() - 10 : toDate('2100-01-01'); alter table ttl materialize ttl; select * from ttl order by i; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select * from ttl order by i; alter table ttl update a = 0 where i % 2 = 0; select * from ttl order by i; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select * from ttl order by i; drop table ttl; @@ -32,8 +27,7 @@ select '==================='; -- check that skip index is updated after column was modified by ttl. create table ttl (i Int, a Int, s String default 'b' ttl a % 2 = 0 ? today() - 10 : toDate('2100-01-01'), index ind_s (s) type set(1) granularity 1) engine = MergeTree order by i - SETTINGS merge_with_ttl_timeout=0; -SYSTEM STOP TTL MERGES ttl; + SETTINGS max_number_of_merges_with_ttl_in_pool=0; insert into ttl values (1, 1, 'a') (2, 1, 'a') (3, 1, 'a') (4, 1, 'a'); @@ -43,9 +37,7 @@ alter table ttl update a = 0 where i % 2 = 0; select count() from ttl where s = 'a'; select count() from ttl where s = 'b'; -SYSTEM START TTL MERGES ttl; -optimize table ttl; -SYSTEM STOP TTL MERGES ttl; +optimize table ttl final; select count() from ttl where s = 'a'; select count() from ttl where s = 'b'; @@ -53,22 +45,19 @@ drop table ttl; -- check only that it doesn't throw exceptions. create table ttl (i Int, s String) engine = MergeTree order by i ttl toDate('2000-01-01') TO DISK 'default' -SETTINGS merge_with_ttl_timeout=0; -SYSTEM STOP TTL MERGES ttl; +SETTINGS max_number_of_merges_with_ttl_in_pool=0; alter table ttl materialize ttl; drop table ttl; create table ttl (a Int, b Int, c Int default 42 ttl d, d Date, index ind (b * c) type minmax granularity 1) -engine = MergeTree order by a SETTINGS merge_with_ttl_timeout=0; -SYSTEM STOP TTL MERGES ttl; +engine = MergeTree order by a SETTINGS max_number_of_merges_with_ttl_in_pool=0; insert into ttl values (1, 2, 3, '2100-01-01'); alter table ttl update d = '2000-01-01' where 1; alter table ttl materialize ttl; select * from ttl; -SYSTEM START TTL MERGES ttl; -optimize table ttl; +optimize table ttl final; select * from ttl; drop table ttl; diff --git a/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql b/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql index 686c0181175..02ab946c228 100644 --- a/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql +++ b/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql @@ -28,7 +28,7 @@ ALTER TABLE table_rename_with_ttl materialize TTL; SELECT count() FROM table_rename_with_ttl; SYSTEM START TTL MERGES table_rename_with_ttl; -optimize table table_rename_with_ttl; +optimize table table_rename_with_ttl FINAL; SELECT count() FROM table_rename_with_ttl;