resolve conflict

Author: xudong963

datafusion/datasource/benches/split_groups_by_statistics.rs

@@ -18,8 +18,7 @@
 use arrow::datatypes::{DataType, Field, Schema};
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 use datafusion_datasource::file_scan_config::FileScanConfig;
-use datafusion_datasource::test_util::generate_test_files;
-use datafusion_datasource::test_util::verify_sort_integrity;
+use datafusion_datasource::test_util::{generate_test_files, verify_sort_integrity};
 use datafusion_physical_expr::PhysicalSortExpr;
 use datafusion_physical_expr_common::sort_expr::LexOrdering;
 use std::sync::Arc;

datafusion/datasource/src/file_scan_config.rs

@@ -2311,6 +2311,9 @@ mod tests {
         );
         assert_eq!(new_config.constraints, Constraints::default());
         assert!(new_config.new_lines_in_values);
+    }
+
+    #[test]
     fn test_split_groups_by_statistics_with_target_partitions() -> Result<()> {
         use crate::test_util::generate_test_files;
         use crate::test_util::verify_sort_integrity;

datafusion/datasource/src/mod.rs

@@ -43,7 +43,7 @@ pub mod sink;
 pub mod source;
 mod statistics;
 
-#[cfg(any(test))]
+#[cfg(test)]
 pub mod test_util;
 
 pub mod url;

datafusion/datasource/src/test_util.rs

@@ -113,7 +113,7 @@ pub fn generate_test_files(num_files: usize, overlap_factor: f64) -> Vec<FileGro
             },
             partition_values: vec![],
             range: None,
-            statistics: Some(Statistics {
+            statistics: Some(Arc::new(Statistics {
                 num_rows: Precision::Exact(100),
                 total_byte_size: Precision::Exact(1000),
                 column_statistics: vec![ColumnStatistics {
@@ -123,7 +123,7 @@ pub fn generate_test_files(num_files: usize, overlap_factor: f64) -> Vec<FileGro
                     sum_value: Precision::Absent,
                     distinct_count: Precision::Absent,
                 }],
-            }),
+            })),
             extensions: None,
             metadata_size_hint: None,
         };