Skip to content

Add From<&SchemaRef> impls to avoid explicit schema clones #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adriangb merged 1 commit into from
May 26, 2026
Merged

Add From<&SchemaRef> impls to avoid explicit schema clones #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions datafusion/catalog-listing/src/table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use datafusion_datasource::file_sink_config::{FileOutputMode, FileSinkConfig};
#[expect(deprecated)]
use datafusion_datasource::schema_adapter::SchemaAdapterFactory;
use datafusion_datasource::{
ListingTableUrl, PartitionedFile, TableSchema, compute_all_files_statistics,
ListingTableUrl, PartitionedFile, TableSchemaBuilder, compute_all_files_statistics,
};
use datafusion_execution::cache::TableScopedPath;
use datafusion_execution::cache::cache_manager::FileStatisticsCache;
Expand Down Expand Up @@ -321,7 +321,7 @@ impl ListingTable {

/// Creates a file source for this table
fn create_file_source(&self) -> Arc<dyn FileSource> {
let table_schema = TableSchema::builder(Arc::clone(&self.file_schema))
let table_schema = TableSchemaBuilder::from(&self.file_schema)

@alamb alamb May 26, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the point of this PR is to simplity the code and avoid a bunch of explicit clones

.with_table_partition_cols(
self.options
.table_partition_cols
Expand Down
2 changes: 1 addition & 1 deletion datafusion/core/src/datasource/file_format/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pub(crate) mod test_util {
.await?
};

let table_schema = TableSchema::from(file_schema.clone());
let table_schema = TableSchema::from(&file_schema);

let statistics = format
.infer_stats(state, &store, file_schema.clone(), &meta)
Expand Down
4 changes: 2 additions & 2 deletions datafusion/core/src/datasource/physical_plan/avro.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ mod tests {
use datafusion_common::{Result, ScalarValue, test_util};
use datafusion_datasource::file_format::FileFormat;
use datafusion_datasource::file_scan_config::FileScanConfigBuilder;
use datafusion_datasource::{PartitionedFile, TableSchema};
use datafusion_datasource::{PartitionedFile, TableSchemaBuilder};
use datafusion_datasource_avro::AvroFormat;
use datafusion_datasource_avro::source::AvroSource;
use datafusion_execution::object_store::ObjectStoreUrl;
Expand Down Expand Up @@ -223,7 +223,7 @@ mod tests {
partitioned_file.partition_values = vec![ScalarValue::from("2021-10-26")];

let projection = Some(vec![0, 1, file_schema.fields().len(), 2]);
let table_schema = TableSchema::builder(file_schema.clone())
let table_schema = TableSchemaBuilder::from(file_schema)
.with_table_partition_cols(vec![Arc::new(Field::new(
"date",
DataType::Utf8,
Expand Down
14 changes: 7 additions & 7 deletions datafusion/core/src/datasource/physical_plan/csv.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ mod tests {
quote: b'"',
..Default::default()
};
let table_schema = TableSchema::from(Arc::clone(&file_schema));
let table_schema = TableSchema::from(&file_schema);
let source =
Arc::new(CsvSource::new(table_schema.clone()).with_csv_options(options));
let config =
Expand Down Expand Up @@ -194,7 +194,7 @@ mod tests {
quote: b'"',
..Default::default()
};
let table_schema = TableSchema::from(Arc::clone(&file_schema));
let table_schema = TableSchema::from(&file_schema);
let source =
Arc::new(CsvSource::new(table_schema.clone()).with_csv_options(options));
let config =
Expand Down Expand Up @@ -265,7 +265,7 @@ mod tests {
quote: b'"',
..Default::default()
};
let table_schema = TableSchema::from(Arc::clone(&file_schema));
let table_schema = TableSchema::from(&file_schema);
let source =
Arc::new(CsvSource::new(table_schema.clone()).with_csv_options(options));
let config =
Expand Down Expand Up @@ -335,7 +335,7 @@ mod tests {
quote: b'"',
..Default::default()
};
let table_schema = TableSchema::from(Arc::clone(&file_schema));
let table_schema = TableSchema::from(&file_schema);
let source =
Arc::new(CsvSource::new(table_schema.clone()).with_csv_options(options));
let config =
Expand Down Expand Up @@ -371,7 +371,7 @@ mod tests {
file_compression_type: FileCompressionType,
) -> Result<()> {
use datafusion_common::ScalarValue;
use datafusion_datasource::TableSchema;
use datafusion_datasource::TableSchemaBuilder;

let session_ctx = SessionContext::new();
let task_ctx = session_ctx.task_ctx();
Expand Down Expand Up @@ -400,7 +400,7 @@ mod tests {
quote: b'"',
..Default::default()
};
let table_schema = TableSchema::builder(Arc::clone(&file_schema))
let table_schema = TableSchemaBuilder::from(&file_schema)
.with_table_partition_cols(vec![Arc::new(Field::new(
"date",
DataType::Utf8,
Expand Down Expand Up @@ -511,7 +511,7 @@ mod tests {
quote: b'"',
..Default::default()
};
let table_schema = TableSchema::from(Arc::clone(&file_schema));
let table_schema = TableSchema::from(&file_schema);
let source =
Arc::new(CsvSource::new(table_schema.clone()).with_csv_options(options));
let config =
Expand Down
4 changes: 2 additions & 2 deletions datafusion/core/src/datasource/physical_plan/parquet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ mod tests {
use datafusion_datasource::source::DataSourceExec;

use datafusion_datasource::file::FileSource;
use datafusion_datasource::{PartitionedFile, TableSchema};
use datafusion_datasource::{PartitionedFile, TableSchemaBuilder};
use datafusion_datasource_parquet::source::ParquetSource;
use datafusion_datasource_parquet::{
DefaultParquetFileReaderFactory, ParquetFileReaderFactory, ParquetFormat,
Expand Down Expand Up @@ -1642,7 +1642,7 @@ mod tests {
),
]);

let table_schema = TableSchema::builder(Arc::clone(&schema))
let table_schema = TableSchemaBuilder::from(&schema)
.with_table_partition_cols(vec![
Arc::new(Field::new("year", DataType::Utf8, false)),
Arc::new(Field::new("month", DataType::UInt8, false)),
Expand Down
4 changes: 2 additions & 2 deletions datafusion/core/tests/physical_optimizer/projection_pushdown.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use datafusion::datasource::physical_plan::CsvSource;
use datafusion::datasource::source::DataSourceExec;
use datafusion_common::config::{ConfigOptions, CsvOptions};
use datafusion_common::{JoinSide, JoinType, NullEquality, Result, ScalarValue};
use datafusion_datasource::TableSchema;
use datafusion_datasource::TableSchemaBuilder;
use datafusion_datasource::file_scan_config::FileScanConfigBuilder;
use datafusion_execution::object_store::ObjectStoreUrl;
use datafusion_execution::{SendableRecordBatchStream, TaskContext};
Expand Down Expand Up @@ -1574,7 +1574,7 @@ fn partitioned_data_source() -> Arc<DataSourceExec> {
quote: b'"',
..Default::default()
};
let table_schema = TableSchema::builder(Arc::clone(&file_schema))
let table_schema = TableSchemaBuilder::from(&file_schema)
.with_table_partition_cols(vec![Arc::new(Field::new(
"partition_col",
DataType::Utf8,
Expand Down
4 changes: 2 additions & 2 deletions datafusion/datasource-arrow/src/file_format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ use datafusion_common::{
internal_datafusion_err, not_impl_err,
};
use datafusion_common_runtime::{JoinSet, SpawnedTask};
use datafusion_datasource::TableSchema;
use datafusion_datasource::display::FileGroupDisplay;
use datafusion_datasource::file::FileSource;
use datafusion_datasource::file_scan_config::{FileScanConfig, FileScanConfigBuilder};
use datafusion_datasource::sink::{DataSink, DataSinkExec};
use datafusion_datasource::write::{
ObjectWriterBuilder, SharedBuffer, get_writer_schema,
};
use datafusion_datasource::{TableSchema, TableSchemaBuilder};
use datafusion_execution::{SendableRecordBatchStream, TaskContext};
use datafusion_expr::dml::InsertOp;
use datafusion_physical_expr_common::sort_expr::LexRequirement;
Expand Down Expand Up @@ -197,7 +197,7 @@ impl FileFormat for ArrowFormat {
.object_meta
.location;

let table_schema = TableSchema::builder(Arc::clone(conf.file_schema()))
let table_schema = TableSchemaBuilder::from(conf.file_schema())
.with_table_partition_cols(conf.table_partition_cols().clone())
.build();

Expand Down
10 changes: 5 additions & 5 deletions datafusion/datasource-parquet/src/opener/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1415,7 +1415,7 @@ mod test {
stats::Precision,
};
use datafusion_datasource::morsel::{Morsel, Morselizer};
use datafusion_datasource::{PartitionedFile, TableSchema};
use datafusion_datasource::{PartitionedFile, TableSchema, TableSchemaBuilder};
use datafusion_expr::{col, lit};
use datafusion_physical_expr::{
PhysicalExpr,
Expand Down Expand Up @@ -1882,7 +1882,7 @@ mod test {
Field::new("a", DataType::Int32, false),
]));

let table_schema_for_opener = TableSchema::builder(file_schema.clone())
let table_schema_for_opener = TableSchemaBuilder::from(&file_schema)
.with_table_partition_cols(vec![Arc::new(Field::new(
"part",
DataType::Int32,
Expand Down Expand Up @@ -1954,7 +1954,7 @@ mod test {
Field::new("a", DataType::Int32, false),
Field::new("b", DataType::Float32, true),
]));
let table_schema_for_opener = TableSchema::builder(file_schema.clone())
let table_schema_for_opener = TableSchemaBuilder::from(&file_schema)
.with_table_partition_cols(vec![Arc::new(Field::new(
"part",
DataType::Int32,
Expand Down Expand Up @@ -2029,7 +2029,7 @@ mod test {
Field::new("a", DataType::Int32, false),
]));

let table_schema_for_opener = TableSchema::builder(file_schema.clone())
let table_schema_for_opener = TableSchemaBuilder::from(&file_schema)
.with_table_partition_cols(vec![Arc::new(Field::new(
"part",
DataType::Int32,
Expand Down Expand Up @@ -2113,7 +2113,7 @@ mod test {
Field::new("part", DataType::Int32, false),
]));

let table_schema_for_opener = TableSchema::builder(file_schema.clone())
let table_schema_for_opener = TableSchemaBuilder::from(&file_schema)
.with_table_partition_cols(vec![Arc::new(Field::new(
"part",
DataType::Int32,
Expand Down
Loading
Loading