Skip to content

Apache DataFusion SQL Query Engine

chore(csv): use shared aggr_test_schema in CSV scan tests (#26681)

NingLin Liu0a42acaa04af
diff --git a/datafusion/core/src/datasource/physical_plan/csv.rs b/datafusion/core/src/datasource/physical_plan/csv.rs
index 7980df87fa..9f0e27a83a 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;
@@ -37,6 +36,7 @@ mod tests {
use crate::prelude::CsvReadOptions;
use crate::prelude::SessionContext;
use crate::test::partitioned_file_groups;
+ 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;
@@ -62,28 +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,
case(FileCompressionType::UNCOMPRESSED),