Prepend traitwhen calling statistics

Author: friendlymatthew

datafusion/core/src/datasource/physical_plan/arrow_file.rs

@@ -89,7 +89,7 @@ impl FileSource for ArrowSource {
         &self.metrics
     }
 
-    fn statistics(&self) -> Result<Statistics> {
+    fn file_source_statistics(&self) -> Result<Statistics> {
         let statistics = &self.projected_statistics;
         Ok(statistics
             .clone()

datafusion/core/tests/physical_optimizer/filter_pushdown/util.rs

@@ -178,7 +178,7 @@ impl FileSource for TestSource {
         &self.metrics
     }
 
-    fn statistics(&self) -> Result<Statistics> {
+    fn file_source_statistics(&self) -> Result<Statistics> {
         Ok(self
             .statistics
             .as_ref()

datafusion/core/tests/physical_optimizer/test_utils.rs

@@ -135,7 +135,7 @@ pub(crate) fn parquet_exec_with_stats(file_size: u64) -> Arc<DataSourceExec> {
     .build();
 
     assert_eq!(
-        config.file_source.statistics().unwrap().num_rows,
+        config.file_source.file_source_statistics().unwrap().num_rows,
         Precision::Inexact(10000)
     );
     DataSourceExec::from_data_source(config)

datafusion/datasource-avro/src/source.rs

@@ -105,7 +105,7 @@ impl FileSource for AvroSource {
         &self.metrics
     }
 
-    fn statistics(&self) -> Result<Statistics> {
+    fn file_source_statistics(&self) -> Result<Statistics> {
         let statistics = &self.projected_statistics;
         Ok(statistics
             .clone()

datafusion/datasource-csv/src/source.rs

@@ -266,7 +266,7 @@ impl FileSource for CsvSource {
     fn metrics(&self) -> &ExecutionPlanMetricsSet {
         &self.metrics
     }
-    fn statistics(&self) -> Result<Statistics> {
+    fn file_source_statistics(&self) -> Result<Statistics> {
         let statistics = &self.projected_statistics;
         Ok(statistics
             .clone()

datafusion/datasource-json/src/source.rs

@@ -140,7 +140,7 @@ impl FileSource for JsonSource {
         &self.metrics
     }
 
-    fn statistics(&self) -> Result<Statistics> {
+    fn file_source_statistics(&self) -> Result<Statistics> {
         let statistics = &self.projected_statistics;
         Ok(statistics
             .clone()

datafusion/datasource-parquet/src/source.rs

@@ -614,7 +614,7 @@ impl FileSource for ParquetSource {
         &self.metrics
     }
 
-    fn statistics(&self) -> datafusion_common::Result<Statistics> {
+    fn file_source_statistics(&self) -> datafusion_common::Result<Statistics> {
         let statistics = &self.projected_statistics;
         let statistics = statistics
             .clone()

datafusion/datasource/src/file.rs

@@ -72,7 +72,7 @@ pub trait FileSource: Send + Sync {
     /// Return execution plan metrics
     fn metrics(&self) -> &ExecutionPlanMetricsSet;
     /// Return projected statistics
-    fn statistics(&self) -> Result<Statistics>;
+    fn file_source_statistics(&self) -> Result<Statistics>;
     /// String representation of file source such as "csv", "json", "parquet"
     fn file_type(&self) -> &str;
     /// Format FileType specific information

datafusion/datasource/src/file_scan_config.rs

@@ -479,7 +479,7 @@ impl From<FileScanConfig> for FileScanConfigBuilder {
             file_schema: config.file_schema,
             file_source: Arc::<dyn FileSource>::clone(&config.file_source),
             file_groups: config.file_groups,
-            statistics: config.file_source.statistics().ok(),
+            statistics: config.file_source.file_source_statistics().ok(),
             output_ordering: config.output_ordering,
             file_compression_type: Some(config.file_compression_type),
             new_lines_in_values: Some(config.new_lines_in_values),
@@ -585,7 +585,7 @@ impl DataSource for FileScanConfig {
         SchedulingType::Cooperative
     }
 
-    fn statistics(&self) -> Result<Statistics> {
+    fn data_source_statistics(&self) -> Result<Statistics> {
         Ok(self.projected_stats())
     }
 
@@ -679,7 +679,7 @@ impl FileScanConfig {
     }
 
     pub fn projected_stats(&self) -> Statistics {
-        let statistics = self.file_source.statistics().unwrap();
+        let statistics = self.file_source.file_source_statistics().unwrap();
 
         let table_cols_stats = self
             .projection_indices()
@@ -746,7 +746,7 @@ impl FileScanConfig {
             return (
                 Arc::clone(&self.file_schema),
                 self.constraints.clone(),
-                self.file_source.statistics().unwrap().clone(),
+                self.file_source.file_source_statistics().unwrap().clone(),
                 self.output_ordering.clone(),
             );
         }
@@ -978,7 +978,7 @@ impl Debug for FileScanConfig {
         write!(
             f,
             "statistics={:?}, ",
-            self.file_source.statistics().unwrap()
+            self.file_source.file_source_statistics().unwrap()
         )?;
 
         DisplayAs::fmt_as(self, DisplayFormatType::Verbose, f)?;
@@ -1569,8 +1569,8 @@ mod tests {
             to_partition_cols(partition_cols.clone()),
         );
 
-        let source_statistics = conf.file_source.statistics().unwrap();
-        let conf_stats = conf.statistics().unwrap();
+        let source_statistics = conf.file_source.file_source_statistics().unwrap();
+        let conf_stats = conf.data_source_statistics().unwrap();
 
         // projection should be reflected in the file source statistics
         assert_eq!(conf_stats.num_rows, Precision::Inexact(3));
@@ -2203,23 +2203,36 @@ mod tests {
 
         // Verify statistics are set to unknown
         assert_eq!(
-            config.file_source.statistics().unwrap().num_rows,
+            config
+                .file_source
+                .file_source_statistics()
+                .unwrap()
+                .num_rows,
             Precision::Absent
         );
         assert_eq!(
-            config.file_source.statistics().unwrap().total_byte_size,
+            config
+                .file_source
+                .file_source_statistics()
+                .unwrap()
+                .total_byte_size,
             Precision::Absent
         );
         assert_eq!(
             config
                 .file_source
-                .statistics()
+                .file_source_statistics()
                 .unwrap()
                 .column_statistics
                 .len(),
             file_schema.fields().len()
         );
-        for stat in config.file_source.statistics().unwrap().column_statistics {
+        for stat in config
+            .file_source
+            .file_source_statistics()
+            .unwrap()
+            .column_statistics
+        {
             assert_eq!(stat.distinct_count, Precision::Absent);
             assert_eq!(stat.min_value, Precision::Absent);
             assert_eq!(stat.max_value, Precision::Absent);

datafusion/datasource/src/memory.rs

@@ -194,7 +194,7 @@ impl DataSource for MemorySourceConfig {
         SchedulingType::Cooperative
     }
 
-    fn statistics(&self) -> Result<Statistics> {
+    fn data_source_statistics(&self) -> Result<Statistics> {
         Ok(common::compute_record_batch_statistics(
             &self.partitions,
             &self.schema,