Skip to content

Commit 02fa779

Browse files
authored
Migrate parquet to Rust 2024 (#8506)
# Which issue does this PR close? - Contribute to #6827 # Rationale for this change Splitting up #8227. # What changes are included in this PR? Migrate `parquet` to Rust 2024 # Are these changes tested? CI # Are there any user-facing changes? Yes
1 parent 1e03a1b commit 02fa779

File tree

96 files changed

+617
-563
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+617
-563
lines changed

parquet/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ repository = { workspace = true }
2525
authors = { workspace = true }
2626
keywords = ["arrow", "parquet", "hadoop"]
2727
readme = "README.md"
28-
edition = { workspace = true }
28+
edition = "2024"
2929
rust-version = { workspace = true }
3030

3131
[target.'cfg(target_arch = "wasm32")'.dependencies]

parquet/benches/arrow_reader.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ use arrow::array::Array;
1919
use arrow::datatypes::DataType;
2020
use arrow_schema::Field;
2121
use criterion::measurement::WallTime;
22-
use criterion::{criterion_group, criterion_main, BenchmarkGroup, Criterion};
22+
use criterion::{BenchmarkGroup, Criterion, criterion_group, criterion_main};
2323
use half::f16;
2424
use num_bigint::BigInt;
2525
use num_traits::FromPrimitive;
2626
use parquet::arrow::array_reader::{
27-
make_byte_array_reader, make_byte_view_array_reader, make_fixed_len_byte_array_reader,
28-
ListArrayReader,
27+
ListArrayReader, make_byte_array_reader, make_byte_view_array_reader,
28+
make_fixed_len_byte_array_reader,
2929
};
3030
use parquet::basic::Type;
3131
use parquet::data_type::{ByteArray, FixedLenByteArrayType};
@@ -38,7 +38,7 @@ use parquet::{
3838
schema::types::{ColumnDescPtr, SchemaDescPtr},
3939
};
4040
use rand::distr::uniform::SampleUniform;
41-
use rand::{rngs::StdRng, Rng, SeedableRng};
41+
use rand::{Rng, SeedableRng, rngs::StdRng};
4242
use std::{collections::VecDeque, sync::Arc};
4343

4444
fn build_test_schema() -> SchemaDescPtr {

parquet/benches/arrow_reader_clickbench.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ use arrow::compute::{like, nlike, or};
3535
use arrow_array::types::{Int16Type, Int32Type, Int64Type};
3636
use arrow_array::{ArrayRef, ArrowPrimitiveType, BooleanArray, PrimitiveArray, StringViewArray};
3737
use arrow_schema::{ArrowError, DataType, Schema};
38-
use criterion::{criterion_group, criterion_main, Criterion};
38+
use criterion::{Criterion, criterion_group, criterion_main};
3939
use futures::StreamExt;
4040
use parquet::arrow::arrow_reader::{
4141
ArrowPredicate, ArrowPredicateFn, ArrowReaderMetadata, ArrowReaderOptions,

parquet/benches/arrow_reader_row_filter.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ use arrow::compute::and;
5757
use arrow::compute::kernels::cmp::{eq, gt, lt, neq};
5858
use arrow::datatypes::{DataType, Field, Schema, TimeUnit};
5959
use arrow::record_batch::RecordBatch;
60-
use arrow_array::builder::{ArrayBuilder, StringViewBuilder};
6160
use arrow_array::StringViewArray;
61+
use arrow_array::builder::{ArrayBuilder, StringViewBuilder};
6262
use arrow_cast::pretty::pretty_format_batches;
6363
use bytes::Bytes;
64-
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
64+
use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
6565
use futures::future::BoxFuture;
6666
use futures::{FutureExt, StreamExt};
6767
use parquet::arrow::arrow_reader::{
@@ -72,7 +72,7 @@ use parquet::arrow::{ArrowWriter, ParquetRecordBatchStreamBuilder, ProjectionMas
7272
use parquet::basic::Compression;
7373
use parquet::file::metadata::{PageIndexPolicy, ParquetMetaData, ParquetMetaDataReader};
7474
use parquet::file::properties::WriterProperties;
75-
use rand::{rngs::StdRng, Rng, SeedableRng};
75+
use rand::{Rng, SeedableRng, rngs::StdRng};
7676
use std::ops::Range;
7777
use std::sync::Arc;
7878

parquet/benches/arrow_statistics.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ use arrow_schema::{
2323
DataType::{self, *},
2424
Field, Schema,
2525
};
26-
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
26+
use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
2727
use parquet::{arrow::arrow_reader::ArrowReaderOptions, file::properties::WriterProperties};
2828
use parquet::{
29-
arrow::{arrow_reader::ArrowReaderBuilder, ArrowWriter},
29+
arrow::{ArrowWriter, arrow_reader::ArrowReaderBuilder},
3030
file::properties::EnabledStatistics,
3131
};
3232
use std::sync::Arc;

parquet/benches/encoding.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use parquet::basic::{Encoding, Type as ParquetType};
2121
use parquet::data_type::{
2222
DataType, DoubleType, FixedLenByteArray, FixedLenByteArrayType, FloatType,
2323
};
24-
use parquet::decoding::{get_decoder, Decoder};
24+
use parquet::decoding::{Decoder, get_decoder};
2525
use parquet::encoding::get_encoder;
2626
use parquet::schema::types::{ColumnDescPtr, ColumnDescriptor, ColumnPath, Type};
2727
use rand::prelude::*;

parquet/examples/read_with_rowgroup.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use arrow::util::pretty::print_batches;
1919
use bytes::{Buf, Bytes};
2020
use parquet::arrow::arrow_reader::{ParquetRecordBatchReader, RowGroups, RowSelection};
2121
use parquet::arrow::async_reader::AsyncFileReader;
22-
use parquet::arrow::{parquet_to_arrow_field_levels, ProjectionMask};
22+
use parquet::arrow::{ProjectionMask, parquet_to_arrow_field_levels};
2323
use parquet::column::page::{PageIterator, PageReader};
2424
use parquet::errors::{ParquetError, Result};
2525
use parquet::file::metadata::RowGroupMetaData;

parquet/src/arrow/array_reader/builder.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ use std::sync::{Arc, Mutex};
1919

2020
use arrow_schema::{DataType, Fields, SchemaBuilder};
2121

22+
use crate::arrow::ProjectionMask;
2223
use crate::arrow::array_reader::byte_view_array::make_byte_view_array_reader;
2324
use crate::arrow::array_reader::cached_array_reader::CacheRole;
2425
use crate::arrow::array_reader::cached_array_reader::CachedArrayReader;
2526
use crate::arrow::array_reader::empty_array::make_empty_array_reader;
2627
use crate::arrow::array_reader::fixed_len_byte_array::make_fixed_len_byte_array_reader;
2728
use crate::arrow::array_reader::row_group_cache::RowGroupCache;
2829
use crate::arrow::array_reader::{
29-
make_byte_array_dictionary_reader, make_byte_array_reader, ArrayReader,
30-
FixedSizeListArrayReader, ListArrayReader, MapArrayReader, NullArrayReader,
31-
PrimitiveArrayReader, RowGroups, StructArrayReader,
30+
ArrayReader, FixedSizeListArrayReader, ListArrayReader, MapArrayReader, NullArrayReader,
31+
PrimitiveArrayReader, RowGroups, StructArrayReader, make_byte_array_dictionary_reader,
32+
make_byte_array_reader,
3233
};
3334
use crate::arrow::arrow_reader::metrics::ArrowReaderMetrics;
3435
use crate::arrow::schema::{ParquetField, ParquetFieldType};
35-
use crate::arrow::ProjectionMask;
3636
use crate::basic::Type as PhysicalType;
3737
use crate::data_type::{BoolType, DoubleType, FloatType, Int32Type, Int64Type, Int96Type};
3838
use crate::errors::{ParquetError, Result};

parquet/src/arrow/array_reader/byte_array.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
use crate::arrow::array_reader::{read_records, skip_records, ArrayReader};
18+
use crate::arrow::array_reader::{ArrayReader, read_records, skip_records};
1919
use crate::arrow::buffer::bit_util::sign_extend_be;
2020
use crate::arrow::buffer::offset_buffer::OffsetBuffer;
2121
use crate::arrow::decoder::{DeltaByteArrayDecoder, DictIndexDecoder};
@@ -286,7 +286,7 @@ impl ByteArrayDecoder {
286286
return Err(general_err!(
287287
"unsupported encoding for byte array: {}",
288288
encoding
289-
))
289+
));
290290
}
291291
};
292292

parquet/src/arrow/array_reader/byte_array_dictionary.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ use std::any::Any;
1919
use std::marker::PhantomData;
2020
use std::sync::Arc;
2121

22-
use arrow_array::{new_empty_array, Array, ArrayRef, OffsetSizeTrait};
22+
use arrow_array::{Array, ArrayRef, OffsetSizeTrait, new_empty_array};
2323
use arrow_buffer::ArrowNativeType;
2424
use arrow_schema::DataType as ArrowType;
2525
use bytes::Bytes;
2626

2727
use crate::arrow::array_reader::byte_array::{ByteArrayDecoder, ByteArrayDecoderPlain};
28-
use crate::arrow::array_reader::{read_records, skip_records, ArrayReader};
28+
use crate::arrow::array_reader::{ArrayReader, read_records, skip_records};
2929
use crate::arrow::buffer::{dictionary_buffer::DictionaryBuffer, offset_buffer::OffsetBuffer};
3030
use crate::arrow::record_reader::GenericRecordReader;
3131
use crate::arrow::schema::parquet_to_arrow_field;

0 commit comments

Comments
 (0)