thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-18 04:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #73260 from ClickHouse/Fix_test_new_settings_history

Browse Source 
Fix test `02995_new_settings_history.sh`
This commit is contained in:
Robert Schulze 2024-12-15 14:54:26 +00:00 committed by GitHub
commit a5e8ae8393
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/queries/0_stateless/02995_new_settings_history.sh
View File

@ -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 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 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)
))
)
)