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

Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910

Browse Source
This commit is contained in:
Alexey Milovidov 2018-08-15 00:50:00 +03:00
commit dfd9be86d8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Interpreters/ExpressionAnalyzer.cpp
View File

@ -274,7 +274,7 @@ ExpressionAnalyzer::ExpressionAnalyzer(
getArrayJoinedColumns(); getArrayJoinedColumns();
/// Push the predicate expression down to the sub-queries. /// Push the predicate expression down to the sub-queries.
rewrite_sub_queries = PredicateExpressionsOptimizer(select_query, settings, context).optimize(); rewrite_sub_queries = PredicateExpressionsOptimizer(select_query, settings).optimize();
/// Delete the unnecessary from `source_columns` list. Create `unknown_required_source_columns`. Form `columns_added_by_join`. /// Delete the unnecessary from `source_columns` list. Create `unknown_required_source_columns`. Form `columns_added_by_join`.
collectUsedColumns(); collectUsedColumns();

4
dbms/src/Interpreters/PredicateExpressionsOptimizer.cpp
View File

@ -14,8 +14,8 @@ namespace DB
static constexpr auto and_function_name = "and"; static constexpr auto and_function_name = "and";
PredicateExpressionsOptimizer::PredicateExpressionsOptimizer( PredicateExpressionsOptimizer::PredicateExpressionsOptimizer(
ASTSelectQuery * ast_select_, const Settings & settings_, const Context & context_) ASTSelectQuery * ast_select_, const Settings & settings_)
: ast_select(ast_select_), settings(settings_), context(context_) : ast_select(ast_select_), settings(settings_)
{ {
} }

2
dbms/src/Interpreters/PredicateExpressionsOptimizer.h
View File

@ -37,7 +37,7 @@ using SubQueriesProjectionColumns = std::map<IAST *, ProjectionsWithAliases>;
class PredicateExpressionsOptimizer class PredicateExpressionsOptimizer
{ {
public: public:
PredicateExpressionsOptimizer(ASTSelectQuery * ast_select_, const Settings & settings_, const Context & context_); PredicateExpressionsOptimizer(ASTSelectQuery * ast_select_, const Settings & settings_);
bool optimize(); bool optimize();