From 4b54d2bfc826f3d97becf3b24ffb04eac98776c4 Mon Sep 17 00:00:00 2001 From: Raphael Taylor-Davies Date: Thu, 2 Jun 2022 08:28:45 +0100 Subject: [PATCH 1/2] csv::infer_file_schema remove redundant ref --- arrow/src/csv/reader.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arrow/src/csv/reader.rs b/arrow/src/csv/reader.rs index d8841964b586..631932968496 100644 --- a/arrow/src/csv/reader.rs +++ b/arrow/src/csv/reader.rs @@ -120,7 +120,7 @@ pub struct ReaderOptions { /// Return inferred schema and number of records used for inference. This function does not change /// reader cursor offset. pub fn infer_file_schema( - reader: &mut R, + reader: R, delimiter: u8, max_read_records: Option, has_header: bool, @@ -136,7 +136,7 @@ pub fn infer_file_schema( } fn infer_file_schema_with_csv_options( - reader: &mut R, + mut reader: R, roptoins: ReaderOptions, ) -> Result<(Schema, usize)> { let saved_offset = reader.seek(SeekFrom::Current(0))?; @@ -155,7 +155,7 @@ fn infer_file_schema_with_csv_options( /// /// Return infered schema and number of records used for inference. pub fn infer_reader_schema( - reader: &mut R, + reader: R, delimiter: u8, max_read_records: Option, has_header: bool, @@ -170,7 +170,7 @@ pub fn infer_reader_schema( } fn infer_reader_schema_with_csv_options( - reader: &mut R, + reader: R, roptions: ReaderOptions, ) -> Result<(Schema, usize)> { let mut csv_reader = Reader::build_csv_reader( From 9ae2b2c8856749cb7c768da0539204d001e3a031 Mon Sep 17 00:00:00 2001 From: Raphael Taylor-Davies Date: Thu, 2 Jun 2022 09:32:15 +0100 Subject: [PATCH 2/2] Fix compile --- arrow/src/csv/reader.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arrow/src/csv/reader.rs b/arrow/src/csv/reader.rs index 631932968496..ae9f3dd229c5 100644 --- a/arrow/src/csv/reader.rs +++ b/arrow/src/csv/reader.rs @@ -137,11 +137,12 @@ pub fn infer_file_schema( fn infer_file_schema_with_csv_options( mut reader: R, - roptoins: ReaderOptions, + roptions: ReaderOptions, ) -> Result<(Schema, usize)> { let saved_offset = reader.seek(SeekFrom::Current(0))?; - let (schema, records_count) = infer_reader_schema_with_csv_options(reader, roptoins)?; + let (schema, records_count) = + infer_reader_schema_with_csv_options(&mut reader, roptions)?; // return the reader seek back to the start reader.seek(SeekFrom::Start(saved_offset))?;