thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix TableJoin::leftToRightKeyRemap

Browse Source
This commit is contained in:
vdimir 2021-08-20 17:32:17 +03:00 committed by Ilya Golshtein
parent 24e3e04203
commit a8e1de51e1
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Interpreters/TableJoin.cpp
View File

@ -582,6 +582,25 @@ void TableJoin::addJoinCondition(const ASTPtr & ast, bool is_left)
on_filter_condition_asts_right[disjunct_num].push_back(ast);
}
void TableJoin::leftToRightKeyRemap(
const Names & left_keys,
const Names & right_keys,
const NameSet & required_right_keys,
std::unordered_map<String, String> & key_map) const
{
if (hasUsing())
{
for (size_t i = 0; i < left_keys.size(); ++i)
{
const String & left_key_name = left_keys[i];
const String & right_key_name = right_keys[i];
if (!required_right_keys.contains(right_key_name))
key_map[left_key_name] = right_key_name;
}
}
}
std::unordered_map<String, String> TableJoin::leftToRightKeyRemap() const
{
std::unordered_map<String, String> left_to_right_key_remap;
@ -589,13 +608,7 @@ std::unordered_map<String, String> TableJoin::leftToRightKeyRemap() const
{
const auto & required_right_keys = requiredRightKeys();
for (size_t i = 0; i < key_names_left.size(); ++i)
{
const String & left_key_name = key_names_left[i];
const String & right_key_name = key_names_right[i];
if (!required_right_keys.contains(right_key_name))
left_to_right_key_remap[left_key_name] = right_key_name;
}
TableJoin::leftToRightKeyRemap(key_names_left[i], key_names_right[i], required_right_keys, left_to_right_key_remap);
}
return left_to_right_key_remap;
}

5
src/Interpreters/TableJoin.h
View File

@ -123,6 +123,11 @@ private:
bool inferJoinKeyCommonType(const LeftNamesAndTypes & left, const RightNamesAndTypes & right, bool allow_right);
NamesAndTypesList correctedColumnsAddedByJoin() const;
void leftToRightKeyRemap(
const Names & left_keys,
const Names & right_keys,
const NameSet & required_right_keys,
std::unordered_map<String, String> & key_map) const;
public:
TableJoin()