thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix perftests.

Browse Source
This commit is contained in:
Nikolai Kochetov 2019-10-12 13:06:07 +03:00
parent 8186644562
commit 25510e3d38
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbms/src/Interpreters/Join.cpp
View File

@ -466,6 +466,9 @@ bool Join::addJoinedBlock(const Block & block)
size_t rows = block.rows();
if (rows)
has_no_rows_in_maps = false;
blocks.push_back(block);
Block * stored_block = &blocks.back();

3
dbms/src/Interpreters/Join.h
View File

@ -163,7 +163,7 @@ public:
/// Sum size in bytes of all buffers, used for JOIN maps and for all memory pools.
size_t getTotalByteCount() const;
bool alwaysReturnsEmptySet() const final { return isInnerOrRight(getKind()) && getTotalRowCount() == 0; }
bool alwaysReturnsEmptySet() const final { return isInnerOrRight(getKind()) && has_no_rows_in_maps; }
ASTTableJoin::Kind getKind() const { return kind; }
ASTTableJoin::Strictness getStrictness() const { return strictness; }
@ -301,6 +301,7 @@ private:
BlockNullmapList blocks_nullmaps;
MapsVariant maps;
bool has_no_rows_in_maps = true;
/// Additional data - strings for string keys and continuation elements of single-linked lists of references to rows.
Arena pool;