Skip to content
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

Fix calculation of nested rep levels #7

Merged
merged 1 commit into from
Dec 21, 2022
Merged

Fix calculation of nested rep levels #7

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
110 changes: 83 additions & 27 deletions src/io/parquet/write/nested/rep.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,58 @@ trait DebugIter: Iterator<Item = usize> + std::fmt::Debug {}

impl<A: Iterator<Item = usize> + std::fmt::Debug> DebugIter for A {}

fn iter<'a>(nested: &'a [Nested]) -> Vec<Box<dyn DebugIter + 'a>> {
enum RepIter<'a> {
Required(Box<dyn DebugIter + 'a>),
Repeated(Box<dyn DebugIter + 'a>),
}

fn iter<'a>(nested: &'a [Nested]) -> Vec<RepIter<'a>> {
nested
.iter()
.filter_map(|nested| match nested {
Nested::Primitive(_, _, _) => None,
Nested::List(nested) => Some(Box::new(to_length(nested.offsets)) as Box<dyn DebugIter>),
Nested::LargeList(nested) => {
Some(Box::new(to_length(nested.offsets)) as Box<dyn DebugIter>)
}
Nested::Struct(_, _, length) => {
Some(Box::new(std::iter::repeat(1usize).take(*length)) as Box<dyn DebugIter>)
Nested::List(nested) => Some(RepIter::Repeated(
Box::new(to_length(nested.offsets)) as Box<dyn DebugIter>
)),
Nested::LargeList(nested) => Some(RepIter::Repeated(
Box::new(to_length(nested.offsets)) as Box<dyn DebugIter>,
)),
Nested::Struct(_, is_optional, length) => {
let iter = Box::new(std::iter::repeat(1usize).take(*length)) as Box<dyn DebugIter>;
// if true {
if *is_optional {
Some(RepIter::Repeated(iter))
} else {
Some(RepIter::Required(iter))
}
}
})
.collect()
}

pub fn num_values(nested: &[Nested]) -> usize {
_num_values(nested, true)
}

fn _num_values(nested: &[Nested], count_required: bool) -> usize {
let iterators = iter(nested);
let depth = iterators.len();

iterators
.into_iter()
.enumerate()
.map(|(index, lengths)| {
let lengths = match lengths {
RepIter::Repeated(i) => i,
RepIter::Required(i) => {
if count_required {
i
} else {
Box::new(std::iter::empty()) as Box<dyn DebugIter>
}
}
};

if index == depth - 1 {
lengths
.map(|length| if length == 0 { 1 } else { length })
Expand Down Expand Up @@ -66,9 +94,16 @@ pub struct RepLevelsIter<'a> {

impl<'a> RepLevelsIter<'a> {
pub fn new(nested: &'a [Nested]) -> Self {
let remaining_values = num_values(nested);
let remaining_values = _num_values(nested, false);

let iter: Vec<_> = iter(nested)
.into_iter()
.flat_map(|i| match i {
RepIter::Repeated(ls) => Some(ls),
_ => None,
})
.collect();

let iter = iter(nested);
let remaining = std::iter::repeat(0).take(iter.len()).collect();

Self {
Expand All @@ -85,25 +120,30 @@ impl<'a> Iterator for RepLevelsIter<'a> {
type Item = u32;

fn next(&mut self) -> Option<Self::Item> {
if *self.remaining.last().unwrap() > 0 {
*self.remaining.last_mut().unwrap() -= 1;

let total = self.total;
self.total = 0;
let r = Some((self.current_level - total) as u32);

for level in 0..self.current_level - 1 {
let level = self.remaining.len() - level - 1;
if self.remaining[level] == 0 {
self.current_level -= 1;
self.remaining[level.saturating_sub(1)] -= 1;
match self.remaining.last() {
Some(v) => {
if *v > 0 {
*self.remaining.last_mut().unwrap() -= 1;

let total = self.total;
self.total = 0;
let r = Some((self.current_level - total) as u32);

for level in 0..self.current_level - 1 {
let level = self.remaining.len() - level - 1;
if self.remaining[level] == 0 {
self.current_level -= 1;
self.remaining[level.saturating_sub(1)] -= 1;
}
}
if self.remaining[0] == 0 {
self.current_level -= 1;
}
self.remaining_values -= 1;
return r;
}
}
if self.remaining[0] == 0 {
self.current_level -= 1;
}
self.remaining_values -= 1;
return r;
None => return None,
}

self.total = 0;
Expand Down Expand Up @@ -151,7 +191,23 @@ mod tests {
Nested::Struct(None, false, 10),
Nested::Primitive(None, true, 10),
];
let expected = vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
let expected = vec![];

test(nested, expected)
}

#[test]
fn struct_required_nested_list() {
let nested = vec![
Nested::Struct(None, false, 5),
Nested::List(ListNested {
is_optional: false,
offsets: &[0i32, 2, 2, 4, 6, 8],
validity: None,
}),
Nested::Primitive(None, false, 10),
];
let expected = vec![0, 1, 0, 0, 1, 0, 1, 0, 1];

test(nested, expected)
}
Expand Down