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

Minor changes move ON to WHERE for INNER JOIN

Browse Source
This commit is contained in:
vdimir 2021-02-15 23:26:29 +03:00
parent 28b981a76b
commit 5273242f86
No known key found for this signature in database
GPG Key ID: F57B3E10A21DBB31
3 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/Interpreters/CollectJoinOnKeysVisitor.cpp
View File

@ -16,6 +16,26 @@ namespace ErrorCodes
extern const int LOGICAL_ERROR;
}
namespace
{
void addAndTerm(ASTPtr & ast, const ASTPtr & term)
{
if (!ast)
ast = term;
else
ast = makeASTFunction("and", ast, term);
}
/// If this is an inner join and the expression related to less than 2 tables, then move it to WHERE
bool canMoveToWhere(std::pair<size_t, size_t> table_numbers, ASTTableJoin::Kind kind)
{
return kind == ASTTableJoin::Kind::Inner &&
(table_numbers.first == table_numbers.second || table_numbers.first == 0 || table_numbers.second == 0);
}
}
void CollectJoinOnKeysMatcher::Data::addJoinKeys(const ASTPtr & left_ast, const ASTPtr & right_ast,
const std::pair<size_t, size_t> & table_no)
{
@ -80,57 +100,36 @@ void CollectJoinOnKeysMatcher::visit(const ASTFunction & func, const ASTPtr & as
ASTPtr right = func.arguments->children.at(1);
auto table_numbers = getTableNumbers(left, right, data);
if (table_numbers.first != table_numbers.second && table_numbers.first > 0 && table_numbers.second > 0)
data.new_on_expression_valid = true;
/**
* if this is an inner join and the expression related to less than 2 tables, then move it to WHERE
*/
if (data.kind == ASTTableJoin::Kind::Inner
&& (table_numbers.first == table_numbers.second || table_numbers.first == 0 || table_numbers.second == 0))
if (canMoveToWhere(table_numbers, data.kind))
{
if (!data.new_where_conditions)
data.new_where_conditions = ast->clone();
else
data.new_where_conditions = makeASTFunction("and", data.new_where_conditions, ast->clone());
addAndTerm(data.new_where_conditions, ast);
}
else
{
if (data.kind == ASTTableJoin::Kind::Inner)
{
addAndTerm(data.new_on_expression, ast);
}
data.addJoinKeys(left, right, table_numbers);
if (!data.new_on_expression)
data.new_on_expression = ast->clone();
else
data.new_on_expression = makeASTFunction("and", data.new_on_expression, ast->clone());
}
}
else if (inequality != ASOF::Inequality::None)
else if (inequality != ASOF::Inequality::None && !data.is_asof)
{
if (!data.is_asof)
ASTPtr left = func.arguments->children.at(0);
ASTPtr right = func.arguments->children.at(1);
auto table_numbers = getTableNumbers(left, right, data);
if (canMoveToWhere(table_numbers, data.kind))
{
ASTPtr left = func.arguments->children.at(0);
ASTPtr right = func.arguments->children.at(1);
auto table_numbers = getTableNumbers(left, right, data);
if (table_numbers.first != table_numbers.second && table_numbers.first > 0 && table_numbers.second > 0)
data.new_on_expression_valid = true;
if (data.kind == ASTTableJoin::Kind::Inner
&& (table_numbers.first == table_numbers.second || table_numbers.first == 0 || table_numbers.second == 0))
{
if (!data.new_where_conditions)
data.new_where_conditions = ast->clone();
else
data.new_where_conditions = makeASTFunction("and", data.new_where_conditions, ast->clone());
return;
}
else
{
throw Exception("JOIN ON inequalities are not supported. Unexpected '" + queryToString(ast) + "'",
ErrorCodes::NOT_IMPLEMENTED);
}
addAndTerm(data.new_where_conditions, ast);
}
else
{
throw Exception("JOIN ON inequalities are not supported. Unexpected '" + queryToString(ast) + "'",
ErrorCodes::NOT_IMPLEMENTED);
}
}
else if (inequality != ASOF::Inequality::None && data.is_asof)
{
if (data.asof_left_key || data.asof_right_key)
throw Exception("ASOF JOIN expects exactly one inequality in ON section. Unexpected '" + queryToString(ast) + "'",
ErrorCodes::INVALID_JOIN_ON_EXPRESSION);

1
src/Interpreters/CollectJoinOnKeysVisitor.h
View File

@ -37,7 +37,6 @@ public:
ASTPtr new_on_expression{};
ASTPtr new_where_conditions{};
bool has_some{false};
bool new_on_expression_valid{false};
void addJoinKeys(const ASTPtr & left_ast, const ASTPtr & right_ast, const std::pair<size_t, size_t> & table_no);
void addAsofJoinKeys(const ASTPtr & left_ast, const ASTPtr & right_ast, const std::pair<size_t, size_t> & table_no,

9
src/Interpreters/TreeRewriter.cpp
View File

@ -424,11 +424,10 @@ void collectJoinedColumns(TableJoin & analyzed_join, const ASTSelectQuery & sele
throw Exception("Cannot get JOIN keys from JOIN ON section: " + queryToString(table_join.on_expression),
ErrorCodes::INVALID_JOIN_ON_EXPRESSION);
if (is_asof)
{
data.asofToJoinKeys();
else if (!data.new_on_expression_valid)
throw Exception("JOIN expects left and right joined keys from two joined table in ON section. Unexpected '" + queryToString(data.new_on_expression) + "'",
ErrorCodes::INVALID_JOIN_ON_EXPRESSION);
else if (data.new_where_conditions != nullptr)
}
else if (data.new_where_conditions && data.new_on_expression)
{
table_join.on_expression = data.new_on_expression;
new_where_conditions = data.new_where_conditions;
@ -823,7 +822,7 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
setJoinStrictness(*select_query, settings.join_default_strictness, settings.any_join_distinct_right_table_keys,
result.analyzed_join->table_join);
ASTPtr new_where_condition;
ASTPtr new_where_condition = nullptr;
collectJoinedColumns(*result.analyzed_join, *select_query, tables_with_columns, result.aliases, new_where_condition);
if (new_where_condition)
moveJoinedKeyToWhere(select_query, new_where_condition);