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

dbms: fixed error when sorting result of ARRAY JOIN by empty arrays [#METR-13204].

Browse Source
This commit is contained in:
Alexey Milovidov 2014-10-14 22:39:38 +04:00
parent 5fc32bb267
commit 1c16466214
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dbms/src/DataStreams/MergeSortingBlockInputStream.cpp
View File

@ -47,16 +47,23 @@ Block MergeSortingBlockInputStream::merge(Blocks & blocks)
bool has_collation = false;
size_t i = 0;
for (Blocks::const_iterator it = blocks.begin(); it != blocks.end(); ++it, ++i)
size_t nonempty_blocks = 0;
for (Blocks::const_iterator it = blocks.begin(); it != blocks.end(); ++it)
{
if (!*it)
if (it->rowsInFirstColumn() == 0)
continue;
cursors[i] = SortCursorImpl(*it, description);
has_collation |= cursors[i].has_collation;
cursors[nonempty_blocks] = SortCursorImpl(*it, description);
has_collation |= cursors[nonempty_blocks].has_collation;
++nonempty_blocks;
}
if (nonempty_blocks == 0)
return Block();
cursors.resize(nonempty_blocks);
Block merged;
if (has_collation)

4
dbms/src/DataStreams/MergingSortedBlockInputStream.cpp
View File

@ -22,7 +22,7 @@ void MergingSortedBlockInputStream::init(Block & merged_block, ColumnPlainPtrs &
*it = children[i]->read();
if (!*it)
if (it->rowsInFirstColumn() == 0)
continue;
if (!num_columns)
@ -31,7 +31,7 @@ void MergingSortedBlockInputStream::init(Block & merged_block, ColumnPlainPtrs &
cursors[i] = SortCursorImpl(*it, description, i);
has_collation |= cursors[i].has_collation;
}
if (has_collation)
initQueue(queue_with_collation);
else

2
dbms/tests/queries/0_stateless/00073_merge_sorting_empty_array_joined.sql Executable file
View File

@ -0,0 +1,2 @@
SET max_block_size = 1;
SELECT number, arr FROM (SELECT number, arrayFilter(x -> x = 0, [1]) AS arr FROM system.numbers LIMIT 10) ARRAY JOIN arr ORDER BY number;