Merge 808436a75d into 44b4bd38b9

2024-11-21 23:21:59 +00:00 · 2024-11-20 22:10:01 +00:00
2 changed files with 1 additions and 2 deletions
--- a/src/Core/SettingsChangesHistory.cpp
+++ b/src/Core/SettingsChangesHistory.cpp
@ -90,7 +90,6 @@ static std::initializer_list<std::pair<ClickHouseVersion, SettingsChangesHistory
            {"s3_skip_empty_files", false, true, "We hope it will provide better UX"},
            {"filesystem_cache_boundary_alignment", 0, 0, "New setting"},
            {"push_external_roles_in_interserver_queries", false, false, "New setting."},
-            {"parallel_replicas_skip_index_analysis_on_workers", false, true, "Skip index analysis on workers. Effective only with enabled parallel_replicas_local_plan"},
        }
    },
    {"24.10",
--- a/tests/integration/test_parallel_replicas_all_marks_read/test.py
+++ b/tests/integration/test_parallel_replicas_all_marks_read/test.py
@ -71,7 +71,7 @@ def _get_result_with_parallel_replicas(
            "cluster_for_parallel_replicas": f"{cluster_name}",
            "parallel_replicas_mark_segment_size": parallel_replicas_mark_segment_size,
            "query_id": query_id,
-            "parallel_replicas_skip_index_analysis_on_workers": False,
+            "parallel_replicas_skip_index_analysis_on_workers": True,
        },
    )