mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 00:30:49 +00:00
Avoid getting callbacks from context for local plan
This commit is contained in:
parent
daabf2275e
commit
4e69cd0d52
@ -85,7 +85,7 @@ std::pair<std::unique_ptr<QueryPlan>, bool> createLocalPlanForParallelReplicas(
|
|||||||
{ return coordinator->handleRequest(std::move(req)); };
|
{ return coordinator->handleRequest(std::move(req)); };
|
||||||
|
|
||||||
auto read_from_merge_tree_parallel_replicas
|
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);
|
node->step = std::move(read_from_merge_tree_parallel_replicas);
|
||||||
|
|
||||||
addConvertingActions(*query_plan, header, /*has_missing_objects=*/false);
|
addConvertingActions(*query_plan, header, /*has_missing_objects=*/false);
|
||||||
|
@ -303,8 +303,15 @@ ReadFromMergeTree::ReadFromMergeTree(
|
|||||||
{
|
{
|
||||||
if (is_parallel_reading_from_replicas)
|
if (is_parallel_reading_from_replicas)
|
||||||
{
|
{
|
||||||
all_ranges_callback = all_ranges_callback_.value_or(context->getMergeTreeAllRangesCallback());
|
if (all_ranges_callback_.has_value())
|
||||||
read_task_callback = read_task_callback_.value_or(context->getMergeTreeReadTaskCallback());
|
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();
|
const auto & settings = context->getSettingsRef();
|
||||||
@ -340,8 +347,8 @@ ReadFromMergeTree::ReadFromMergeTree(
|
|||||||
|
|
||||||
std::unique_ptr<ReadFromMergeTree> ReadFromMergeTree::createLocalParallelReplicasReadingStep(
|
std::unique_ptr<ReadFromMergeTree> ReadFromMergeTree::createLocalParallelReplicasReadingStep(
|
||||||
AnalysisResultPtr analyzed_result_ptr_,
|
AnalysisResultPtr analyzed_result_ptr_,
|
||||||
std::optional<MergeTreeAllRangesCallback> all_ranges_callback_,
|
MergeTreeAllRangesCallback all_ranges_callback_,
|
||||||
std::optional<MergeTreeReadTaskCallback> read_task_callback_)
|
MergeTreeReadTaskCallback read_task_callback_)
|
||||||
{
|
{
|
||||||
const auto number_of_local_replica = 0;
|
const auto number_of_local_replica = 0;
|
||||||
const bool enable_parallel_reading = true;
|
const bool enable_parallel_reading = true;
|
||||||
|
@ -128,8 +128,8 @@ public:
|
|||||||
|
|
||||||
std::unique_ptr<ReadFromMergeTree> createLocalParallelReplicasReadingStep(
|
std::unique_ptr<ReadFromMergeTree> createLocalParallelReplicasReadingStep(
|
||||||
AnalysisResultPtr analyzed_result_ptr_,
|
AnalysisResultPtr analyzed_result_ptr_,
|
||||||
std::optional<MergeTreeAllRangesCallback> all_ranges_callback_,
|
MergeTreeAllRangesCallback all_ranges_callback_,
|
||||||
std::optional<MergeTreeReadTaskCallback> read_task_callback_);
|
MergeTreeReadTaskCallback read_task_callback_);
|
||||||
|
|
||||||
static constexpr auto name = "ReadFromMergeTree";
|
static constexpr auto name = "ReadFromMergeTree";
|
||||||
String getName() const override { return name; }
|
String getName() const override { return name; }
|
||||||
|
Loading…
Reference in New Issue
Block a user