mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 00:30:49 +00:00
fix more tests
This commit is contained in:
parent
b6f2754afb
commit
33dc0d8283
@ -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)
|
||||
|
@ -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
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Tags: no-parallel
|
||||
-- Tags: no-parallel, no-random-merge-tree-settings
|
||||
|
||||
SET send_logs_level = 'fatal';
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user