Skip to content
This repository has been archived by the owner on Feb 18, 2024. It is now read-only.

Removed un-needed generic parameter #927

Merged
merged 1 commit into from
Mar 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 7 additions & 15 deletions src/io/parquet/read/deserialize/primitive/basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,16 @@ use super::super::utils::OptionalPageValidity;
use super::super::DataPages;

#[derive(Debug)]
pub(super) struct Values<'a, P>
where
P: ParquetNativeType,
{
pub(super) struct Values<'a> {
pub values: std::slice::ChunksExact<'a, u8>,
phantom: std::marker::PhantomData<P>,
}

impl<'a, P> Values<'a, P>
where
P: ParquetNativeType,
{
pub fn new(page: &'a DataPage) -> Self {
impl<'a> Values<'a> {
pub fn new<P: ParquetNativeType>(page: &'a DataPage) -> Self {
let (_, _, values) = utils::split_buffer(page);
assert_eq!(values.len() % std::mem::size_of::<P>(), 0);
Self {
values: values.chunks_exact(std::mem::size_of::<P>()),
phantom: std::marker::PhantomData,
}
}

Expand Down Expand Up @@ -80,8 +72,8 @@ enum State<'a, P>
where
P: ParquetNativeType,
{
Optional(OptionalPageValidity<'a>, Values<'a, P>),
Required(Values<'a, P>),
Optional(OptionalPageValidity<'a>, Values<'a>),
Required(Values<'a>),
RequiredDictionary(ValuesDictionary<'a, P>),
OptionalDictionary(OptionalPageValidity<'a>, ValuesDictionary<'a, P>),
}
Expand Down Expand Up @@ -162,11 +154,11 @@ where
}
(Encoding::Plain, _, true) => {
let validity = OptionalPageValidity::new(page);
let values = Values::new(page);
let values = Values::new::<P>(page);

Ok(State::Optional(validity, values))
}
(Encoding::Plain, _, false) => Ok(State::Required(Values::new(page))),
(Encoding::Plain, _, false) => Ok(State::Required(Values::new::<P>(page))),
_ => Err(utils::not_implemented(
&page.encoding(),
is_optional,
Expand Down
8 changes: 4 additions & 4 deletions src/io/parquet/read/deserialize/primitive/nested.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ enum State<'a, P>
where
P: ParquetNativeType,
{
Optional(Optional<'a>, Values<'a, P>),
Required(Values<'a, P>),
Optional(Optional<'a>, Values<'a>),
Required(Values<'a>),
RequiredDictionary(ValuesDictionary<'a, P>),
OptionalDictionary(Optional<'a>, ValuesDictionary<'a, P>),
}
Expand Down Expand Up @@ -96,9 +96,9 @@ where
))
}
(Encoding::Plain, _, true) => {
Ok(State::Optional(Optional::new(page), Values::new(page)))
Ok(State::Optional(Optional::new(page), Values::new::<P>(page)))
}
(Encoding::Plain, _, false) => Ok(State::Required(Values::new(page))),
(Encoding::Plain, _, false) => Ok(State::Required(Values::new::<P>(page))),
_ => Err(utils::not_implemented(
&page.encoding(),
is_optional,
Expand Down