thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 16:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

stash 6

Browse Source
This commit is contained in:
Nikita Taranov 2024-07-30 22:16:37 +01:00
parent 2fb3ec7abe
commit 220d32039c
2 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/Interpreters/HashJoin/HashJoin.cpp
View File

@ -77,6 +77,44 @@ Int64 getCurrentQueryMemoryUsage()
return 0; return 0;
} }
Block filterColumnsPresentInSampleBlock(const Block & block, const Block & sample_block)
{
Block filtered_block;
for (const auto & sample_column : sample_block.getColumnsWithTypeAndName())
{
ColumnWithTypeAndName column = block.getByName(sample_column.name);
filtered_block.insert(std::move(column));
}
return filtered_block;
}
Block materializeColumnsFromRightBlock(Block block, const Block & sample_block, const Names & right_key_names)
{
for (const auto & sample_column : sample_block.getColumnsWithTypeAndName())
{
auto & column = block.getByName(sample_column.name);
/// There's no optimization for right side const columns. Remove constness if any.
column.column = recursiveRemoveSparse(column.column->convertToFullColumnIfConst());
if (column.column->lowCardinality() && !sample_column.column->lowCardinality())
{
column.column = column.column->convertToFullColumnIfLowCardinality();
column.type = removeLowCardinality(column.type);
}
if (sample_column.column->isNullable())
JoinCommon::convertColumnToNullable(column);
}
for (const auto & column_name : right_key_names)
{
auto & column = block.getByName(column_name).column;
column = recursiveRemoveSparse(column->convertToFullColumnIfConst())->convertToFullColumnIfLowCardinality();
}
return block;
}
} }
static void correctNullabilityInplace(ColumnWithTypeAndName & column, bool nullable) static void correctNullabilityInplace(ColumnWithTypeAndName & column, bool nullable)
@ -411,29 +449,15 @@ void HashJoin::initRightBlockStructure(Block & saved_block_sample)
} }
} }
Block HashJoin::materializeColumnsFromRightBlock(Block block) const
{
return DB::materializeColumnsFromRightBlock(std::move(block), savedBlockSample(), table_join->getAllNames(JoinTableSide::Right));
}
Block HashJoin::prepareRightBlock(const Block & block, const Block & saved_block_sample_) Block HashJoin::prepareRightBlock(const Block & block, const Block & saved_block_sample_)
{ {
Block structured_block; Block structured_block = DB::materializeColumnsFromRightBlock(block, saved_block_sample_, {});
for (const auto & sample_column : saved_block_sample_.getColumnsWithTypeAndName()) return filterColumnsPresentInSampleBlock(structured_block, saved_block_sample_);
{
ColumnWithTypeAndName column = block.getByName(sample_column.name);
/// There's no optimization for right side const columns. Remove constness if any.
column.column = recursiveRemoveSparse(column.column->convertToFullColumnIfConst());
if (column.column->lowCardinality() && !sample_column.column->lowCardinality())
{
column.column = column.column->convertToFullColumnIfLowCardinality();
column.type = removeLowCardinality(column.type);
}
if (sample_column.column->isNullable())
JoinCommon::convertColumnToNullable(column);
structured_block.insert(std::move(column));
}
return structured_block;
} }
Block HashJoin::prepareRightBlock(const Block & block) const Block HashJoin::prepareRightBlock(const Block & block) const

3
src/Interpreters/HashJoin/HashJoin.h
View File

@ -518,6 +518,8 @@ public:
void setMaxJoinedBlockRows(size_t value) { max_joined_block_rows = value; } void setMaxJoinedBlockRows(size_t value) { max_joined_block_rows = value; }
Block materializeColumnsFromRightBlock(Block block) const;
private: private:
friend class NotJoinedHash; friend class NotJoinedHash;
@ -596,5 +598,4 @@ private:
void validateAdditionalFilterExpression(std::shared_ptr<ExpressionActions> additional_filter_expression); void validateAdditionalFilterExpression(std::shared_ptr<ExpressionActions> additional_filter_expression);
bool needUsedFlagsForPerRightTableRow(std::shared_ptr<TableJoin> table_join_) const; bool needUsedFlagsForPerRightTableRow(std::shared_ptr<TableJoin> table_join_) const;
}; };
} }