Skip to content
Open
Changes from 1 commit
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
38 changes: 37 additions & 1 deletion arrow-row/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1415,7 +1415,7 @@ impl DoubleEndedIterator for RowsIter<'_> {
return None;
}
// Safety: We have checked that `start` is less than `end`
let row = unsafe { self.rows.row_unchecked(self.end) };
let row = unsafe { self.rows.row_unchecked(self.end - 1) };
self.end -= 1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we just move the self.end decrement above the original unsafe block?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, done

Some(row)
}
Expand Down Expand Up @@ -5651,4 +5651,40 @@ mod tests {
.contains("not yet implemented")
);
}

#[test]
fn empty_row_iter_next_back() {
let rows = RowConverter::new(vec![SortField::new(DataType::UInt8)])
.unwrap()
.empty_rows(0, 0);
let mut rows_iter = rows.iter();
assert_eq!(rows_iter.next_back(), None);
assert_eq!(rows_iter.next_back(), None);
assert_eq!(rows_iter.next_back(), None);
}

#[test]
fn row_iter_next_back() {
let row_converter = RowConverter::new(vec![SortField::new(DataType::UInt8)]).unwrap();
let mut rng = StdRng::seed_from_u64(42);
let array = generate_primitive_array::<UInt8Type>(&mut rng, 100, 0.8);
let rows = row_converter.convert_columns(&[Arc::new(array)]).unwrap();

let mut rows_iter = rows.iter();
let mut bytes: Vec<u8> = vec![];

while let Some(row) = rows_iter.next_back() {
bytes.extend(row.data.iter().rev());
}

bytes.reverse();

assert_eq!(
bytes,
&rows.buffer.as_slice()[..*rows.offsets.last().unwrap()]
);

assert_eq!(rows_iter.next_back(), None);
assert_eq!(rows_iter.next(), None);
}
}
Loading