From 4e69cd0d5262fed5bbebaf30fd2f34d6cb2ad830 Mon Sep 17 00:00:00 2001 From: Igor Nikonov Date: Sat, 20 Jul 2024 20:53:18 +0000 Subject: [PATCH] Avoid getting callbacks from context for local plan --- .../QueryPlan/ParallelReplicasLocalPlan.cpp | 2 +- src/Processors/QueryPlan/ReadFromMergeTree.cpp | 15 +++++++++++---- src/Processors/QueryPlan/ReadFromMergeTree.h | 4 ++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/Processors/QueryPlan/ParallelReplicasLocalPlan.cpp b/src/Processors/QueryPlan/ParallelReplicasLocalPlan.cpp index e9d5ef90e30..e8ff0f417dc 100644 --- a/src/Processors/QueryPlan/ParallelReplicasLocalPlan.cpp +++ b/src/Processors/QueryPlan/ParallelReplicasLocalPlan.cpp @@ -85,7 +85,7 @@ std::pair, bool> createLocalPlanForParallelReplicas( { return coordinator->handleRequest(std::move(req)); }; auto read_from_merge_tree_parallel_replicas - = reading->createLocalParallelReplicasReadingStep(analyzed_result_ptr, all_ranges_cb, read_task_cb); + = reading->createLocalParallelReplicasReadingStep(analyzed_result_ptr, std::move(all_ranges_cb), std::move(read_task_cb)); node->step = std::move(read_from_merge_tree_parallel_replicas); addConvertingActions(*query_plan, header, /*has_missing_objects=*/false); diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp index e967b575acb..6f0037684e9 100644 --- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp +++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp @@ -303,8 +303,15 @@ ReadFromMergeTree::ReadFromMergeTree( { if (is_parallel_reading_from_replicas) { - all_ranges_callback = all_ranges_callback_.value_or(context->getMergeTreeAllRangesCallback()); - read_task_callback = read_task_callback_.value_or(context->getMergeTreeReadTaskCallback()); + if (all_ranges_callback_.has_value()) + all_ranges_callback = all_ranges_callback_.value(); + else + all_ranges_callback = context->getMergeTreeAllRangesCallback(); + + if (read_task_callback_.has_value()) + read_task_callback = read_task_callback_.value(); + else + read_task_callback = context->getMergeTreeReadTaskCallback(); } const auto & settings = context->getSettingsRef(); @@ -340,8 +347,8 @@ ReadFromMergeTree::ReadFromMergeTree( std::unique_ptr ReadFromMergeTree::createLocalParallelReplicasReadingStep( AnalysisResultPtr analyzed_result_ptr_, - std::optional all_ranges_callback_, - std::optional read_task_callback_) + MergeTreeAllRangesCallback all_ranges_callback_, + MergeTreeReadTaskCallback read_task_callback_) { const auto number_of_local_replica = 0; const bool enable_parallel_reading = true; diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.h b/src/Processors/QueryPlan/ReadFromMergeTree.h index c9c6030d207..307b605c01c 100644 --- a/src/Processors/QueryPlan/ReadFromMergeTree.h +++ b/src/Processors/QueryPlan/ReadFromMergeTree.h @@ -128,8 +128,8 @@ public: std::unique_ptr createLocalParallelReplicasReadingStep( AnalysisResultPtr analyzed_result_ptr_, - std::optional all_ranges_callback_, - std::optional read_task_callback_); + MergeTreeAllRangesCallback all_ranges_callback_, + MergeTreeReadTaskCallback read_task_callback_); static constexpr auto name = "ReadFromMergeTree"; String getName() const override { return name; }