vertexclique commented on a change in pull request #8561:
URL: https://github.com/apache/arrow/pull/8561#discussion_r517197699
##########
File path: rust/arrow/src/array/array.rs
##########
@@ -2145,112 +2149,10 @@ pub struct DictionaryArray<K: ArrowPrimitiveType> {
is_ordered: bool,
}
-#[derive(Debug)]
-enum Draining {
- Ready,
- Iterating,
- Finished,
-}
-
-#[derive(Debug)]
-pub struct NullableIter<'a, T> {
- data: &'a ArrayDataRef, // TODO: Use a pointer to the null bitmap.
- ptr: *const T,
- i: usize,
- len: usize,
- draining: Draining,
-}
-
-impl<'a, T> std::iter::Iterator for NullableIter<'a, T>
-where
- T: Clone,
-{
- type Item = Option<T>;
-
- fn next(&mut self) -> Option<Self::Item> {
- let i = self.i;
- if i >= self.len {
- None
- } else if self.data.is_null(i) {
- self.i += 1;
- Some(None)
- } else {
- self.i += 1;
- unsafe { Some(Some((&*self.ptr.add(i)).clone())) }
- }
- }
-
- fn size_hint(&self) -> (usize, Option<usize>) {
- (self.len, Some(self.len))
- }
-
- fn nth(&mut self, n: usize) -> Option<Self::Item> {
- let i = self.i;
- if i + n >= self.len {
- self.i = self.len;
- None
- } else if self.data.is_null(i + n) {
- self.i += n + 1;
- Some(None)
- } else {
- self.i += n + 1;
- unsafe { Some(Some((&*self.ptr.add(i + n)).clone())) }
- }
- }
-}
-
-impl<'a, T> std::iter::DoubleEndedIterator for NullableIter<'a, T>
-where
- T: Clone,
-{
- fn next_back(&mut self) -> Option<Self::Item> {
- match self.draining {
- Draining::Ready => {
- self.draining = Draining::Iterating;
- self.i = self.len - 1;
- self.next_back()
- }
- Draining::Iterating => {
- let i = self.i;
- if i >= self.len {
- None
- } else if self.data.is_null(i) {
- self.i = self.i.checked_sub(1).unwrap_or_else(|| {
- self.draining = Draining::Finished;
- 0_usize
- });
- Some(None)
- } else {
- match i.checked_sub(1) {
- Some(idx) => {
- self.i = idx;
- unsafe { Some(Some((&*self.ptr.add(i)).clone())) }
- }
- _ => {
- self.draining = Draining::Finished;
- unsafe { Some(Some((&*self.ptr).clone())) }
- }
- }
- }
- }
- Draining::Finished => {
- self.draining = Draining::Ready;
- None
- }
- }
- }
-}
-
impl<'a, K: ArrowPrimitiveType> DictionaryArray<K> {
/// Return an iterator to the keys of this dictionary.
- pub fn keys(&self) -> NullableIter<'_, K::Native> {
- NullableIter::<'_, K::Native> {
- data: &self.data,
- ptr: unsafe { self.raw_values.get().add(self.data.offset()) },
- i: 0,
- len: self.data.len(),
- draining: Draining::Ready,
- }
+ pub fn keys(&self) -> &PrimitiveArray<K> {
Review comment:
me too. that's way better.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
