Skip to content

Don't require boxing ChunkedArray chunk iterators #9918

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

Open
robert3005 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Don't require boxing ChunkedArray chunk iterators #9918

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
14 changes: 6 additions & 8 deletions vortex-array/src/arrays/chunked/array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,18 @@ pub trait ChunkedArrayExt: TypedArrayRef<Chunked> {
.vortex_expect("validated chunk slot")
}

fn iter_chunks<'a>(&'a self) -> Box<dyn Iterator<Item = &'a ArrayRef> + 'a> {
Box::new(
self.as_ref().slots()[ChunkedSlots::CHUNKS_OFFSET..]
.iter()
.map(|slot| slot.as_ref().vortex_expect("validated chunk slot")),
)
fn iter_chunks(&self) -> impl Iterator<Item = &ArrayRef> {
self.as_ref().slots()[ChunkedSlots::CHUNKS_OFFSET..]
.iter()
.map(|slot| slot.as_ref().vortex_expect("validated chunk slot"))
}

fn chunks(&self) -> Vec<ArrayRef> {
self.iter_chunks().cloned().collect()
}

fn non_empty_chunks<'a>(&'a self) -> Box<dyn Iterator<Item = &'a ArrayRef> + 'a> {
Box::new(self.iter_chunks().filter(|chunk| !chunk.is_empty()))
fn non_empty_chunks(&self) -> impl Iterator<Item = &ArrayRef> {
self.iter_chunks().filter(|chunk| !chunk.is_empty())
}

/// Returns the cached chunk boundary offsets.
Expand Down
Loading