-
Notifications
You must be signed in to change notification settings - Fork 4k
ARROW-10812: [Rust] Make BooleanArray not a PrimitiveArray #8842
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.
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
Changes from all commits
ebae5af
292f97f
f6c01b9
902179d
4e0c7ae
f07c600
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,307 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| use std::borrow::Borrow; | ||
| use std::iter::{FromIterator, IntoIterator}; | ||
| use std::mem; | ||
| use std::{any::Any, fmt}; | ||
| use std::{convert::From, sync::Arc}; | ||
|
|
||
| use super::*; | ||
| use super::{array::print_long_array, raw_pointer::RawPtrBox}; | ||
| use crate::buffer::{Buffer, MutableBuffer}; | ||
| use crate::memory; | ||
| use crate::util::bit_util; | ||
|
|
||
| /// Array of bools | ||
| pub struct BooleanArray { | ||
| data: ArrayDataRef, | ||
| /// Pointer to the value array. The lifetime of this must be <= to the value buffer | ||
| /// stored in `data`, so it's safe to store. | ||
| raw_values: RawPtrBox<u8>, | ||
| } | ||
|
|
||
| impl fmt::Debug for BooleanArray { | ||
| fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { | ||
| write!(f, "BooleanArray\n[\n")?; | ||
| print_long_array(self, f, |array, index, f| { | ||
| fmt::Debug::fmt(&array.value(index), f) | ||
| })?; | ||
| write!(f, "]") | ||
| } | ||
| } | ||
|
|
||
| impl BooleanArray { | ||
| /// Returns the length of this array. | ||
| pub fn len(&self) -> usize { | ||
| self.data.len() | ||
| } | ||
|
|
||
| /// Returns whether this array is empty. | ||
| pub fn is_empty(&self) -> bool { | ||
| self.data.is_empty() | ||
| } | ||
|
|
||
| /// Returns a raw pointer to the values of this array. | ||
| pub fn raw_values(&self) -> *const u8 { | ||
| unsafe { self.raw_values.get().add(self.data.offset()) } | ||
| } | ||
|
|
||
| /// Returns a slice for the given offset and length | ||
| /// | ||
| /// Note this doesn't do any bound checking, for performance reason. | ||
| pub fn value_slice(&self, offset: usize, len: usize) -> &[u8] { | ||
| let raw = | ||
| unsafe { std::slice::from_raw_parts(self.raw_values().add(offset), len) }; | ||
| &raw[..] | ||
| } | ||
|
|
||
| // Returns a new boolean array builder | ||
| pub fn builder(capacity: usize) -> BooleanBuilder { | ||
| BooleanBuilder::new(capacity) | ||
| } | ||
|
|
||
| /// Returns a `Buffer` holding all the values of this array. | ||
| /// | ||
| /// Note this doesn't take the offset of this array into account. | ||
| pub fn values(&self) -> Buffer { | ||
| self.data.buffers()[0].clone() | ||
| } | ||
|
|
||
| /// Returns the boolean value at index `i`. | ||
| /// | ||
| /// Note this doesn't do any bound checking, for performance reason. | ||
| pub fn value(&self, i: usize) -> bool { | ||
| let offset = i + self.offset(); | ||
| unsafe { bit_util::get_bit_raw(self.raw_values.get() as *const u8, offset) } | ||
| } | ||
| } | ||
|
|
||
| impl Array for BooleanArray { | ||
| fn as_any(&self) -> &Any { | ||
| self | ||
| } | ||
|
|
||
| fn data(&self) -> ArrayDataRef { | ||
| self.data.clone() | ||
| } | ||
|
|
||
| fn data_ref(&self) -> &ArrayDataRef { | ||
| &self.data | ||
| } | ||
|
|
||
| /// Returns the total number of bytes of memory occupied by the buffers owned by this [BooleanArray]. | ||
| fn get_buffer_memory_size(&self) -> usize { | ||
| self.data.get_buffer_memory_size() | ||
| } | ||
|
|
||
| /// Returns the total number of bytes of memory occupied physically by this [BooleanArray]. | ||
| fn get_array_memory_size(&self) -> usize { | ||
| self.data.get_array_memory_size() + mem::size_of_val(self) | ||
| } | ||
| } | ||
|
|
||
| impl From<Vec<bool>> for BooleanArray { | ||
| fn from(data: Vec<bool>) -> Self { | ||
| let mut mut_buf = MutableBuffer::new_null(data.len()); | ||
| { | ||
| let mut_slice = mut_buf.data_mut(); | ||
| for (i, b) in data.iter().enumerate() { | ||
| if *b { | ||
| bit_util::set_bit(mut_slice, i); | ||
| } | ||
| } | ||
| } | ||
| let array_data = ArrayData::builder(DataType::Boolean) | ||
| .len(data.len()) | ||
| .add_buffer(mut_buf.freeze()) | ||
| .build(); | ||
| BooleanArray::from(array_data) | ||
| } | ||
| } | ||
|
|
||
| impl From<Vec<Option<bool>>> for BooleanArray { | ||
| fn from(data: Vec<Option<bool>>) -> Self { | ||
| BooleanArray::from_iter(data.iter()) | ||
| } | ||
| } | ||
|
|
||
| impl From<ArrayDataRef> for BooleanArray { | ||
| fn from(data: ArrayDataRef) -> Self { | ||
| assert_eq!( | ||
| data.buffers().len(), | ||
| 1, | ||
| "BooleanArray data should contain a single buffer only (values buffer)" | ||
| ); | ||
| let raw_values = data.buffers()[0].raw_data(); | ||
| assert!( | ||
| memory::is_aligned::<u8>(raw_values, mem::align_of::<bool>()), | ||
| "memory is not aligned" | ||
| ); | ||
| Self { | ||
| data, | ||
| raw_values: RawPtrBox::new(raw_values as *const u8), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl<'a> IntoIterator for &'a BooleanArray { | ||
| type Item = Option<bool>; | ||
| type IntoIter = BooleanIter<'a>; | ||
|
|
||
| fn into_iter(self) -> Self::IntoIter { | ||
| BooleanIter::<'a>::new(self) | ||
| } | ||
| } | ||
|
|
||
| impl<'a> BooleanArray { | ||
| /// constructs a new iterator | ||
| pub fn iter(&'a self) -> BooleanIter<'a> { | ||
| BooleanIter::<'a>::new(&self) | ||
| } | ||
| } | ||
|
|
||
| impl<Ptr: Borrow<Option<bool>>> FromIterator<Ptr> for BooleanArray { | ||
| fn from_iter<I: IntoIterator<Item = Ptr>>(iter: I) -> Self { | ||
|
||
| let iter = iter.into_iter(); | ||
| let (_, data_len) = iter.size_hint(); | ||
| let data_len = data_len.expect("Iterator must be sized"); // panic if no upper bound. | ||
|
|
||
| let num_bytes = bit_util::ceil(data_len, 8); | ||
| let mut null_buf = MutableBuffer::new(num_bytes).with_bitset(num_bytes, false); | ||
| let mut val_buf = MutableBuffer::new(num_bytes).with_bitset(num_bytes, false); | ||
|
|
||
| let data = unsafe { | ||
| std::slice::from_raw_parts_mut(val_buf.raw_data_mut(), val_buf.capacity()) | ||
| }; | ||
|
|
||
| let null_slice = null_buf.data_mut(); | ||
| iter.enumerate().for_each(|(i, item)| { | ||
| if let Some(a) = item.borrow() { | ||
| bit_util::set_bit(null_slice, i); | ||
| if *a { | ||
| bit_util::set_bit(data, i); | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| let data = ArrayData::new( | ||
| DataType::Boolean, | ||
| data_len, | ||
| None, | ||
| Some(null_buf.freeze()), | ||
| 0, | ||
| vec![val_buf.freeze()], | ||
| vec![], | ||
| ); | ||
| BooleanArray::from(Arc::new(data)) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
jorgecarleitao marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| use super::*; | ||
|
|
||
| use crate::buffer::Buffer; | ||
| use crate::datatypes::DataType; | ||
|
|
||
| #[test] | ||
| fn test_boolean_fmt_debug() { | ||
| let arr = BooleanArray::from(vec![true, false, false]); | ||
| assert_eq!( | ||
| "BooleanArray\n[\n true,\n false,\n false,\n]", | ||
| format!("{:?}", arr) | ||
| ); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_boolean_with_null_fmt_debug() { | ||
| let mut builder = BooleanArray::builder(3); | ||
| builder.append_value(true).unwrap(); | ||
| builder.append_null().unwrap(); | ||
| builder.append_value(false).unwrap(); | ||
| let arr = builder.finish(); | ||
| assert_eq!( | ||
| "BooleanArray\n[\n true,\n null,\n false,\n]", | ||
| format!("{:?}", arr) | ||
| ); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_boolean_array_from_vec() { | ||
| let buf = Buffer::from([10_u8]); | ||
| let arr = BooleanArray::from(vec![false, true, false, true]); | ||
| assert_eq!(buf, arr.values()); | ||
| assert_eq!(4, arr.len()); | ||
| assert_eq!(0, arr.offset()); | ||
| assert_eq!(0, arr.null_count()); | ||
| for i in 0..4 { | ||
| assert!(!arr.is_null(i)); | ||
| assert!(arr.is_valid(i)); | ||
| assert_eq!(i == 1 || i == 3, arr.value(i), "failed at {}", i) | ||
| } | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_boolean_array_from_vec_option() { | ||
| let buf = Buffer::from([10_u8]); | ||
| let arr = BooleanArray::from(vec![Some(false), Some(true), None, Some(true)]); | ||
| assert_eq!(buf, arr.values()); | ||
| assert_eq!(4, arr.len()); | ||
| assert_eq!(0, arr.offset()); | ||
| assert_eq!(1, arr.null_count()); | ||
| for i in 0..4 { | ||
| if i == 2 { | ||
| assert!(arr.is_null(i)); | ||
| assert!(!arr.is_valid(i)); | ||
| } else { | ||
| assert!(!arr.is_null(i)); | ||
| assert!(arr.is_valid(i)); | ||
| assert_eq!(i == 1 || i == 3, arr.value(i), "failed at {}", i) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_boolean_array_builder() { | ||
| // Test building a boolean array with ArrayData builder and offset | ||
| // 000011011 | ||
| let buf = Buffer::from([27_u8]); | ||
| let buf2 = buf.clone(); | ||
| let data = ArrayData::builder(DataType::Boolean) | ||
| .len(5) | ||
| .offset(2) | ||
| .add_buffer(buf) | ||
| .build(); | ||
| let arr = BooleanArray::from(data); | ||
| assert_eq!(buf2, arr.values()); | ||
| assert_eq!(5, arr.len()); | ||
| assert_eq!(2, arr.offset()); | ||
| assert_eq!(0, arr.null_count()); | ||
| for i in 0..3 { | ||
| assert_eq!(i != 0, arr.value(i), "failed at {}", i); | ||
| } | ||
| } | ||
|
|
||
| #[test] | ||
| #[should_panic(expected = "BooleanArray data should contain a single buffer only \ | ||
| (values buffer)")] | ||
| fn test_boolean_array_invalid_buffer_len() { | ||
| let data = ArrayData::builder(DataType::Boolean).len(5).build(); | ||
| BooleanArray::from(data); | ||
| } | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it be possible/better to have one for slices instead of Vec?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried to keep it the same to how all the other ones are, however, I agree with you that we should change them. Do you think we could make it on a separate PR, where we apply it to all of them?
Note also that in general it is preferable to use
From<Iterator>, as we avoid a double allocation (Vec+Buffer)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we could do that in a separate PR!