Merge pull request #67126 from Avogar/better-dynamic-merges-tests

Increase lock_acquire_timeout_for_background_operations setting in dynamic merges tests

tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_merge_tree.sql

@@ -2,7 +2,7 @@
 set allow_experimental_dynamic_type=1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_columns_to_activate=10, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_columns_to_activate=10, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760, lock_acquire_timeout_for_background_operations=600;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);

tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_wide_tree.sql

@@ -2,7 +2,7 @@
 set allow_experimental_dynamic_type=1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_columns_to_activate=10, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_columns_to_activate=10, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760, lock_acquire_timeout_for_background_operations=600;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);

tests/queries/0_stateless/03037_dynamic_merges_1_vertical_compact_merge_tree.sql

@@ -2,7 +2,7 @@
 set allow_experimental_dynamic_type=1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760, lock_acquire_timeout_for_background_operations=600;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);
@@ -13,7 +13,8 @@ insert into test select number, toDateTime(number) from numbers(50000);
 insert into test select number, NULL from numbers(100000);
 
 select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
-system start merges test; optimize table test final;;
+system start merges test;
+optimize table test final;
 select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 system stop merges test;

tests/queries/0_stateless/03037_dynamic_merges_1_vertical_wide_merge_tree.sql

@@ -2,7 +2,7 @@
 set allow_experimental_dynamic_type=1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760, lock_acquire_timeout_for_background_operations=600;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);

tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_compact_merge_tree.sql

@@ -3,7 +3,7 @@
 set allow_experimental_dynamic_type = 1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000;
+create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, lock_acquire_timeout_for_background_operations=600;
 system stop merges test;
 insert into test select number, number from numbers(1000000);
 insert into test select number, 'str_' || toString(number) from numbers(1000000, 1000000);

tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_wide_merge_tree.sql

@@ -3,7 +3,7 @@
 set allow_experimental_dynamic_type = 1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;
+create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, lock_acquire_timeout_for_background_operations=600;
 system stop merges test;
 insert into test select number, number from numbers(1000000);
 insert into test select number, 'str_' || toString(number) from numbers(1000000, 1000000);

tests/queries/0_stateless/03037_dynamic_merges_2_vertical_compact_merge_tree.sql

@@ -3,7 +3,7 @@
 set allow_experimental_dynamic_type = 1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;
+create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, lock_acquire_timeout_for_background_operations=600;
 system stop merges test;
 insert into test select number, number from numbers(1000000);
 insert into test select number, 'str_' || toString(number) from numbers(1000000, 1000000);

tests/queries/0_stateless/03037_dynamic_merges_2_vertical_wide_merge_tree.sql

@@ -3,7 +3,7 @@
 set allow_experimental_dynamic_type = 1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;
+create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, lock_acquire_timeout_for_background_operations=600;
 system stop merges test;
 insert into test select number, number from numbers(1000000);
 insert into test select number, 'str_' || toString(number) from numbers(1000000, 1000000);

tests/queries/0_stateless/03038_nested_dynamic_merges_compact_horizontal.sql

@@ -6,7 +6,7 @@ set allow_experimental_dynamic_type = 1;
 set enable_named_columns_in_function_tuple = 0;
 
 drop table if exists test;;
-create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000;;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, lock_acquire_timeout_for_background_operations=600;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);

tests/queries/0_stateless/03038_nested_dynamic_merges_compact_vertical.sql

@@ -6,7 +6,7 @@ set allow_experimental_dynamic_type = 1;
 set enable_named_columns_in_function_tuple = 0;
 
 drop table if exists test;;
-create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, lock_acquire_timeout_for_background_operations=600;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);

tests/queries/0_stateless/03038_nested_dynamic_merges_wide_horizontal.sql

@@ -6,7 +6,7 @@ set allow_experimental_dynamic_type = 1;
 set enable_named_columns_in_function_tuple = 0;
 
 drop table if exists test;;
-create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, lock_acquire_timeout_for_background_operations=600;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);

tests/queries/0_stateless/03038_nested_dynamic_merges_wide_vertical.sql

@@ -6,7 +6,7 @@ set allow_experimental_dynamic_type = 1;
 set enable_named_columns_in_function_tuple = 0;
 
 drop table if exists test;;
-create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, lock_acquire_timeout_for_background_operations=600;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);