Skip to content

Commit 7152388

Browse files
committed
Fix build after merge
1 parent d18f5bb commit 7152388

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

src/Storages/IStorageCluster.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,15 @@ void ReadFromCluster::applyFilters(ActionDAGNodes added_filter_nodes)
6565
if (filter_actions_dag)
6666
predicate = filter_actions_dag->getOutputs().at(0);
6767

68-
auto max_replicas_to_use = static_cast<UInt64>(cluster->getShardsInfo().size());
69-
if (context->getSettingsRef()[Setting::max_parallel_replicas] > 1)
70-
max_replicas_to_use = std::min(max_replicas_to_use, context->getSettingsRef()[Setting::max_parallel_replicas].value);
71-
72-
createExtension(predicate, max_replicas_to_use);
68+
createExtension(predicate);
7369
}
7470

75-
void ReadFromCluster::createExtension(const ActionsDAG::Node * predicate, size_t number_of_replicas)
71+
void ReadFromCluster::createExtension(const ActionsDAG::Node * predicate)
7672
{
7773
if (extension)
7874
return;
7975

80-
extension = storage->getTaskIteratorExtension(predicate, context, number_of_replicas);
76+
extension = storage->getTaskIteratorExtension(predicate, context, cluster);
8177
}
8278

8379
/// The code executes on initiator
@@ -178,7 +174,7 @@ void ReadFromCluster::initializePipeline(QueryPipelineBuilder & pipeline, const
178174
if (current_settings[Setting::max_parallel_replicas] > 1)
179175
max_replicas_to_use = std::min(max_replicas_to_use, current_settings[Setting::max_parallel_replicas].value);
180176

181-
createExtension(nullptr, max_replicas_to_use);
177+
createExtension(nullptr);
182178

183179
for (const auto & shard_info : cluster->getShardsInfo())
184180
{

src/Storages/IStorageCluster.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class ReadFromCluster : public SourceStepWithFilter
133133

134134
std::optional<RemoteQueryExecutor::Extension> extension;
135135

136-
void createExtension(const ActionsDAG::Node * predicate, size_t number_of_replicas);
136+
void createExtension(const ActionsDAG::Node * predicate);
137137
ContextPtr updateSettings(const Settings & settings);
138138
};
139139

0 commit comments

Comments
 (0)