thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 17:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tests

Browse Source
This commit is contained in:
Maksim Kita 2022-06-13 16:43:11 +02:00
parent 411e1ad227
commit eb861499c7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Processors/Transforms/PartialSortingTransform.cpp
View File

@ -112,6 +112,7 @@ void PartialSortingTransform::transform(Chunk & chunk)
read_rows->add(chunk.getNumRows());
auto block = getInputPort().getHeader().cloneWithColumns(chunk.detachColumns());
size_t block_rows_before_filter = block.rows();
/** If we've saved columns from previously blocks we could filter all rows from current block
* which are unnecessary for sortBlock(...) because they obviously won't be in the top LIMIT rows.
@ -125,6 +126,8 @@ void PartialSortingTransform::transform(Chunk & chunk)
block_columns, sort_description_threshold_columns,
description, rows_num, filter, rows_to_compare, compare_results);
std::cout << "Filter result size " << result_size_hint << std::endl;
/// Everything was filtered. Skip whole chunk.
if (result_size_hint == 0)
return;
@ -138,10 +141,10 @@ void PartialSortingTransform::transform(Chunk & chunk)
sortBlock(block, description, limit);
size_t block_rows = block.rows();
size_t block_rows_after_filter = block.rows();
/// Check if we can use this block for optimization.
if (min_limit_for_partial_sort_optimization <= limit && block_rows > 0)
if (min_limit_for_partial_sort_optimization <= limit && block_rows_after_filter > 0 && limit <= block_rows_before_filter)
{
/** If we filtered more than limit rows from block take block last row.
* Otherwise take last limit row.
@ -149,7 +152,7 @@ void PartialSortingTransform::transform(Chunk & chunk)
* If current threshold value is empty, update current threshold value.
* If min block value is less than current threshold value, update current threshold value.
*/
size_t min_row_to_compare = limit <= block_rows ? (limit - 1) : (block_rows - 1);
size_t min_row_to_compare = limit <= block_rows_after_filter ? (limit - 1) : (block_rows_after_filter - 1);
auto raw_block_columns = extractRawColumns(block, description_with_positions);
if (sort_description_threshold_columns.empty() ||