From 6197bdc6d07eb38b428763ab5ea45cf56767e2bf Mon Sep 17 00:00:00 2001 From: NingLin Liu Date: Sat, 24 Oct 2026 04:44:38 +0800 Subject: [PATCH 1/2] chore(csv): use shared aggr_test_schema in CSV scan tests Drop the private copy in physical_plan/csv.rs tests and call crate::test_util::aggr_test_schema instead. Fixes #26306 --- .../core/src/datasource/physical_plan/csv.rs | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/datafusion/core/src/datasource/physical_plan/csv.rs b/datafusion/core/src/datasource/physical_plan/csv.rs index 7980df87fa576..8f0cd42ccfe37 100644 --- a/datafusion/core/src/datasource/physical_plan/csv.rs +++ b/datafusion/core/src/datasource/physical_plan/csv.rs @@ -24,7 +24,6 @@ pub use datafusion_datasource_csv::source::*; #[cfg(test)] mod tests { - use std::collections::HashMap; use std::fs::{self, File}; use std::io::Write; use std::sync::Arc; @@ -38,6 +37,7 @@ mod tests { use crate::prelude::SessionContext; use crate::test::partitioned_file_groups; use datafusion_common::config::CsvOptions; + use crate::test_util::aggr_test_schema; use datafusion_common::test_util::arrow_test_data; use datafusion_common::test_util::batches_to_string; use datafusion_common::{Result, assert_batches_eq}; @@ -62,27 +62,6 @@ mod tests { use tempfile::TempDir; use url::Url; - fn aggr_test_schema() -> SchemaRef { - let mut f1 = Field::new("c1", DataType::Utf8, false); - f1.set_metadata(HashMap::from_iter(vec![("testing".into(), "test".into())])); - let schema = Schema::new(vec![ - f1, - Field::new("c2", DataType::UInt32, false), - Field::new("c3", DataType::Int8, false), - Field::new("c4", DataType::Int16, false), - Field::new("c5", DataType::Int32, false), - Field::new("c6", DataType::Int64, false), - Field::new("c7", DataType::UInt8, false), - Field::new("c8", DataType::UInt16, false), - Field::new("c9", DataType::UInt32, false), - Field::new("c10", DataType::UInt64, false), - Field::new("c11", DataType::Float32, false), - Field::new("c12", DataType::Float64, false), - Field::new("c13", DataType::Utf8, false), - ]); - - Arc::new(schema) - } #[rstest( file_compression_type, From 20354729392794c28cb0fb7f4e22c4fcbc745e68 Mon Sep 17 00:00:00 2001 From: ninglinLiu Date: Sat, 24 Oct 2026 05:37:17 +0800 Subject: [PATCH 2/2] chore(csv): rustfmt import order in CSV scan tests Fixes cargo fmt check on #26681. --- datafusion/core/src/datasource/physical_plan/csv.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/datafusion/core/src/datasource/physical_plan/csv.rs b/datafusion/core/src/datasource/physical_plan/csv.rs index 8f0cd42ccfe37..9f0e27a83a2f1 100644 --- a/datafusion/core/src/datasource/physical_plan/csv.rs +++ b/datafusion/core/src/datasource/physical_plan/csv.rs @@ -36,8 +36,8 @@ mod tests { use crate::prelude::CsvReadOptions; use crate::prelude::SessionContext; use crate::test::partitioned_file_groups; - use datafusion_common::config::CsvOptions; use crate::test_util::aggr_test_schema; + use datafusion_common::config::CsvOptions; use datafusion_common::test_util::arrow_test_data; use datafusion_common::test_util::batches_to_string; use datafusion_common::{Result, assert_batches_eq}; @@ -62,7 +62,6 @@ mod tests { use tempfile::TempDir; use url::Url; - #[rstest( file_compression_type, case(FileCompressionType::UNCOMPRESSED),