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

Fix two more tests

Browse Source
This commit is contained in:
Ivan Lezhankin 2020-11-20 21:38:30 +03:00
parent 2b7d056002
commit 833c0842a1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Interpreters/ExpressionAnalyzer.cpp
View File

@ -331,7 +331,7 @@ void SelectQueryExpressionAnalyzer::tryMakeSetForIndexFromSubquery(const ASTPtr
SetPtr SelectQueryExpressionAnalyzer::isPlainStorageSetInSubquery(const ASTPtr & subquery_or_table_name) SetPtr SelectQueryExpressionAnalyzer::isPlainStorageSetInSubquery(const ASTPtr & subquery_or_table_name)
{ {
const auto * table = subquery_or_table_name->as<ASTIdentifier>(); const auto * table = subquery_or_table_name->as<ASTTableIdentifier>();
if (!table) if (!table)
return nullptr; return nullptr;
auto table_id = context.resolveStorageID(subquery_or_table_name); auto table_id = context.resolveStorageID(subquery_or_table_name);

6
src/Interpreters/TreeRewriter.cpp
View File

@ -739,13 +739,13 @@ void TreeRewriter::normalize(ASTPtr & query, Aliases & aliases, const Settings &
CustomizeAggregateFunctionsOrNullVisitor(data_or_null).visit(query); CustomizeAggregateFunctionsOrNullVisitor(data_or_null).visit(query);
} }
/// Creates a dictionary `aliases`: alias -> ASTPtr
QueryAliasesVisitor(aliases).visit(query);
/// Mark table ASTIdentifiers with not a column marker /// Mark table ASTIdentifiers with not a column marker
MarkTableIdentifiersVisitor::Data identifiers_data{aliases}; MarkTableIdentifiersVisitor::Data identifiers_data{aliases};
MarkTableIdentifiersVisitor(identifiers_data).visit(query); MarkTableIdentifiersVisitor(identifiers_data).visit(query);
/// Creates a dictionary `aliases`: alias -> ASTPtr
QueryAliasesVisitor(aliases).visit(query);
/// Common subexpression elimination. Rewrite rules. /// Common subexpression elimination. Rewrite rules.
QueryNormalizer::Data normalizer_data(aliases, settings); QueryNormalizer::Data normalizer_data(aliases, settings);
QueryNormalizer(normalizer_data).visit(query); QueryNormalizer(normalizer_data).visit(query);