Skip to content

Commit c6cebbd

Browse files
committed
remove empty file
1 parent 3cd6712 commit c6cebbd

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

datafusion/datasource-avro/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ async-trait = { workspace = true }
3737
bytes = { workspace = true }
3838
datafusion-common = { workspace = true, features = ["object_store"] }
3939
datafusion-datasource = { workspace = true }
40+
datafusion-physical-expr-common = { workspace = true }
4041
datafusion-physical-plan = { workspace = true }
4142
datafusion-session = { workspace = true }
4243
futures = { workspace = true }

datafusion/datasource-avro/src/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ pub mod source;
3434
use arrow::datatypes::Schema;
3535
pub use arrow_avro;
3636
use arrow_avro::reader::ReaderBuilder;
37-
pub use file_format::*;
3837
use arrow_avro::schema::SCHEMA_METADATA_KEY;
3938
use datafusion_common::DataFusionError;
39+
pub use file_format::*;
4040
use std::io::{BufReader, Read};
4141
use std::sync::Arc;
4242

datafusion/datasource-avro/src/source.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@ use std::sync::Arc;
2424
use arrow_avro::reader::{Reader, ReaderBuilder};
2525
use arrow_avro::schema::{AvroSchema, SCHEMA_METADATA_KEY};
2626
use datafusion_common::error::Result;
27-
use datafusion_common::{DataFusionError, Statistics};
27+
use datafusion_common::DataFusionError;
2828
use datafusion_datasource::file::FileSource;
2929
use datafusion_datasource::file_scan_config::FileScanConfig;
3030
use datafusion_datasource::file_stream::FileOpener;
3131
use datafusion_datasource::schema_adapter::SchemaAdapterFactory;
3232
use datafusion_datasource::TableSchema;
33+
use datafusion_physical_expr_common::sort_expr::LexOrdering;
3334
use datafusion_physical_plan::metrics::ExecutionPlanMetricsSet;
3435

3536
use object_store::ObjectStore;
@@ -40,7 +41,7 @@ use serde_json::Value;
4041
pub struct AvroSource {
4142
table_schema: TableSchema,
4243
batch_size: Option<usize>,
43-
projection: Option<Vec<usize>>,
44+
projection: Option<Vec<String>>,
4445
metrics: ExecutionPlanMetricsSet,
4546
schema_adapter_factory: Option<Arc<dyn SchemaAdapterFactory>>,
4647
}
@@ -181,7 +182,7 @@ impl FileSource for AvroSource {
181182

182183
fn with_projection(&self, config: &FileScanConfig) -> Arc<dyn FileSource> {
183184
let mut conf = self.clone();
184-
conf.projection = config.file_column_projection_indices();
185+
conf.projection = config.projected_file_column_names();
185186
Arc::new(conf)
186187
}
187188

0 commit comments

Comments
 (0)