thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-13 18:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

review fixes

Browse Source
This commit is contained in:
Nikita Taranov 2023-02-01 23:01:02 +00:00
parent 8223fc6ab9
commit 4fbbca075b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Processors/QueryPlan/Optimizations/useDataParallelAggregation.cpp
View File

@ -191,7 +191,7 @@ size_t tryAggregatePartitionsIndependently(QueryPlan::Node * node, QueryPlan::No
const auto * expression_node = node->children.front();
const auto * expression_step = typeid_cast<const ExpressionStep *>(expression_node->step.get());
if (expression_node->children.size() != 1 || !expression_step)
if (!expression_step)
return 0;
auto * maybe_reading_step = expression_node->children.front()->step.get();

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

@ -49,7 +49,8 @@ template <typename Container, typename Getter>
size_t countPartitions(const Container & parts, Getter get_partition_id)
{
if (parts.empty())
return 1;
return 0;
String cur_partition_id = get_partition_id(parts[0]);
size_t unique_partitions = 1;
for (size_t i = 1; i < parts.size(); ++i)
@ -1370,7 +1371,7 @@ Pipe ReadFromMergeTree::groupStreamsByPartition(AnalysisResult & result, Actions
if (parts_with_ranges.empty())
return {};
const size_t partitions_cnt = countPartitions(parts_with_ranges);
const size_t partitions_cnt = std::max<size_t>(countPartitions(parts_with_ranges), 1);
const size_t partitions_per_stream = std::max<size_t>(1, partitions_cnt / requested_num_streams);
const size_t num_streams = std::max<size_t>(1, requested_num_streams / partitions_cnt);