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

Try fix summing.

Browse Source
This commit is contained in:
Nikolai Kochetov 2020-04-03 15:15:08 +03:00
parent 704a94f022
commit 0fe5528842
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dbms/src/Processors/Merges/AggregatingSortedTransform.cpp
View File

@ -168,6 +168,8 @@ void AggregatingSortedTransform::merge()
bool has_previous_group = !last_key.empty(); bool has_previous_group = !last_key.empty();
SortCursor current = queue.current(); SortCursor current = queue.current();
{
detail::RowRef current_key; detail::RowRef current_key;
current_key.set(current); current_key.set(current);
@ -176,6 +178,10 @@ void AggregatingSortedTransform::merge()
else else
key_differs = !last_key.hasEqualSortColumnsWith(current_key); key_differs = !last_key.hasEqualSortColumnsWith(current_key);
last_key = current_key;
last_chunk_sort_columns.clear();
}
if (key_differs) if (key_differs)
{ {
/// if there are enough rows accumulated and the last one is calculated completely /// if there are enough rows accumulated and the last one is calculated completely
@ -183,7 +189,6 @@ void AggregatingSortedTransform::merge()
{ {
/// Write the simple aggregation result for the previous group. /// Write the simple aggregation result for the previous group.
insertSimpleAggregationResult(); insertSimpleAggregationResult();
last_key.reset();
return; return;
} }
@ -211,8 +216,6 @@ void AggregatingSortedTransform::merge()
if (!current->isLast()) if (!current->isLast())
{ {
last_key = current_key;
last_chunk_sort_columns.clear();
queue.next(); queue.next();
} }
else else

8
dbms/src/Processors/Merges/SummingSortedTransform.cpp
View File

@ -540,6 +540,8 @@ void SummingSortedTransform::merge()
bool has_previous_group = !last_key.empty(); bool has_previous_group = !last_key.empty();
SortCursor current = queue.current(); SortCursor current = queue.current();
{
detail::RowRef current_key; detail::RowRef current_key;
current_key.set(current); current_key.set(current);
@ -551,6 +553,10 @@ void SummingSortedTransform::merge()
else else
key_differs = !last_key.hasEqualSortColumnsWith(current_key); key_differs = !last_key.hasEqualSortColumnsWith(current_key);
last_key = current_key;
last_chunk_sort_columns.clear();
}
if (key_differs) if (key_differs)
{ {
if (has_previous_group) if (has_previous_group)
@ -599,8 +605,6 @@ void SummingSortedTransform::merge()
if (!current->isLast()) if (!current->isLast())
{ {
last_key = current_key;
last_chunk_sort_columns.clear();
queue.next(); queue.next();
} }
else else