thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Igor Nikonov 2024-06-01 20:53:33 +00:00
parent 2bc236f635
commit eece76bc41
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Processors/QueryPlan/ReadFromMergeTree.cpp
View File

@ -540,11 +540,7 @@ Pipe ReadFromMergeTree::readInOrder(
{
.all_callback = all_ranges_callback.value(),
.callback = read_task_callback.value(),
<<<<<<< HEAD
.number_of_current_replica = number_of_current_replica.value_or(client_info.number_of_current_replica),
=======
.number_of_current_replica = client_info.number_of_current_replica,
>>>>>>> origin/pr-plan-rewrite
};
const auto multiplier = context->getSettingsRef().parallel_replicas_single_task_marks_count_multiplier;