thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-11 01:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

correct row limit for many right blocks case

Browse Source
This commit is contained in:
chertus 2020-01-23 18:47:49 +03:00
parent d0b29b17fd
commit 3571cdb4b5
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dbms/src/Interpreters/MergeJoin.cpp
View File

@ -305,6 +305,7 @@ bool joinEquals(const Block & left_block, const Block & right_block, const Block
size_t range_rows = range.left_length * range.right_length; size_t range_rows = range.left_length * range.right_length;
if (range_rows > max_rows) if (range_rows > max_rows)
{ {
/// We need progress. So we join at least one right row.
range.right_length = max_rows / range.left_length; range.right_length = max_rows / range.left_length;
if (!range.right_length) if (!range.right_length)
range.right_length = 1; range.right_length = 1;
@ -738,9 +739,7 @@ bool MergeJoin::leftJoin(MergeJoinCursor & left_cursor, const Block & left_block
if constexpr (is_all) if constexpr (is_all)
{ {
size_t max_rows = maxRangeRows(left_columns.size(), max_joined_block_rows); size_t max_rows = maxRangeRows(left_columns[0]->size(), max_joined_block_rows);
if (!max_rows)
return false;
if (!joinEquals<true>(left_block, right_block, right_columns_to_add, left_columns, right_columns, range, max_rows)) if (!joinEquals<true>(left_block, right_block, right_columns_to_add, left_columns, right_columns, range, max_rows))
{ {
@ -792,9 +791,7 @@ bool MergeJoin::innerJoin(MergeJoinCursor & left_cursor, const Block & left_bloc
if constexpr (is_all) if constexpr (is_all)
{ {
size_t max_rows = maxRangeRows(left_columns.size(), max_joined_block_rows); size_t max_rows = maxRangeRows(left_columns[0]->size(), max_joined_block_rows);
if (!max_rows)
return false;
if (!joinEquals<true>(left_block, right_block, right_columns_to_add, left_columns, right_columns, range, max_rows)) if (!joinEquals<true>(left_block, right_block, right_columns_to_add, left_columns, right_columns, range, max_rows))
{ {