lint

Author: adriangb

datafusion/core/src/test_util/parquet.rs

@@ -40,6 +40,7 @@ use crate::prelude::{Expr, SessionConfig, SessionContext};
 use datafusion_datasource::file::FileSource;
 use datafusion_datasource::file_scan_config::FileScanConfigBuilder;
 use datafusion_datasource::source::DataSourceExec;
+use datafusion_datasource::TableSchema;
 use object_store::path::Path;
 use object_store::ObjectMeta;
 use parquet::arrow::ArrowWriter;
@@ -186,10 +187,7 @@ impl TestParquetFile {
                 ParquetSource::new(parquet_options)
                     .with_predicate(Arc::clone(&physical_filter_expr)),
             )
-            .with_schema(datafusion_datasource::TableSchema::new(
-                Arc::clone(&self.schema),
-                vec![],
-            ));
+            .with_schema(TableSchema::new_from_file_schema(Arc::clone(&self.schema)));
             let config = scan_config_builder.with_source(source).build();
             let parquet_exec = DataSourceExec::from_data_source(config);
 

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

@@ -158,6 +158,10 @@ impl FileSource for TestSource {
     }
 
     fn with_schema(&self, schema: TableSchema) -> Arc<dyn FileSource> {
+        assert!(
+            schema.table_partition_cols().is_empty(),
+            "TestSource does not support partition columns"
+        );
         Arc::new(TestSource {
             schema: Some(schema.file_schema().clone()),
             ..self.clone()

datafusion/datasource-avro/src/source.rs

@@ -87,7 +87,8 @@ impl FileSource for AvroSource {
 
     fn with_schema(&self, schema: TableSchema) -> Arc<dyn FileSource> {
         let mut conf = self.clone();
-        conf.schema = Some(schema.file_schema().clone());
+        // TableSchema may have partition columns, but AvroSource does not use partition columns or values atm
+        conf.schema = Some(Arc::clone(&schema.file_schema()));
         Arc::new(conf)
     }
     fn with_statistics(&self, statistics: Statistics) -> Arc<dyn FileSource> {

datafusion/datasource-csv/src/source.rs

@@ -260,7 +260,7 @@ impl FileSource for CsvSource {
 
     fn with_schema(&self, schema: TableSchema) -> Arc<dyn FileSource> {
         let mut conf = self.clone();
-        conf.file_schema = Some(schema.file_schema().clone());
+        conf.file_schema = Some(Arc::clone(&schema.file_schema()));
         Arc::new(conf)
     }