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

Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2]

Browse Source
This commit is contained in:
Alexey Milovidov 2018-02-20 00:01:46 +03:00
parent 582798b77f
commit bb05235608
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,8 @@
#include <Interpreters/NullableUtils.h> #include <Interpreters/NullableUtils.h>
#include <DataStreams/IProfilingBlockInputStream.h> #include <DataStreams/IProfilingBlockInputStream.h>
#include <DataStreams/materializeBlock.h>
#include <Core/ColumnNumbers.h> #include <Core/ColumnNumbers.h>
#include <Common/typeid_cast.h> #include <Common/typeid_cast.h>
@ -281,7 +283,7 @@ void Join::setSampleBlock(const Block & block)
/// Choose data structure to use for JOIN. /// Choose data structure to use for JOIN.
init(chooseMethod(key_columns, key_sizes)); init(chooseMethod(key_columns, key_sizes));
sample_block_with_columns_to_add = block; sample_block_with_columns_to_add = materializeBlock(block);
/// Move from `sample_block_with_columns_to_add` key columns to `sample_block_with_keys`, keeping the order. /// Move from `sample_block_with_columns_to_add` key columns to `sample_block_with_keys`, keeping the order.
size_t pos = 0; size_t pos = 0;
@ -462,8 +464,8 @@ bool Join::insertFromBlock(const Block & block)
if (getFullness(kind)) if (getFullness(kind))
{ {
/** Transfer the key columns to the beginning of the block. /** Move the key columns to the beginning of the block.
* This is where NonJoinedBlockInputStream will wait for them. * This is where NonJoinedBlockInputStream will expect.
*/ */
size_t key_num = 0; size_t key_num = 0;
for (const auto & name : key_names_right) for (const auto & name : key_names_right)