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

Small fixes

Browse Source
This commit is contained in:
Igor Nikonov 2022-11-25 12:04:12 +00:00
parent 20e67b7140
commit 236e7e3989
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Interpreters/GraceHashJoin.h
View File

@ -33,8 +33,8 @@ class HashJoin;
* The first bucket is joined in-memory via HashJoin::joinBlock, and the remaining buckets are written to the disk.
*
* 3) When the last thread reading left table block finishes, the last stage begins.
* Each @DelayedJoiningBlocksProcessor calls repeatedly @getDelayedBlocks until there are no more unfinished buckets left.
* Inside @getDelayedBlocks we select the next not processed bucket, load right table blocks from disk into in-memory HashJoin,
* Each @DelayedJoinedBlocksTransform calls repeatedly @getDelayedBlocks until there are no more unfinished buckets left.
* Inside @getDelayedBlocks we select the next unprocessed bucket, load right table blocks from disk into in-memory HashJoin,
* And then join them with left table blocks.
*
* After joining the left table blocks, we can load non-joined rows from the right table for RIGHT/FULL JOINs.

4
src/Processors/Transforms/JoiningTransform.cpp
View File

@ -415,7 +415,7 @@ IProcessor::Status DelayedJoinedBlocksTransform::prepare()
{
Chunk chunk;
chunk.setChunkInfo(std::make_shared<DelayedBlocksTask>());
output.pushData({.chunk = std::move(chunk), .exception = {}});
output.push(std::move(chunk));
output.finish();
}
@ -428,7 +428,7 @@ IProcessor::Status DelayedJoinedBlocksTransform::prepare()
{
Chunk chunk;
chunk.setChunkInfo(std::make_shared<DelayedBlocksTask>(delayed_blocks));
output.pushData({.chunk = std::move(chunk), .exception = {}});
output.push(std::move(chunk));
}
delayed_blocks = nullptr;
return Status::PortFull;

2
src/Processors/Transforms/JoiningTransform.h
View File

@ -147,7 +147,7 @@ private:
class DelayedJoinedBlocksWorkerTransform : public IProcessor
{
public:
DelayedJoinedBlocksWorkerTransform(Block output_header);
explicit DelayedJoinedBlocksWorkerTransform(Block output_header);
String getName() const override { return "DelayedJoinedBlocksWorkerTransform"; }

4
tests/performance/grace_hash_join.xml
View File

@ -16,6 +16,6 @@
</substitution>
</substitutions>
<query short='numbers'>SELECT sum(n) FROM (SELECT number * 2 AS n FROM numbers_mt(10000000)) AS lhs JOIN (SELECT number * 3 AS n FROM numbers_mt(10000000)) AS rhs USING (n) SETTINGS {settings}</query>
<query short='numbers_hashed'>SELECT sum(n) FROM (SELECT intHash64(number * 2) AS n FROM numbers_mt(10000000)) AS lhs JOIN (SELECT intHash64(number * 3) AS n FROM numbers_mt(10000000)) AS rhs USING (n) SETTINGS {settings}</query>
<query short='numbers'>SELECT sum(n) FROM (SELECT number * 2 AS n FROM numbers_mt(10000000)) AS lhs JOIN (SELECT number * 3 AS n FROM numbers_mt(10000000)) AS rhs USING (n) SETTINGS {settings} FORMAT Null</query>
<query short='numbers_hashed'>SELECT sum(n) FROM (SELECT intHash64(number * 2) AS n FROM numbers_mt(10000000)) AS lhs JOIN (SELECT intHash64(number * 3) AS n FROM numbers_mt(10000000)) AS rhs USING (n) SETTINGS {settings} FORMAT Null</query>
</test>