From cd87ad90907365145ff04ea55b9efce5679114ee Mon Sep 17 00:00:00 2001 From: Smita Kulkarni Date: Fri, 13 Dec 2024 10:22:18 +0100 Subject: [PATCH 1/2] Fix test new_settings_history --- tests/queries/0_stateless/02995_new_settings_history.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/queries/0_stateless/02995_new_settings_history.sh b/tests/queries/0_stateless/02995_new_settings_history.sh index 5f279dbd695..d83c5641527 100755 --- a/tests/queries/0_stateless/02995_new_settings_history.sh +++ b/tests/queries/0_stateless/02995_new_settings_history.sh @@ -50,7 +50,7 @@ $CLICKHOUSE_LOCAL --query " )) AND (name NOT IN ( SELECT arrayJoin(tupleElement(changes, 'name')) FROM system.settings_changes - WHERE type = 'MergeTree' AND splitByChar('.', version)[1]::UInt64 >= 24 AND splitByChar('.', version)[2]::UInt64 > 11 + WHERE type = 'MergeTree' AND splitByChar('.', version)[1]::UInt64 >= 24 OR (splitByChar('.', version)[1]::UInt64 == 24 AND splitByChar('.', version)[2]::UInt64 > 11) )) ) UNION ALL @@ -77,7 +77,7 @@ $CLICKHOUSE_LOCAL --query " WHERE (new_merge_tree_settings.default != old_merge_tree_settings.default) AND (name NOT IN ( SELECT arrayJoin(tupleElement(changes, 'name')) FROM system.settings_changes - WHERE type = 'MergeTree' AND splitByChar('.', version)[1]::UInt64 >= 24 AND splitByChar('.', version)[2]::UInt64 > 11 + WHERE type = 'MergeTree' AND splitByChar('.', version)[1]::UInt64 >= 24 OR (splitByChar('.', version)[1]::UInt64 == 24 AND splitByChar('.', version)[2]::UInt64 > 11) )) ) ) From f1e74b249b079d0f03fc7b951da7e811ed42d839 Mon Sep 17 00:00:00 2001 From: Smita Kulkarni Date: Fri, 13 Dec 2024 17:00:01 +0100 Subject: [PATCH 2/2] Updated check and added to other settings too --- tests/queries/0_stateless/02995_new_settings_history.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/queries/0_stateless/02995_new_settings_history.sh b/tests/queries/0_stateless/02995_new_settings_history.sh index d83c5641527..3534149349f 100755 --- a/tests/queries/0_stateless/02995_new_settings_history.sh +++ b/tests/queries/0_stateless/02995_new_settings_history.sh @@ -38,7 +38,7 @@ $CLICKHOUSE_LOCAL --query " )) AND (name NOT IN ( SELECT arrayJoin(tupleElement(changes, 'name')) FROM system.settings_changes - WHERE type = 'Core' AND splitByChar('.', version)[1]::UInt64 >= 24 AND splitByChar('.', version)[2]::UInt64 > 11 + WHERE type = 'Core' AND splitByChar('.', version)[1]::UInt64 >= 25 OR (splitByChar('.', version)[1]::UInt64 == 24 AND splitByChar('.', version)[2]::UInt64 > 11) )) UNION ALL ( @@ -50,7 +50,7 @@ $CLICKHOUSE_LOCAL --query " )) AND (name NOT IN ( SELECT arrayJoin(tupleElement(changes, 'name')) FROM system.settings_changes - WHERE type = 'MergeTree' AND splitByChar('.', version)[1]::UInt64 >= 24 OR (splitByChar('.', version)[1]::UInt64 == 24 AND splitByChar('.', version)[2]::UInt64 > 11) + WHERE type = 'MergeTree' AND splitByChar('.', version)[1]::UInt64 >= 25 OR (splitByChar('.', version)[1]::UInt64 == 24 AND splitByChar('.', version)[2]::UInt64 > 11) )) ) UNION ALL @@ -61,7 +61,7 @@ $CLICKHOUSE_LOCAL --query " WHERE (new_settings.default != old_settings.default) AND (name NOT IN ( SELECT arrayJoin(tupleElement(changes, 'name')) FROM system.settings_changes - WHERE type = 'Core' AND splitByChar('.', version)[1]::UInt64 >= 24 AND splitByChar('.', version)[2]::UInt64 > 11 + WHERE type = 'Core' AND splitByChar('.', version)[1]::UInt64 >= 25 OR (splitByChar('.', version)[1]::UInt64 == 24 AND splitByChar('.', version)[2]::UInt64 > 11) )) AND ( -- Different values for sanitizers ( SELECT count() FROM system.build_options WHERE name = 'CXX_FLAGS' AND position('sanitize' IN value) = 1 ) @@ -77,7 +77,7 @@ $CLICKHOUSE_LOCAL --query " WHERE (new_merge_tree_settings.default != old_merge_tree_settings.default) AND (name NOT IN ( SELECT arrayJoin(tupleElement(changes, 'name')) FROM system.settings_changes - WHERE type = 'MergeTree' AND splitByChar('.', version)[1]::UInt64 >= 24 OR (splitByChar('.', version)[1]::UInt64 == 24 AND splitByChar('.', version)[2]::UInt64 > 11) + WHERE type = 'MergeTree' AND splitByChar('.', version)[1]::UInt64 >= 25 OR (splitByChar('.', version)[1]::UInt64 == 24 AND splitByChar('.', version)[2]::UInt64 > 11) )) ) )