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

Fix Bug

Browse Source
This commit is contained in:
morning-color 2024-07-04 19:58:22 +08:00
parent 355f144cda
commit 5f42e15182
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/QueryPipeline/QueryPipeline.cpp
View File

@ -276,17 +276,23 @@ static void initRowsBeforeLimit(IOutputFormat * output_format)
} }
static void initRowsBeforeAggregation(std::shared_ptr<Processors> processors, IOutputFormat * output_format) static void initRowsBeforeAggregation(std::shared_ptr<Processors> processors, IOutputFormat * output_format)
{ {
bool has_aggregation = false;
if (!processors->empty()) if (!processors->empty())
{ {
RowsBeforeAggregationCounterPtr rows_before_aggregation_at_least = std::make_shared<RowsBeforeStepCounter>(); RowsBeforeAggregationCounterPtr rows_before_aggregation_at_least = std::make_shared<RowsBeforeStepCounter>();
for (auto & processor : *processors) for (auto processor : *processors)
{ {
if (auto transform = std::dynamic_pointer_cast<AggregatingTransform>(processor)) if (auto transform = std::dynamic_pointer_cast<AggregatingTransform>(processor))
{
transform->setRowsBeforeAggregationCounter(rows_before_aggregation_at_least); transform->setRowsBeforeAggregationCounter(rows_before_aggregation_at_least);
if (auto remote = std::dynamic_pointer_cast<RemoteSource>(processor)) has_aggregation = true;
remote->setRowsBeforeAggregationCounter(rows_before_aggregation_at_least); }
if (typeid_cast<RemoteSource *>(processor.get()) || typeid_cast<DelayedSource *>(processor.get()))
processor->setRowsBeforeAggregationCounter(rows_before_aggregation_at_least);
} }
rows_before_aggregation_at_least->add(0); if (has_aggregation)
rows_before_aggregation_at_least->add(0);
output_format->setRowsBeforeAggregationCounter(rows_before_aggregation_at_least); output_format->setRowsBeforeAggregationCounter(rows_before_aggregation_at_least);
} }
} }

2
tests/queries/0_stateless/03174_exact_rows_before_aggregation.sql
View File

@ -27,4 +27,4 @@ select max(i) from cluster(test_cluster_two_shards, currentDatabase(), test) whe
select * from (select * from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 10) group by i limit 10 FORMAT JSONCompact; select * from (select * from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 10) group by i limit 10 FORMAT JSONCompact;
drop table if exists test; drop table if exists test;