thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 23:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge error fixed

Browse Source
This commit is contained in:
Ilya Golshtein 2021-08-02 03:18:44 +03:00
parent 634eb2a0a7
commit a18c6f7f8e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Interpreters/HashJoin.cpp
View File

@ -205,6 +205,7 @@ HashJoin::HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_s
, right_sample_block(right_sample_block_)
, log(&Poco::Logger::get("HashJoin"))
{
LOG_DEBUG(log, "Right sample block: {}", right_sample_block.dumpStructure());
bool multiple_disjuncts = key_names_right.size() > 1;
if (multiple_disjuncts)
@ -742,10 +743,10 @@ bool HashJoin::addJoinedBlock(const Block & source_block, bool check_limits)
BlockWithFlags structured_block = structureRightBlock(block);
bool multiple_disjuncts = disjuncts_num > 1;
// if (nullable_right_side && multiple_disjuncts)
// {
// JoinCommon::convertColumnsToNullable(structured_block.block);
// }
if (nullable_right_side && multiple_disjuncts)
{
JoinCommon::convertColumnsToNullable(structured_block.block);
}
std::vector<ColumnPtr> join_mask_col_vector(disjuncts_num);
// std::vector<const ColumnUInt8 &> join_mask_vector(disjuncts_num);
bool use_join_mask_col = false;