move aggregate_statistics, enforce_sorting, limited_distinct_aggregtion and replace_with_order_preserving_variants to datafusion-physical-optimizer crate

datafusion/core/src/physical_optimizer/limit_pushdown.rs

@@ -22,8 +22,8 @@ use std::fmt::Debug;
 use std::sync::Arc;
 
 use crate::error::Result;
-use crate::physical_optimizer::PhysicalOptimizerRule;
 use crate::physical_plan::ExecutionPlan;
+use datafusion_physical_optimizer::PhysicalOptimizerRule;
 
 use datafusion_common::config::ConfigOptions;
 use datafusion_common::plan_datafusion_err;

datafusion/core/src/physical_optimizer/mod.rs

@@ -21,25 +21,31 @@
 //! "Repartition" or "Sortedness"
 //!
 //! [`ExecutionPlan`]: crate::physical_plan::ExecutionPlan
-pub mod aggregate_statistics;
+
+mod tests {
+    mod aggregate_statistics;
+    mod enforce_distribution;
+    mod enforce_sorting_test;
+    mod limited_distinct_aggregation;
+    mod replace_with_order_preserving_variants;
+}
 pub mod coalesce_batches;
 pub mod combine_partial_final_agg;
-pub mod enforce_distribution;
-pub mod enforce_sorting;
 pub mod join_selection;
 pub mod limit_pushdown;
-pub mod limited_distinct_aggregation;
 pub mod optimizer;
 pub mod projection_pushdown;
 pub mod pruning;
-pub mod replace_with_order_preserving_variants;
 pub mod sanity_checker;
 #[cfg(test)]
 pub mod test_utils;
 pub mod topk_aggregation;
 pub mod update_aggr_exprs;
 
-mod sort_pushdown;
 mod utils;
 
-pub use datafusion_physical_optimizer::*;
+pub use datafusion_physical_optimizer::{
+    aggregate_statistics, enforce_distribution, enforce_sorting,
+    limited_distinct_aggregation, output_requirements,
+    replace_with_order_preserving_variants,
+};

datafusion/core/src/physical_optimizer/optimizer.rs

@@ -22,17 +22,17 @@ use std::sync::Arc;
 
 use super::projection_pushdown::ProjectionPushdown;
 use super::update_aggr_exprs::OptimizeAggregateOrder;
-use crate::physical_optimizer::aggregate_statistics::AggregateStatistics;
 use crate::physical_optimizer::coalesce_batches::CoalesceBatches;
 use crate::physical_optimizer::combine_partial_final_agg::CombinePartialFinalAggregate;
-use crate::physical_optimizer::enforce_distribution::EnforceDistribution;
-use crate::physical_optimizer::enforce_sorting::EnforceSorting;
 use crate::physical_optimizer::join_selection::JoinSelection;
 use crate::physical_optimizer::limit_pushdown::LimitPushdown;
-use crate::physical_optimizer::limited_distinct_aggregation::LimitedDistinctAggregation;
 use crate::physical_optimizer::output_requirements::OutputRequirements;
 use crate::physical_optimizer::sanity_checker::SanityCheckPlan;
 use crate::physical_optimizer::topk_aggregation::TopKAggregation;
+use datafusion_physical_optimizer::aggregate_statistics::AggregateStatistics;
+use datafusion_physical_optimizer::enforce_distribution::EnforceDistribution;
+use datafusion_physical_optimizer::enforce_sorting::EnforceSorting;
+use datafusion_physical_optimizer::limited_distinct_aggregation::LimitedDistinctAggregation;
 
 /// A rule-based physical optimizer.
 #[derive(Clone)]