Rename statistics_context module to statistics, use impl AsRef for ergonomics

Author: asolimando

datafusion-examples/examples/relation_planner/table_sample.rs

@@ -724,7 +724,7 @@ impl ExecutionPlan for SampleExec {
 
     fn statistics_with_args(&self, args: &StatisticsArgs) -> Result<Arc<Statistics>> {
         let mut stats = Arc::unwrap_or_clone(
-            args.compute_child_statistics(self.input.as_ref(), args.partition())?,
+            args.compute_child_statistics(&self.input, args.partition())?,
         );
         let ratio = self.upper_bound - self.lower_bound;
 

datafusion/physical-optimizer/src/output_requirements.rs

@@ -242,7 +242,7 @@ impl ExecutionPlan for OutputRequirementExec {
     }
 
     fn statistics_with_args(&self, args: &StatisticsArgs) -> Result<Arc<Statistics>> {
-        args.compute_child_statistics(self.input.as_ref(), args.partition())
+        args.compute_child_statistics(&self.input, args.partition())
     }
 
     fn try_swapping_with_projection(

datafusion/physical-plan/src/aggregates/mod.rs

@@ -31,7 +31,7 @@ use crate::filter_pushdown::{
     FilterPushdownPropagation, PushedDownPredicate,
 };
 use crate::metrics::{ExecutionPlanMetricsSet, MetricsSet};
-use crate::statistics_context::StatisticsArgs;
+use crate::statistics::StatisticsArgs;
 use crate::{
     DisplayFormatType, Distribution, ExecutionPlan, InputOrderMode,
     SendableRecordBatchStream, Statistics, check_if_same_properties,
@@ -1615,7 +1615,7 @@ impl ExecutionPlan for AggregateExec {
 
     fn statistics_with_args(&self, args: &StatisticsArgs) -> Result<Arc<Statistics>> {
         let child_statistics =
-            args.compute_child_statistics(self.input.as_ref(), args.partition())?;
+            args.compute_child_statistics(&self.input, args.partition())?;
         Ok(Arc::new(self.statistics_inner(&child_statistics)?))
     }
 
@@ -2239,7 +2239,7 @@ mod tests {
     use crate::execution_plan::Boundedness;
     use crate::expressions::col;
     use crate::metrics::MetricValue;
-    use crate::statistics_context::compute_statistics;
+    use crate::statistics::compute_statistics;
     use crate::test::TestMemoryExec;
     use crate::test::assert_is_pending;
     use crate::test::exec::{

datafusion/physical-plan/src/buffer.rs

@@ -24,7 +24,7 @@ use crate::filter_pushdown::{
     FilterPushdownPropagation,
 };
 use crate::projection::ProjectionExec;
-use crate::statistics_context::StatisticsArgs;
+use crate::statistics::StatisticsArgs;
 use crate::stream::RecordBatchStreamAdapter;
 use crate::{
     DisplayAs, DisplayFormatType, ExecutionPlan, PlanProperties, SortOrderPushdownResult,
@@ -238,7 +238,7 @@ impl ExecutionPlan for BufferExec {
     }
 
     fn statistics_with_args(&self, args: &StatisticsArgs) -> Result<Arc<Statistics>> {
-        args.compute_child_statistics(self.input.as_ref(), args.partition())
+        args.compute_child_statistics(&self.input, args.partition())
     }
 
     fn supports_limit_pushdown(&self) -> bool {

datafusion/physical-plan/src/coalesce_batches.rs

@@ -24,7 +24,7 @@ use std::task::{Context, Poll};
 use super::metrics::{BaselineMetrics, ExecutionPlanMetricsSet, MetricsSet};
 use super::{DisplayAs, ExecutionPlanProperties, PlanProperties, Statistics};
 use crate::projection::ProjectionExec;
-use crate::statistics_context::StatisticsArgs;
+use crate::statistics::StatisticsArgs;
 use crate::stream::EmptyRecordBatchStream;
 use crate::{
     DisplayFormatType, ExecutionPlan, RecordBatchStream, SendableRecordBatchStream,
@@ -218,7 +218,7 @@ impl ExecutionPlan for CoalesceBatchesExec {
 
     fn statistics_with_args(&self, args: &StatisticsArgs) -> Result<Arc<Statistics>> {
         let stats = Arc::unwrap_or_clone(
-            args.compute_child_statistics(self.input.as_ref(), args.partition())?,
+            args.compute_child_statistics(&self.input, args.partition())?,
         );
         Ok(Arc::new(stats.with_fetch(self.fetch, 0, 1)?))
     }

datafusion/physical-plan/src/coalesce_partitions.rs

@@ -30,7 +30,7 @@ use crate::execution_plan::{CardinalityEffect, EvaluationType, SchedulingType};
 use crate::filter_pushdown::{FilterDescription, FilterPushdownPhase};
 use crate::projection::{ProjectionExec, make_with_child};
 use crate::sort_pushdown::SortOrderPushdownResult;
-use crate::statistics_context::StatisticsArgs;
+use crate::statistics::StatisticsArgs;
 use crate::{DisplayFormatType, ExecutionPlan, Partitioning, check_if_same_properties};
 use datafusion_physical_expr_common::sort_expr::PhysicalSortExpr;
 
@@ -233,9 +233,8 @@ impl ExecutionPlan for CoalescePartitionsExec {
     }
 
     fn statistics_with_args(&self, args: &StatisticsArgs) -> Result<Arc<Statistics>> {
-        let stats = Arc::unwrap_or_clone(
-            args.compute_child_statistics(self.input.as_ref(), None)?,
-        );
+        let stats =
+            Arc::unwrap_or_clone(args.compute_child_statistics(&self.input, None)?);
         Ok(Arc::new(stats.with_fetch(self.fetch, 0, 1)?))
     }
 

datafusion/physical-plan/src/coop.rs

@@ -84,7 +84,7 @@ use crate::filter_pushdown::{
     FilterPushdownPropagation,
 };
 use crate::projection::ProjectionExec;
-use crate::statistics_context::StatisticsArgs;
+use crate::statistics::StatisticsArgs;
 use crate::{
     DisplayAs, DisplayFormatType, ExecutionPlan, PlanProperties, RecordBatchStream,
     SendableRecordBatchStream, SortOrderPushdownResult, check_if_same_properties,
@@ -300,7 +300,7 @@ impl ExecutionPlan for CooperativeExec {
     }
 
     fn statistics_with_args(&self, args: &StatisticsArgs) -> Result<Arc<Statistics>> {
-        args.compute_child_statistics(self.input.as_ref(), args.partition())
+        args.compute_child_statistics(&self.input, args.partition())
     }
 
     fn supports_limit_pushdown(&self) -> bool {

datafusion/physical-plan/src/display.rs

@@ -31,7 +31,7 @@ use datafusion_physical_expr::LexOrdering;
 use crate::metrics::{MetricCategory, MetricType};
 use crate::render_tree::RenderTree;
 
-use crate::statistics_context::compute_statistics;
+use crate::statistics::compute_statistics;
 
 use super::{ExecutionPlan, ExecutionPlanVisitor, accept};
 
@@ -1172,7 +1172,7 @@ mod tests {
     use datafusion_common::{Result, Statistics, internal_datafusion_err};
     use datafusion_execution::{SendableRecordBatchStream, TaskContext};
 
-    use crate::statistics_context::StatisticsArgs;
+    use crate::statistics::StatisticsArgs;
     use crate::{DisplayAs, ExecutionPlan, PlanProperties};
 
     use super::DisplayableExecutionPlan;

datafusion/physical-plan/src/empty.rs

@@ -34,7 +34,7 @@ use datafusion_execution::TaskContext;
 use datafusion_physical_expr::EquivalenceProperties;
 
 use crate::execution_plan::SchedulingType;
-use crate::statistics_context::StatisticsArgs;
+use crate::statistics::StatisticsArgs;
 use log::trace;
 
 /// Execution plan for empty relation with produce_one_row=false

datafusion/physical-plan/src/execution_plan.rs

@@ -45,7 +45,7 @@ use crate::coalesce_partitions::CoalescePartitionsExec;
 use crate::display::DisplayableExecutionPlan;
 use crate::metrics::MetricsSet;
 use crate::projection::ProjectionExec;
-use crate::statistics_context::StatisticsArgs;
+use crate::statistics::StatisticsArgs;
 use crate::stream::RecordBatchStreamAdapter;
 
 use arrow::array::{Array, RecordBatch};
@@ -499,8 +499,8 @@ pub trait ExecutionPlan: Any + Debug + DisplayAs + Send + Sync {
     /// See [`compute_statistics`] for the top-level entry point that
     /// builds the args automatically.
     ///
-    /// [`StatisticsArgs`]: crate::statistics_context::StatisticsArgs
-    /// [`compute_statistics`]: crate::statistics_context::compute_statistics
+    /// [`StatisticsArgs`]: crate::statistics::StatisticsArgs
+    /// [`compute_statistics`]: crate::statistics::compute_statistics
     fn statistics_with_args(&self, args: &StatisticsArgs) -> Result<Arc<Statistics>> {
         #[expect(deprecated)]
         self.partition_statistics(args.partition())