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

refactor MergeJoinTransform code.

Browse Source
This commit is contained in:
Alex Cheng 2023-09-25 18:04:25 +08:00
parent 118a068a4d
commit c7a88c8946
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Processors/Transforms/MergeJoinTransform.cpp
View File

@ -227,10 +227,10 @@ void inline addRange(PaddedPODArray<UInt64> & left_map, size_t start, size_t end
left_map.push_back(i);
}
void inline addMany(PaddedPODArray<UInt64> & left_map, size_t idx, size_t num)
void inline addMany(PaddedPODArray<UInt64> & left_or_right_map, size_t idx, size_t num)
{
for (size_t i = 0; i < num; ++i)
left_map.push_back(idx);
left_or_right_map.push_back(idx);
}
}
@ -291,8 +291,10 @@ MergeJoinAlgorithm::MergeJoinAlgorithm(
if (join_on.on_filter_condition_left || join_on.on_filter_condition_right)
throw Exception(ErrorCodes::NOT_IMPLEMENTED, "MergeJoinAlgorithm does not support ON filter conditions");
cursors.push_back(createCursor(input_headers[0], join_on.key_names_left));
cursors.push_back(createCursor(input_headers[1], join_on.key_names_right));
cursors = {
createCursor(input_headers[0], join_on.key_names_left),
createCursor(input_headers[1], join_on.key_names_right)
};
for (const auto & [left_key, right_key] : table_join->getTableJoin().leftToRightKeyRemap())
{
@ -454,8 +456,9 @@ std::optional<MergeJoinAlgorithm::Status> MergeJoinAlgorithm::handleAllJoinState
if (all_join_state)
{
assert(cursors.size() == 2);
/// Accumulate blocks with same key in all_join_state
for (size_t i = 0; i < cursors.size(); ++i)
for (size_t i = 0; i < 2; ++i)
{
if (cursors[i]->cursor.isValid() && all_join_state->keys[i].equals(cursors[i]->cursor))
{

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

@ -248,7 +248,7 @@ private:
/// For `USING` join key columns should have values from right side instead of defaults
std::unordered_map<size_t, size_t> left_to_right_key_remap;
std::vector<FullMergeJoinCursorPtr> cursors;
std::array<FullMergeJoinCursorPtr, 2> cursors;
/// Keep some state to make connection between data in different blocks
AnyJoinState any_join_state;