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

Merge pull request #20246 from ucasFL/avg-optimize

Browse Source 
fix a problem in ArithmeticOperationsInAgrFuncOptimize
This commit is contained in:
alexey-milovidov 2021-02-10 02:10:15 +03:00 committed by GitHub
commit 21b1a3fc6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Interpreters/ArithmeticOperationsInAgrFuncOptimize.cpp
View File

@ -7,6 +7,8 @@
#include <Parsers/ASTTablesInSelectQuery.h>
#include <Interpreters/ArithmeticOperationsInAgrFuncOptimize.h>
#include <Poco/String.h>
namespace DB
{
@ -95,9 +97,12 @@ ASTPtr tryExchangeFunctions(const ASTFunction & func)
{"max", {"multiply", "divide", "plus", "minus"}},
{"avg", {"multiply", "divide", "plus", "minus"}}};
/// Aggregate functions[sum|min|max|avg] is case-insensitive, so we use lower cases name
auto lower_name = Poco::toLower(func.name);
const ASTFunction * child_func = getInternalFunction(func);
if (!child_func || !child_func->arguments || child_func->arguments->children.size() != 2 ||
!supported.count(func.name) || !supported.find(func.name)->second.count(child_func->name))
if (!child_func || !child_func->arguments || child_func->arguments->children.size() != 2 || !supported.count(lower_name)
|| !supported.find(lower_name)->second.count(child_func->name))
return {};
/// Cannot rewrite function with alias cause alias could become undefined
@ -116,12 +121,12 @@ ASTPtr tryExchangeFunctions(const ASTFunction & func)
if (child_func->name == "divide")
return {};
const String & new_name = changeNameIfNeeded(func.name, child_func->name, *first_literal);
const String & new_name = changeNameIfNeeded(lower_name, child_func->name, *first_literal);
optimized_ast = exchangeExtractFirstArgument(new_name, *child_func);
}
else if (second_literal) /// second or both are consts
{
const String & new_name = changeNameIfNeeded(func.name, child_func->name, *second_literal);
const String & new_name = changeNameIfNeeded(lower_name, child_func->name, *second_literal);
optimized_ast = exchangeExtractSecondArgument(new_name, *child_func);
}

6
tests/queries/0_stateless/01703_rewrite_aggregate_function_case_insensitive.reference Normal file
View File

@ -0,0 +1,6 @@
22.5
SELECT sum(number) / 2
FROM numbers(10)
22.5
SELECT sum(number) / 2
FROM numbers(10)

6
tests/queries/0_stateless/01703_rewrite_aggregate_function_case_insensitive.sql Normal file
View File

@ -0,0 +1,6 @@
SELECT sum(number / 2) FROM numbers(10);
EXPLAIN SYNTAX SELECT sum(number / 2) FROM numbers(10);
SELECT Sum(number / 2) FROM numbers(10);
EXPLAIN SYNTAX SELECT Sum(number / 2) FROM numbers(10);