fix more tests

This commit is contained in:
Anton Popov 2022-12-16 17:50:01 +00:00
parent b6f2754afb
commit 33dc0d8283
4 changed files with 13 additions and 4 deletions

View File

@ -2353,9 +2353,14 @@ void ClientBase::parseAndCheckOptions(OptionsDescription & options_description,
/// may clash. Query settings have higher priority and we just
/// skip ambiguous merge tree settings.
auto & main_options = options_description.main_description.value();
NameSet main_option_names;
for (const auto & option : main_options.options())
main_option_names.insert(option->long_name());
for (const auto & setting : cmd_merge_tree_settings.all())
{
if (main_options.find_nothrow(setting.getName(), false))
if (main_option_names.contains(setting.getName()))
continue;
if (allow_repeated_settings)

View File

@ -484,10 +484,10 @@ class MergeTreeSettingsRandomizer:
0.2, 0.5, 1, 10 * 1024 * 1024 * 1024
),
"vertical_merge_algorithm_min_rows_to_activate": threshold_generator(
0.25, 0.25, 1, 100000000
0.4, 0.4, 1, 1000000
),
"vertical_merge_algorithm_min_columns_to_activate": threshold_generator(
0.25, 0.25, 1, 1000
0.4, 0.4, 1, 100
),
"min_merge_bytes_to_use_direct_io": threshold_generator(
0.25, 0.25, 1, 10 * 1024 * 1024 * 1024

View File

@ -1,4 +1,4 @@
-- Tags: no-parallel
-- Tags: no-parallel, no-random-merge-tree-settings
SET send_logs_level = 'fatal';

View File

@ -1,3 +1,7 @@
--Tags: no-random-merge-tree-settings
-- Tag no-random-merge-tree-settings: bug in formatting of projections.
-- https://github.com/ClickHouse/ClickHouse/issues/44318
DROP TABLE IF EXISTS t;
drop table if exists tp;