fix

Author: zhuqi-lucas

datafusion/optimizer/Cargo.toml

@@ -46,6 +46,7 @@ chrono = { workspace = true }
 datafusion-common = { workspace = true, default-features = true }
 datafusion-expr = { workspace = true }
 datafusion-expr-common = { workspace = true }
+datafusion-functions-aggregate = { workspace = true }
 datafusion-physical-expr = { workspace = true }
 indexmap = { workspace = true }
 itertools = { workspace = true }
@@ -58,7 +59,6 @@ regex-syntax = "0.8.6"
 async-trait = { workspace = true }
 criterion = { workspace = true }
 ctor = { workspace = true }
-datafusion-functions-aggregate = { workspace = true }
 datafusion-functions-window = { workspace = true }
 datafusion-functions-window-common = { workspace = true }
 datafusion-sql = { workspace = true }

datafusion/optimizer/src/lib.rs

@@ -62,6 +62,7 @@ pub mod replace_distinct_aggregate;
 pub mod scalar_subquery_to_join;
 pub mod simplify_expressions;
 pub mod single_distinct_to_groupby;
+pub mod rewrite_limit_to_aggregate;
 pub mod utils;
 
 #[cfg(test)]
@@ -74,7 +75,6 @@ pub use optimizer::{
 
 pub(crate) mod join_key_set;
 mod plan_signature;
-mod RewriteLimitToAggregate;
 
 #[cfg(test)]
 #[ctor::ctor]

datafusion/optimizer/src/optimizer.rs

@@ -52,7 +52,7 @@ use crate::propagate_empty_relation::PropagateEmptyRelation;
 use crate::push_down_filter::PushDownFilter;
 use crate::push_down_limit::PushDownLimit;
 use crate::replace_distinct_aggregate::ReplaceDistinctWithAggregate;
-use crate::RewriteLimitToAggregate::RewriteLimitToAggregate;
+use crate::rewrite_limit_to_aggregate::RewriteLimitToAggregate;
 use crate::scalar_subquery_to_join::ScalarSubqueryToJoin;
 use crate::simplify_expressions::SimplifyExpressions;
 use crate::single_distinct_to_groupby::SingleDistinctToGroupBy;

datafusion/optimizer/src/RewriteLimitToAggregate.rs renamed to datafusion/optimizer/src/rewrite_limit_to_aggregate.rs

@@ -31,9 +31,9 @@
 
 use std::sync::Arc;
 
-use datafusion_common::tree_node::{Transformed, TreeNode};
+use datafusion_common::tree_node::Transformed;
 use datafusion_common::{Result, Column};
-use datafusion_expr::{Expr, LogicalPlan, Sort, Limit, Aggregate, logical_plan::builder::LogicalPlanBuilder, FetchType, SkipType, AggregateUDF};
+use datafusion_expr::{Expr, LogicalPlan, Sort, Limit, logical_plan::builder::LogicalPlanBuilder, FetchType, SkipType, AggregateUDF};
 use datafusion_expr::expr::AggregateFunctionParams;
 use datafusion_functions_aggregate::min_max::{Max, Min};
 use crate::{OptimizerConfig, OptimizerRule, ApplyOrder};
@@ -149,7 +149,7 @@ impl RewriteLimitToAggregate {
     ///
     /// Returns Some(RewriteInfo) if the sort expression is a simple column reference,
     /// or None if it's a complex expression
-    fn extract_rewrite_info(&self, sort: &Sort, limit: &Limit) -> Option<RewriteInfo> {
+    fn extract_rewrite_info(&self, sort: &Sort) -> Option<RewriteInfo> {
         let sort_expr = &sort.expr[0];
 
         // The sort expression must be a simple column reference, not a complex expression
@@ -215,7 +215,7 @@ impl OptimizerRule for RewriteLimitToAggregate {
         };
 
         // Try to extract rewrite information from the sort expression
-        if let Some(info) = self.extract_rewrite_info(sort, &limit) {
+        if let Some(info) = self.extract_rewrite_info(sort) {
             // Pattern matched successfully - perform the rewrite
             let new_plan = self.rewrite_to_aggregate(info)?;
             Ok(Transformed::yes(new_plan))
@@ -229,7 +229,7 @@ impl OptimizerRule for RewriteLimitToAggregate {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use datafusion_expr::{col, lit, logical_plan::table_scan, UserDefinedLogicalNode};
+    use datafusion_expr::{col, lit, logical_plan::table_scan};
     use arrow::datatypes::{DataType, Field, Schema};
 
     /// Helper function to create a test table with standard columns