From b456a3cc77c639692d545de1c83f45ba18f5b918 Mon Sep 17 00:00:00 2001 From: Nikolai Kochetov Date: Mon, 15 Jun 2020 20:48:04 +0300 Subject: [PATCH] Fix tests. --- src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp | 2 +- src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp | 2 +- .../Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp | 2 +- src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp | 2 +- src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp | 2 +- .../Merges/Algorithms/VersionedCollapsingAlgorithm.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp index 6a7cca3b87a..34e32cdfe3a 100644 --- a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp +++ b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp @@ -303,7 +303,7 @@ IMergingAlgorithm::Status AggregatingSortedAlgorithm::merge() bool key_differs; 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. last_key.reset(); diff --git a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp index a1fe2de61f2..697ac9496b5 100644 --- a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp +++ b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp @@ -115,7 +115,7 @@ IMergingAlgorithm::Status CollapsingSortedAlgorithm::merge() { 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. queue.removeTop(); diff --git a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp index b4136adbf2d..e364a452797 100644 --- a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp +++ b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp @@ -157,7 +157,7 @@ IMergingAlgorithm::Status GraphiteRollupSortedAlgorithm::merge() { 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. queue.removeTop(); diff --git a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp index ada779ea29b..3ee0df0efd8 100644 --- a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp +++ b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp @@ -40,7 +40,7 @@ IMergingAlgorithm::Status ReplacingSortedAlgorithm::merge() { 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. queue.removeTop(); diff --git a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp index 2a7514f855c..f09a236c33a 100644 --- a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp +++ b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp @@ -647,7 +647,7 @@ IMergingAlgorithm::Status SummingSortedAlgorithm::merge() 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. last_key.reset(); diff --git a/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.cpp b/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.cpp index 66f9865c483..5e94415fae9 100644 --- a/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.cpp +++ b/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.cpp @@ -64,7 +64,7 @@ IMergingAlgorithm::Status VersionedCollapsingAlgorithm::merge() { 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. queue.removeTop();