Skip to content

Apache DataFusion SQL Query Engine

chore: enforce lint rule `clippy::needless_pass_by_value` to `datafusion-datasource-avro` (#18641)

Alan Tang377c0fce481d
diff --git a/datafusion/datasource-avro/src/avro_to_arrow/reader.rs b/datafusion/datasource-avro/src/avro_to_arrow/reader.rs
index 5ef35e2bee..bd96b47aea 100644
--- a/datafusion/datasource-avro/src/avro_to_arrow/reader.rs
+++ b/datafusion/datasource-avro/src/avro_to_arrow/reader.rs
@@ -113,7 +113,7 @@ impl ReaderBuilder {
None => Arc::new(super::read_avro_schema_from_reader(&mut source)?),
};
source.rewind()?;
- Reader::try_new(source, schema, self.batch_size, self.projection)
+ Reader::try_new(source, &schema, self.batch_size, self.projection.as_ref())
}
}
@@ -135,12 +135,12 @@ impl<R: Read> Reader<'_, R> {
/// useful if plucking values from a struct, e.g. getting `a.b.c.e` from `a.b.c.{d, e}`.
pub fn try_new(
reader: R,
- schema: SchemaRef,
+ schema: &SchemaRef,
batch_size: usize,
- projection: Option<Vec<String>>,
+ projection: Option<&Vec<String>>,
) -> Result<Self> {
let projected_schema = projection.as_ref().filter(|p| !p.is_empty()).map_or_else(
- || Arc::clone(&schema),
+ || Arc::clone(schema),
|proj| {
Arc::new(arrow::datatypes::Schema::new(
proj.iter()
diff --git a/datafusion/datasource-avro/src/mod.rs b/datafusion/datasource-avro/src/mod.rs
index ad8ebe1144..ecaf7c78a7 100644
--- a/datafusion/datasource-avro/src/mod.rs
+++ b/datafusion/datasource-avro/src/mod.rs
@@ -23,6 +23,8 @@
// Make sure fast / cheap clones on Arc are explicit:
// https://github.com/apache/datafusion/issues/11143
#![cfg_attr(not(test), deny(clippy::clone_on_ref_ptr))]
+#![deny(clippy::needless_pass_by_value)]
+#![cfg_attr(test, allow(clippy::needless_pass_by_value))]
//! An [Avro](https://avro.apache.org/) based [`FileSource`](datafusion_datasource::file::FileSource) implementation and related functionality.
diff --git a/datafusion/datasource-avro/src/source.rs b/datafusion/datasource-avro/src/source.rs
index 9859e11e25..600dbed21c 100644
--- a/datafusion/datasource-avro/src/source.rs
+++ b/datafusion/datasource-avro/src/source.rs
@@ -61,9 +61,9 @@ impl AvroSource {
fn open<R: std::io::Read>(&self, reader: R) -> Result<AvroReader<'static, R>> {
AvroReader::try_new(
reader,
- Arc::clone(self.table_schema.file_schema()),
+ &Arc::clone(self.table_schema.file_schema()),
self.batch_size.expect("Batch size must set before open"),
- self.projection.clone(),
+ self.projection.clone().as_ref(),
)
}
}