thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-30 05:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests.

Browse Source
This commit is contained in:
Nikolai Kochetov 2020-06-15 20:48:04 +03:00
parent 5436ef38bf
commit b456a3cc77
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp
View File

@ -303,7 +303,7 @@ IMergingAlgorithm::Status AggregatingSortedAlgorithm::merge()
bool key_differs; bool key_differs;
SortCursor current = queue.current(); SortCursor current = queue.current();
if (current->isLast() && skipLastRowFor(current->pos)) if (current->isLast() && skipLastRowFor(current->order))
{ {
/// If we skip this row, it's not equals with any key we process. /// If we skip this row, it's not equals with any key we process.
last_key.reset(); last_key.reset();

2
src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
View File

@ -115,7 +115,7 @@ IMergingAlgorithm::Status CollapsingSortedAlgorithm::merge()
{ {
auto current = queue.current(); auto current = queue.current();
if (current->isLast() && skipLastRowFor(current->pos)) if (current->isLast() && skipLastRowFor(current->order))
{ {
/// Get the next block from the corresponding source, if there is one. /// Get the next block from the corresponding source, if there is one.
queue.removeTop(); queue.removeTop();

2
src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
View File

@ -157,7 +157,7 @@ IMergingAlgorithm::Status GraphiteRollupSortedAlgorithm::merge()
{ {
SortCursor current = queue.current(); SortCursor current = queue.current();
if (current->isLast() && skipLastRowFor(current->pos)) if (current->isLast() && skipLastRowFor(current->order))
{ {
/// Get the next block from the corresponding source, if there is one. /// Get the next block from the corresponding source, if there is one.
queue.removeTop(); queue.removeTop();

2
src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp
View File

@ -40,7 +40,7 @@ IMergingAlgorithm::Status ReplacingSortedAlgorithm::merge()
{ {
SortCursor current = queue.current(); SortCursor current = queue.current();
if (current->isLast() && skipLastRowFor(current->pos)) if (current->isLast() && skipLastRowFor(current->order))
{ {
/// Get the next block from the corresponding source, if there is one. /// Get the next block from the corresponding source, if there is one.
queue.removeTop(); queue.removeTop();

2
src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
View File

@ -647,7 +647,7 @@ IMergingAlgorithm::Status SummingSortedAlgorithm::merge()
SortCursor current = queue.current(); SortCursor current = queue.current();
if (current->isLast() && skipLastRowFor(current->pos)) if (current->isLast() && skipLastRowFor(current->order))
{ {
/// If we skip this row, it's not equals with any key we process. /// If we skip this row, it's not equals with any key we process.
last_key.reset(); last_key.reset();

2
src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.cpp
View File

@ -64,7 +64,7 @@ IMergingAlgorithm::Status VersionedCollapsingAlgorithm::merge()
{ {
SortCursor current = queue.current(); SortCursor current = queue.current();
if (current->isLast() && skipLastRowFor(current->pos)) if (current->isLast() && skipLastRowFor(current->order))
{ {
/// Get the next block from the corresponding source, if there is one. /// Get the next block from the corresponding source, if there is one.
queue.removeTop(); queue.removeTop();