Removed from_data from all arrays (jorgecarleitao#1328)

Removed from_data
ritchie46 · Apr 5, 2023 · f210723 · f210723
1 parent cbf28db
commit f210723
Show file tree

Hide file tree

Showing 65 changed files with 506 additions and 639 deletions.
diff --git a/arrow-pyarrow-integration-testing/src/c_stream.rs b/arrow-pyarrow-integration-testing/src/c_stream.rs
@@ -32,7 +32,7 @@ pub fn to_rust_iterator(ob: PyObject, py: Python) -> PyResult<Vec<PyObject>> {
 pub fn from_rust_iterator(py: Python) -> PyResult<PyObject> {
     // initialize an array
     let array = Int32Array::from(&[Some(2), None, Some(1), None]);
-    let array = StructArray::from_data(
+    let array = StructArray::new(
         DataType::Struct(vec![Field::new("a", array.data_type().clone(), true)]),
         vec![array.boxed()],
         None,

diff --git a/benches/filter_kernels.rs b/benches/filter_kernels.rs
@@ -37,7 +37,7 @@ fn add_benchmark(c: &mut Criterion) {
 
         let filter_array = create_boolean_array(size, 0.0, 0.9);
         let filter_array =
-            BooleanArray::from_data(DataType::Boolean, filter_array.values().clone(), None);
+            BooleanArray::new(DataType::Boolean, filter_array.values().clone(), None);
 
         let arr_a = create_primitive_array::<f32>(size, 0.0);
         c.bench_function(&format!("filter 2^{} f32", log2_size), |b| {

diff --git a/benches/iter_list.rs b/benches/iter_list.rs
@@ -14,7 +14,7 @@ fn add_benchmark(c: &mut Criterion) {
         let size = 2usize.pow(log2_size);
 
         let values = Buffer::from_iter(0..size as i32);
-        let values = PrimitiveArray::<i32>::from_data(DataType::Int32, values, None);
+        let values = PrimitiveArray::<i32>::new(DataType::Int32, values, None);
 
         let offsets = (0..=size as i32).step_by(2).collect::<Vec<_>>();
 
@@ -23,7 +23,7 @@ fn add_benchmark(c: &mut Criterion) {
             .collect::<Bitmap>();
 
         let data_type = ListArray::<i32>::default_datatype(DataType::Int32);
-        let array = ListArray::<i32>::from_data(
+        let array = ListArray::<i32>::new(
             data_type,
             offsets.try_into().unwrap(),
             Box::new(values),

diff --git a/guide/src/high_level.md b/guide/src/high_level.md
@@ -253,7 +253,7 @@ where
     let values = array.values().iter().map(|v| op(*v)).collect::<Vec<_>>();
 
     // create the new array, cloning its validity
-    PrimitiveArray::<O>::from_data(data_type.clone(), values.into(), array.validity().cloned())
+    PrimitiveArray::<O>::new(data_type.clone(), values.into(), array.validity().cloned())
 }
 ```
 

diff --git a/src/array/binary/mod.rs b/src/array/binary/mod.rs
@@ -6,7 +6,7 @@ use crate::{
     buffer::Buffer,
     datatypes::DataType,
     error::Error,
-    offset::{Offset, OffsetsBuffer},
+    offset::{Offset, Offsets, OffsetsBuffer},
     trusted_len::TrustedLen,
 };
 
@@ -273,12 +273,15 @@ impl<O: Offset> BinaryArray<O> {
                         mutable_values.into(),
                         Some(mutable_bitmap.into()),
                     )),
-                    (Some(values), Some(offsets)) => Right(MutableBinaryArray::from_data(
-                        self.data_type,
-                        offsets,
-                        values,
-                        Some(mutable_bitmap),
-                    )),
+                    (Some(values), Some(offsets)) => Right(
+                        MutableBinaryArray::try_new(
+                            self.data_type,
+                            offsets,
+                            values,
+                            Some(mutable_bitmap),
+                        )
+                        .unwrap(),
+                    ),
                 },
             }
         } else {
@@ -304,12 +307,9 @@ impl<O: Offset> BinaryArray<O> {
                     values.into(),
                     None,
                 )),
-                (Some(values), Some(offsets)) => Right(MutableBinaryArray::from_data(
-                    self.data_type,
-                    offsets,
-                    values,
-                    None,
-                )),
+                (Some(values), Some(offsets)) => Right(
+                    MutableBinaryArray::try_new(self.data_type, offsets, values, None).unwrap(),
+                ),
             }
         }
     }
@@ -324,7 +324,7 @@ impl<O: Offset> BinaryArray<O> {
     pub fn new_null(data_type: DataType, length: usize) -> Self {
         Self::new(
             data_type,
-            vec![O::default(); 1 + length].try_into().unwrap(),
+            Offsets::new_zeroed(length).into(),
             Buffer::new(),
             Some(Bitmap::new_zeroed(length)),
         )
@@ -413,16 +413,6 @@ impl<O: Offset> BinaryArray<O> {
         // soundness: I: TrustedLen
         unsafe { Self::try_from_trusted_len_iter_unchecked(iter) }
     }
-
-    /// Alias for `new`
-    pub fn from_data(
-        data_type: DataType,
-        offsets: OffsetsBuffer<O>,
-        values: Buffer<u8>,
-        validity: Option<Bitmap>,
-    ) -> Self {
-        Self::new(data_type, offsets, values, validity)
-    }
 }
 
 impl<O: Offset> Array for BinaryArray<O> {

diff --git a/src/array/binary/mutable.rs b/src/array/binary/mutable.rs
@@ -160,16 +160,6 @@ impl<O: Offset> MutableBinaryArray<O> {
             validity.shrink_to_fit()
         }
     }
-
-    /// Equivalent to `Self::try_new(...).unwrap()`
-    pub fn from_data(
-        data_type: DataType,
-        offsets: Offsets<O>,
-        values: Vec<u8>,
-        validity: Option<MutableBitmap>,
-    ) -> Self {
-        Self::try_new(data_type, offsets, values, validity).unwrap()
-    }
 }
 
 impl<O: Offset> MutableBinaryArray<O> {
@@ -204,25 +194,13 @@ impl<O: Offset> MutableArray for MutableBinaryArray<O> {
     }
 
     fn as_box(&mut self) -> Box<dyn Array> {
-        let (data_type, offsets, values) = std::mem::take(&mut self.values).into_inner();
-        BinaryArray::new(
-            data_type,
-            offsets.into(),
-            values.into(),
-            std::mem::take(&mut self.validity).map(|x| x.into()),
-        )
-        .boxed()
+        let array: BinaryArray<O> = std::mem::take(self).into();
+        array.boxed()
     }
 
     fn as_arc(&mut self) -> Arc<dyn Array> {
-        let (data_type, offsets, values) = std::mem::take(&mut self.values).into_inner();
-        BinaryArray::new(
-            data_type,
-            offsets.into(),
-            values.into(),
-            std::mem::take(&mut self.validity).map(|x| x.into()),
-        )
-        .arced()
+        let array: BinaryArray<O> = std::mem::take(self).into();
+        array.arced()
     }
 
     fn data_type(&self) -> &DataType {
@@ -270,7 +248,7 @@ impl<O: Offset> MutableBinaryArray<O> {
     {
         let (validity, offsets, values) = trusted_len_unzip(iterator);
 
-        Self::from_data(Self::default_data_type(), offsets, values, validity)
+        Self::try_new(Self::default_data_type(), offsets, values, validity).unwrap()
     }
 
     /// Creates a [`MutableBinaryArray`] from an iterator of trusted length.
@@ -293,7 +271,7 @@ impl<O: Offset> MutableBinaryArray<O> {
         iterator: I,
     ) -> Self {
         let (offsets, values) = trusted_len_values_iter(iterator);
-        Self::from_data(Self::default_data_type(), offsets, values, None)
+        Self::try_new(Self::default_data_type(), offsets, values, None).unwrap()
     }
 
     /// Creates a new [`BinaryArray`] from a [`TrustedLen`] of `&[u8]`.
@@ -326,12 +304,7 @@ impl<O: Offset> MutableBinaryArray<O> {
             validity = None;
         }
 
-        Ok(Self::from_data(
-            Self::default_data_type(),
-            offsets,
-            values,
-            validity,
-        ))
+        Ok(Self::try_new(Self::default_data_type(), offsets, values, validity).unwrap())
     }
 
     /// Creates a [`MutableBinaryArray`] from an falible iterator of trusted length.
@@ -427,7 +400,7 @@ impl<O: Offset> MutableBinaryArray<O> {
     /// Creates a new [`MutableBinaryArray`] from a [`Iterator`] of `&[u8]`.
     pub fn from_iter_values<T: AsRef<[u8]>, I: Iterator<Item = T>>(iterator: I) -> Self {
         let (offsets, values) = values_iter(iterator);
-        Self::from_data(Self::default_data_type(), offsets, values, None)
+        Self::try_new(Self::default_data_type(), offsets, values, None).unwrap()
     }
 }
 

diff --git a/src/array/binary/mutable_values.rs b/src/array/binary/mutable_values.rs
@@ -37,7 +37,8 @@ impl<O: Offset> From<MutableBinaryValuesArray<O>> for BinaryArray<O> {
 
 impl<O: Offset> From<MutableBinaryValuesArray<O>> for MutableBinaryArray<O> {
     fn from(other: MutableBinaryValuesArray<O>) -> Self {
-        MutableBinaryArray::<O>::from_data(other.data_type, other.offsets, other.values, None)
+        MutableBinaryArray::<O>::try_new(other.data_type, other.offsets, other.values, None)
+            .expect("MutableBinaryValuesArray is consistent with MutableBinaryArray")
     }
 }
 

diff --git a/src/array/boolean/mod.rs b/src/array/boolean/mod.rs
@@ -85,6 +85,11 @@ impl BooleanArray {
         })
     }
 
+    /// Alias to `Self::try_new().unwrap()`
+    pub fn new(data_type: DataType, values: Bitmap, validity: Option<Bitmap>) -> Self {
+        Self::try_new(data_type, values, validity).unwrap()
+    }
+
     /// Returns an iterator over the optional values of this [`BooleanArray`].
     #[inline]
     pub fn iter(&self) -> ZipValidity<bool, BitmapIter, BitmapIter> {
@@ -246,21 +251,18 @@ impl BooleanArray {
                         immutable,
                         Some(mutable_bitmap.into()),
                     )),
-                    Right(mutable) => Right(MutableBooleanArray::from_data(
-                        self.data_type,
-                        mutable,
-                        Some(mutable_bitmap),
-                    )),
+                    Right(mutable) => Right(
+                        MutableBooleanArray::try_new(self.data_type, mutable, Some(mutable_bitmap))
+                            .unwrap(),
+                    ),
                 },
             }
         } else {
             match self.values.into_mut() {
                 Left(immutable) => Left(BooleanArray::new(self.data_type, immutable, None)),
-                Right(mutable) => Right(MutableBooleanArray::from_data(
-                    self.data_type,
-                    mutable,
-                    None,
-                )),
+                Right(mutable) => {
+                    Right(MutableBooleanArray::try_new(self.data_type, mutable, None).unwrap())
+                }
             }
         }
     }
@@ -369,20 +371,6 @@ impl BooleanArray {
         } = self;
         (data_type, values, validity)
     }
-
-    /// The canonical method to create a [`BooleanArray`]
-    /// # Panics
-    /// This function errors iff:
-    /// * The validity is not `None` and its length is different from `values`'s length
-    /// * The `data_type`'s [`PhysicalType`] is not equal to [`PhysicalType::Boolean`].
-    pub fn new(data_type: DataType, values: Bitmap, validity: Option<Bitmap>) -> Self {
-        Self::try_new(data_type, values, validity).unwrap()
-    }
-
-    /// Alias for `new`
-    pub fn from_data(data_type: DataType, values: Bitmap, validity: Option<Bitmap>) -> Self {
-        Self::new(data_type, values, validity)
-    }
 }
 
 impl Array for BooleanArray {