Merge pull request ClickHouse#89890 from ClickHouse/backport/25.8/89870

Backport ClickHouse#89870 to 25.8: Remove injective functions from `GROUP BY` regardless `optimize_injective_functions_in_group_by` in old analyzer for compatibility

Author: rienath

src/Interpreters/TreeOptimizer.cpp

@@ -60,7 +60,6 @@ namespace Setting
     extern const SettingsBool optimize_redundant_functions_in_order_by;
     extern const SettingsBool optimize_rewrite_array_exists_to_has;
     extern const SettingsBool optimize_or_like_chain;
-    extern const SettingsBool optimize_injective_functions_in_group_by;
 }
 
 namespace ErrorCodes
@@ -133,12 +132,6 @@ void optimizeGroupBy(ASTSelectQuery * select_query, ContextPtr context)
     {
         if (const auto * function = group_exprs[i]->as<ASTFunction>())
         {
-            if (!settings[Setting::optimize_injective_functions_in_group_by])
-            {
-                ++i;
-                continue;
-            }
-
             /// assert function is injective
             if (possibly_injective_function_names.contains(function->name))
             {

tests/queries/0_stateless/03641_group_by_injective_functoon_bad_arguments.reference

@@ -1,6 +1,5 @@
 1	str
 1	str
-1	str
 QUERY id: 0
   PROJECTION COLUMNS
     count() UInt64

tests/queries/0_stateless/03641_group_by_injective_functoon_bad_arguments.sql

@@ -1,6 +1,9 @@
 create table test (json JSON) engine=MergeTree order by tuple();
 insert into test select '{"a" : "str"}';
-select count(), toString(json.a) from test group by toString(json.a) settings enable_analyzer=0, optimize_injective_functions_in_group_by=0;
+
+-- This won't work, see https://github.com/ClickHouse/ClickHouse/issues/89854
+-- select count(), toString(json.a) from test group by toString(json.a) settings enable_analyzer=0, optimize_injective_functions_in_group_by=0;
+
 select count(), toString(json.a) from test group by toString(json.a) settings enable_analyzer=1, optimize_injective_functions_in_group_by=0;
 select count(), toString(json.a) from test group by toString(json.a) settings enable_analyzer=1, optimize_injective_functions_in_group_by=1;
 explain query tree select count(), toString(json.a) from test group by toString(json.a) settings enable_analyzer=1, optimize_injective_functions_in_group_by=1;

tests/queries/0_stateless/03713_group_by_injective_function_old_analyzer.reference

@@ -0,0 +1 @@
+a_0	0

tests/queries/0_stateless/03713_group_by_injective_function_old_analyzer.sql

@@ -0,0 +1,8 @@
+SELECT
+    concat('a_', toString(number % 3)) AS a,
+    number % 5 AS b
+FROM numbers(50)
+GROUP BY (a, b)
+ORDER BY (a, b)
+LIMIT 1
+SETTINGS optimize_injective_functions_in_group_by = 0, enable_analyzer = 0;