Merge pull request ClickHouse#92702 from ClickHouse/backport/25.8/92376

Backport ClickHouse#92376 to 25.8: Fix `count_distinct_optimization` pass over window functions and over multiple arguments

Author: clickhouse-gh[bot]

src/Analyzer/Passes/CountDistinctPass.cpp

@@ -55,7 +55,7 @@ class CountDistinctVisitor : public InDepthQueryTreeVisitorWithContext<CountDist
         /// Check that query single projection node is `countDistinct` function
         auto & projection_node = projection_nodes[0];
         auto * function_node = projection_node->as<FunctionNode>();
-        if (!function_node)
+        if (!function_node || function_node->hasWindow())
             return;
 
         auto lower_function_name = Poco::toLower(function_node->getFunctionName());
@@ -64,7 +64,7 @@ class CountDistinctVisitor : public InDepthQueryTreeVisitorWithContext<CountDist
 
         /// Check that `countDistinct` function has single COLUMN argument
         auto & count_distinct_arguments_nodes = function_node->getArguments().getNodes();
-        if (count_distinct_arguments_nodes.size() != 1 && count_distinct_arguments_nodes[0]->getNodeType() != QueryTreeNodeType::COLUMN)
+        if (count_distinct_arguments_nodes.size() != 1 || count_distinct_arguments_nodes[0]->getNodeType() != QueryTreeNodeType::COLUMN)
             return;
 
         auto & count_distinct_argument_column = count_distinct_arguments_nodes[0];

tests/queries/0_stateless/03761_count_distinct_optimization_window.reference

@@ -0,0 +1,10 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10

tests/queries/0_stateless/03761_count_distinct_optimization_window.sql

@@ -0,0 +1,9 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/86442
+-- The transformation shouldn't be applied if the aggregation has window parameters
+SELECT uniqExact(c0) OVER (ORDER BY c0 DESC)
+FROM
+(
+    SELECT number AS c0
+    FROM numbers(10)
+) AS t0
+SETTINGS count_distinct_optimization = 1, enable_analyzer = 1;

tests/queries/0_stateless/03762_count_distinct_optimization_multiple_columns.reference

@@ -0,0 +1,2 @@
+143
+143

tests/queries/0_stateless/03762_count_distinct_optimization_multiple_columns.sql

@@ -0,0 +1,2 @@
+SELECT count(DISTINCT x, y) FROM (SELECT number % 11 AS x, number % 13 AS y FROM system.numbers LIMIT 1000) SETTINGS count_distinct_optimization = 0, enable_analyzer = 1;
+SELECT count(DISTINCT x, y) FROM (SELECT number % 11 AS x, number % 13 AS y FROM system.numbers LIMIT 1000) SETTINGS count_distinct_optimization = 1, enable_analyzer = 1;