Skip to content

Commit 0a42aca

Browse files
authored
chore(csv): use shared aggr_test_schema in CSV scan tests (apache#26681)
## Summary The CSV physical-plan test module defined a private `aggr_test_schema()` that duplicated `datafusion::test_util::aggr_test_schema()`. Use the shared helper instead and drop the unused `HashMap` import. ## Test plan - [x] Diff-only cleanup (schemas are identical including `c1` metadata) - [ ] CI `cargo test -p datafusion --lib csv` Fixes apache#26306 --------- Co-authored-by: NingLin Liu <[email protected]>
1 parent 26fe7ad commit 0a42aca

1 file changed

Lines changed: 1 addition & 23 deletions

File tree

  • datafusion/core/src/datasource/physical_plan

‎datafusion/core/src/datasource/physical_plan/csv.rs‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ pub use datafusion_datasource_csv::source::*;
2424
#[cfg(test)]
2525
mod tests {
2626

27-
use std::collections::HashMap;
2827
use std::fs::{self, File};
2928
use std::io::Write;
3029
use std::sync::Arc;
@@ -37,6 +36,7 @@ mod tests {
3736
use crate::prelude::CsvReadOptions;
3837
use crate::prelude::SessionContext;
3938
use crate::test::partitioned_file_groups;
39+
use crate::test_util::aggr_test_schema;
4040
use datafusion_common::config::CsvOptions;
4141
use datafusion_common::test_util::arrow_test_data;
4242
use datafusion_common::test_util::batches_to_string;
@@ -62,28 +62,6 @@ mod tests {
6262
use tempfile::TempDir;
6363
use url::Url;
6464

65-
fn aggr_test_schema() -> SchemaRef {
66-
let mut f1 = Field::new("c1", DataType::Utf8, false);
67-
f1.set_metadata(HashMap::from_iter(vec![("testing".into(), "test".into())]));
68-
let schema = Schema::new(vec![
69-
f1,
70-
Field::new("c2", DataType::UInt32, false),
71-
Field::new("c3", DataType::Int8, false),
72-
Field::new("c4", DataType::Int16, false),
73-
Field::new("c5", DataType::Int32, false),
74-
Field::new("c6", DataType::Int64, false),
75-
Field::new("c7", DataType::UInt8, false),
76-
Field::new("c8", DataType::UInt16, false),
77-
Field::new("c9", DataType::UInt32, false),
78-
Field::new("c10", DataType::UInt64, false),
79-
Field::new("c11", DataType::Float32, false),
80-
Field::new("c12", DataType::Float64, false),
81-
Field::new("c13", DataType::Utf8, false),
82-
]);
83-
84-
Arc::new(schema)
85-
}
86-
8765
#[rstest(
8866
file_compression_type,
8967
case(FileCompressionType::UNCOMPRESSED),

0 commit comments

Comments
 (0)