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

Fix tests.

Browse Source
This commit is contained in:
Nikolai Kochetov 2020-06-15 16:56:38 +03:00
parent f9c4721ba2
commit b5ecef6adf
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,6 +305,8 @@ IMergingAlgorithm::Status AggregatingSortedAlgorithm::merge()
if (current->isLast() && skipLastRowFor(current->pos))
{
/// If we skip this row, it's not equals with any key we process.
last_key.reset();
/// Get the next block from the corresponding source, if there is one.
queue.removeTop();
return Status(current.impl->order);

11
src/Processors/Merges/Algorithms/IMergingAlgorithmWithDelayedChunk.cpp
View File

@ -33,15 +33,8 @@ void IMergingAlgorithmWithDelayedChunk::updateCursor(Input & input, size_t sourc
auto & current_input = current_inputs[source_num];
/// Extend lifetime of last chunk.
if (current_input.skip_last_row && current_input.chunk.getNumRows() <= 1)
{
/// But if chunk has only single skipped row, ignore it.
}
else
{
last_chunk.swap(current_input.chunk);
last_chunk_sort_columns = std::move(cursors[source_num].sort_columns);
}
last_chunk.swap(current_input.chunk);
last_chunk_sort_columns = std::move(cursors[source_num].sort_columns);
current_input.swap(input);
cursors[source_num].reset(current_input.chunk.getColumns(), {});

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

@ -649,6 +649,8 @@ IMergingAlgorithm::Status SummingSortedAlgorithm::merge()
if (current->isLast() && skipLastRowFor(current->pos))
{
/// If we skip this row, it's not equals with any key we process.
last_key.reset();
/// Get the next block from the corresponding source, if there is one.
queue.removeTop();
return Status(current.impl->order);