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

better skip lambda function

Browse Source
This commit is contained in:
zhang2014 2020-01-06 18:56:17 +08:00
parent 2179935f1e
commit 0f147e393f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbms/src/Interpreters/ExtractExpressionInfoVisitor.cpp
View File

@ -58,6 +58,9 @@ void ExpressionInfoMatcher::visit(const ASTIdentifier & identifier, const ASTPtr
bool ExpressionInfoMatcher::needChildVisit(const ASTPtr & node, const ASTPtr &)
{
if (const auto & function = node->as<ASTFunction>(); function && function->name == "lambda")
return false;
return !node->as<ASTSubquery>();
}

10
dbms/src/Interpreters/PredicateRewriteVisitor.cpp
View File

@ -68,13 +68,14 @@ void PredicateRewriteVisitorData::visitOtherInternalSelect(ASTSelectQuery & sele
static void cleanAliasAndCollectIdentifiers(ASTPtr & predicate, std::vector<ASTIdentifier *> & identifiers)
{
for (auto & children : predicate->children)
/// skip WHERE x in (SELECT ...) AND arrayMap(x -> x, [column_a])
const auto & function = predicate->as<ASTFunction>();
if (!predicate->as<ASTSubquery>() && !(function && function->name == "lambda"))
{
if (!children->as<ASTSubquery>()) /// skip where x in (SELECT ...)
for (auto & children : predicate->children)
cleanAliasAndCollectIdentifiers(children, identifiers);
}
if (const auto alias = predicate->tryGetAlias(); !alias.empty())
predicate->setAlias("");
@ -102,10 +103,7 @@ bool PredicateRewriteVisitorData::rewriteSubquery(ASTSelectQuery & subquery, con
const auto & outer_column_iterator = std::find(outer_columns.begin(), outer_columns.end(), column_name);
if (outer_column_iterator != outer_columns.end())
{
/// Some temporary identifiers may be included in the predicate, for example: WHERE arrayMap(x -> x, [column_a]) = [column_a]
identifiers[index]->setShortName(inner_columns[outer_column_iterator - outer_columns.begin()]);
}
}
/// We only need to push all the predicates to subquery having