From 3b8c4d2c9dd9a7184684523598d6f4f1c767a611 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Wed, 20 Aug 2014 03:12:31 +0400 Subject: [PATCH] dbms: style [#METR-12108]. --- dbms/src/Interpreters/ExpressionAnalyzer.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dbms/src/Interpreters/ExpressionAnalyzer.cpp b/dbms/src/Interpreters/ExpressionAnalyzer.cpp index 5dc2e546716..264d76c8f00 100644 --- a/dbms/src/Interpreters/ExpressionAnalyzer.cpp +++ b/dbms/src/Interpreters/ExpressionAnalyzer.cpp @@ -40,7 +40,8 @@ namespace DB /** Calls to these functions in the GROUP BY statement would be * replaced by their immediate argument. */ -const std::unordered_set injectiveFunctionNames{ +const std::unordered_set injective_function_names +{ "negate", "bitNot", "reverse", @@ -68,7 +69,7 @@ void ExpressionAnalyzer::init() /// Common subexpression elimination. Rewrite rules. normalizeTree(); - /// GROUP BY injective function elimination + /// GROUP BY injective function elimination. optimizeGroupBy(); /// array_join_alias_to_name, array_join_result_to_source. @@ -455,7 +456,8 @@ void ExpressionAnalyzer::optimizeGroupBy() auto & group_exprs = select_query->group_expression_list->children; /// removes expression at index idx by making it last one and calling .pop_back() - const auto remove_expr_at_index = [&group_exprs] (const size_t idx) { + const auto remove_expr_at_index = [&group_exprs] (const size_t idx) + { if (idx < group_exprs.size() - 1) group_exprs[idx] = std::move(group_exprs.back()); @@ -468,7 +470,7 @@ void ExpressionAnalyzer::optimizeGroupBy() if (const auto function = typeid_cast(group_exprs[i].get())) { /// assert function is injective - if (!injectiveFunctionNames.count(function->name)) + if (!injective_function_names.count(function->name)) { ++i; continue;