From 1bc3dc632c7ba4bc2ff6a3b23339392530dbfa8e Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Thu, 15 Feb 2024 04:56:14 +0100 Subject: [PATCH 1/3] Inhibit randomization in some tests --- tests/queries/1_stateful/00037_uniq_state_merge1.sql | 1 + tests/queries/1_stateful/00038_uniq_state_merge2.sql | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/queries/1_stateful/00037_uniq_state_merge1.sql b/tests/queries/1_stateful/00037_uniq_state_merge1.sql index c941a14b571..6abaad7297f 100644 --- a/tests/queries/1_stateful/00037_uniq_state_merge1.sql +++ b/tests/queries/1_stateful/00037_uniq_state_merge1.sql @@ -1 +1,2 @@ +SET max_bytes_before_external_group_by = '1G'; SELECT k, any(u) AS u, uniqMerge(us) AS us FROM (SELECT domain(URL) AS k, uniq(UserID) AS u, uniqState(UserID) AS us FROM test.hits GROUP BY k) GROUP BY k ORDER BY u DESC, k ASC LIMIT 100 diff --git a/tests/queries/1_stateful/00038_uniq_state_merge2.sql b/tests/queries/1_stateful/00038_uniq_state_merge2.sql index 677458daeda..f97395943a1 100644 --- a/tests/queries/1_stateful/00038_uniq_state_merge2.sql +++ b/tests/queries/1_stateful/00038_uniq_state_merge2.sql @@ -1 +1,2 @@ +SET max_bytes_before_external_group_by = '1G'; SELECT topLevelDomain(concat('http://', k)) AS tld, sum(u) AS u, uniqMerge(us) AS us FROM (SELECT domain(URL) AS k, uniq(UserID) AS u, uniqState(UserID) AS us FROM test.hits GROUP BY k) GROUP BY tld ORDER BY u DESC, tld ASC LIMIT 100 From d60ab4146dd167d3e177778e62e3a1cbbca1a78c Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Thu, 15 Feb 2024 05:02:10 +0100 Subject: [PATCH 2/3] Inhibit randomization in some tests --- ...43_variant_type_with_different_local_and_global_order.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/queries/0_stateless/02943_variant_type_with_different_local_and_global_order.sh b/tests/queries/0_stateless/02943_variant_type_with_different_local_and_global_order.sh index d089ed3cb2f..e4c1206263f 100755 --- a/tests/queries/0_stateless/02943_variant_type_with_different_local_and_global_order.sh +++ b/tests/queries/0_stateless/02943_variant_type_with_different_local_and_global_order.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Tags: long +# Tags: long, no-debug CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) # reset --log_comment @@ -74,11 +74,11 @@ run 0 $CH_CLIENT -q "drop table test;" echo "MergeTree compact" -$CH_CLIENT -q "create table test (id UInt64, v Variant(UInt64, String, Array(UInt64))) engine=MergeTree order by id settings min_rows_for_wide_part=100000000, min_bytes_for_wide_part=1000000000;" +$CH_CLIENT -q "create table test (id UInt64, v Variant(UInt64, String, Array(UInt64))) engine=MergeTree order by id settings min_rows_for_wide_part=100000000, min_bytes_for_wide_part=1000000000, index_granularity = 8192, index_granularity_bytes = '10Mi';" run 1 $CH_CLIENT -q "drop table test;" echo "MergeTree wide" -$CH_CLIENT -q "create table test (id UInt64, v Variant(UInt64, String, Array(UInt64))) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;" +$CH_CLIENT -q "create table test (id UInt64, v Variant(UInt64, String, Array(UInt64))) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, index_granularity = 8192, index_granularity_bytes = '10Mi';" run 1 $CH_CLIENT -q "drop table test;" From 2660e69abb102b45e6d321cdd294ddd228beb39f Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Thu, 15 Feb 2024 05:12:59 +0100 Subject: [PATCH 3/3] Inhibit randomization in some tests --- .../0_stateless/02450_kill_distributed_query_deadlock.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/queries/0_stateless/02450_kill_distributed_query_deadlock.sh b/tests/queries/0_stateless/02450_kill_distributed_query_deadlock.sh index 03c43843d3a..0cd520d8d5d 100755 --- a/tests/queries/0_stateless/02450_kill_distributed_query_deadlock.sh +++ b/tests/queries/0_stateless/02450_kill_distributed_query_deadlock.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Tags: long +# Tags: long, no-random-settings, no-debug CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) # shellcheck source=../shell_config.sh