Merge pull request #19094 from ClickHouse/backport/20.12/18981

Backport #18981 to 20.12: Disable optimize out of any

src/Core/Settings.h

@@ -365,7 +365,7 @@ class IColumn;
     M(Bool, enable_scalar_subquery_optimization, true, "If it is set to true, prevent scalar subqueries from (de)serializing large scalar values and possibly avoid running the same subquery more than once.", 0) \
     M(Bool, optimize_trivial_count_query, true, "Process trivial 'SELECT count() FROM table' query from metadata.", 0) \
     M(UInt64, mutations_sync, 0, "Wait for synchronous execution of ALTER TABLE UPDATE/DELETE queries (mutations). 0 - execute asynchronously. 1 - wait current server. 2 - wait all replicas if they exist.", 0) \
-    M(Bool, optimize_move_functions_out_of_any, true, "Move functions out of aggregate functions 'any', 'anyLast'.", 0) \
+    M(Bool, optimize_move_functions_out_of_any, false, "Move functions out of aggregate functions 'any', 'anyLast'.", 0) \
     M(Bool, optimize_injective_functions_inside_uniq, true, "Delete injective functions of one argument inside uniq*() functions.", 0) \
     M(Bool, optimize_arithmetic_operations_in_aggregate_functions, true, "Move arithmetic operations out of aggregation functions", 0) \
     M(Bool, optimize_duplicate_order_by_and_distinct, true, "Remove duplicate ORDER BY and DISTINCT if it's possible", 0) \

src/Interpreters/RewriteAnyFunctionVisitor.cpp

@@ -70,6 +70,9 @@ void RewriteAnyFunctionMatcher::visit(const ASTFunction & func, ASTPtr & ast, Da
 
     auto & func_arguments = func.arguments->children;
 
+    if (func_arguments.size() != 1)
+        return;
+
     const auto * first_arg_func = func_arguments[0]->as<ASTFunction>();
     if (!first_arg_func || first_arg_func->arguments->children.empty())
         return;

tests/queries/0_stateless/01398_any_with_alias.sql

+SET optimize_move_functions_out_of_any = 1;
+
 SELECT any(number * number) AS n FROM numbers(100) FORMAT CSVWithNames;
 EXPLAIN SYNTAX SELECT any(number * number) AS n FROM numbers(100);
 

tests/queries/0_stateless/01470_columns_transformers.reference

@@ -27,9 +27,9 @@ SELECT
     avg(k)
 FROM columns_transformers
 SELECT
-    toDate(any(i)),
-    toDate(any(j)),
-    toDate(any(k))
+    any(toDate(i)),
+    any(toDate(j)),
+    any(toDate(k))
 FROM columns_transformers AS a
 SELECT
     length(toString(j)),
@@ -44,9 +44,9 @@ SELECT
     avg(k)
 FROM columns_transformers
 SELECT
-    toDate(any(i)),
-    toDate(any(j)),
-    toDate(any(k))
+    any(toDate(i)),
+    any(toDate(j)),
+    any(toDate(k))
 FROM columns_transformers AS a
 SELECT
     sum(i + 1 AS i),
@@ -59,9 +59,9 @@ SELECT
     avg(k)
 FROM columns_transformers
 SELECT
-    toDate(any(i)),
-    toDate(any(j)),
-    toDate(any(k))
+    any(toDate(i)),
+    any(toDate(j)),
+    any(toDate(k))
 FROM columns_transformers AS a
 SELECT
     (i + 1) + 1 AS i,

tests/queries/0_stateless/01650_any_null_if.reference

+Hello

tests/queries/0_stateless/01650_any_null_if.sql

+SELECT any(nullIf(s, '')) FROM (SELECT arrayJoin(['', 'Hello']) AS s);
+
+SET optimize_move_functions_out_of_any = 0;
+EXPLAIN SYNTAX select any(nullIf('', ''), 'some text'); -- { serverError 42 }
+SET optimize_move_functions_out_of_any = 1;
+EXPLAIN SYNTAX select any(nullIf('', ''), 'some text'); -- { serverError 42 }