Minor cleanup of internals. (#456)

src/array/fixed_size_binary/mod.rs

@@ -38,6 +38,10 @@ impl FixedSizeBinaryArray {
 
         assert_eq!(values.len() % size, 0);
 
+        if let Some(ref validity) = validity {
+            assert_eq!(values.len() / size, validity.len());
+        }
+
         Self {
             size,
             data_type,
@@ -132,9 +136,8 @@ impl FixedSizeBinaryArray {
 
 impl FixedSizeBinaryArray {
     pub(crate) fn get_size(data_type: &DataType) -> &i32 {
-        match data_type {
+        match data_type.to_logical_type() {
             DataType::FixedSizeBinary(size) => size,
-            DataType::Extension(_, child, _) => Self::get_size(child),
             _ => panic!("Wrong DataType"),
         }
     }

src/array/fixed_size_list/mod.rs

@@ -16,7 +16,7 @@ pub use mutable::*;
 /// Cloning and slicing this struct is `O(1)`.
 #[derive(Debug, Clone)]
 pub struct FixedSizeListArray {
-    size: i32, // this is redundant with `data_type`, but useful to not have to deconstruct the data_type.
+    size: usize, // this is redundant with `data_type`, but useful to not have to deconstruct the data_type.
     data_type: DataType,
     values: Arc<dyn Array>,
     validity: Option<Bitmap>,
@@ -49,10 +49,14 @@ impl FixedSizeListArray {
     ) -> Self {
         let (_, size) = Self::get_child_and_size(&data_type);
 
-        assert_eq!(values.len() % (*size as usize), 0);
+        assert_eq!(values.len() % size, 0);
+
+        if let Some(ref validity) = validity {
+            assert_eq!(values.len() / size, validity.len());
+        }
 
         Self {
-            size: *size,
+            size,
             data_type,
             values,
             validity,
@@ -118,7 +122,7 @@ impl FixedSizeListArray {
     }
 
     /// Returns the `Vec<T>` at position `i`.
-    /// # Safety:
+    /// # Safety
     /// Caller must ensure that `i < self.len()`
     #[inline]
     pub unsafe fn value_unchecked(&self, i: usize) -> Box<dyn Array> {
@@ -140,15 +144,14 @@ impl FixedSizeListArray {
 }
 
 impl FixedSizeListArray {
-    pub(crate) fn get_child_and_size(data_type: &DataType) -> (&Field, &i32) {
-        match data_type {
-            DataType::FixedSizeList(child, size) => (child.as_ref(), size),
-            DataType::Extension(_, child, _) => Self::get_child_and_size(child),
-            _ => panic!("Wrong DataType"),
+    pub(crate) fn get_child_and_size(data_type: &DataType) -> (&Field, usize) {
+        match data_type.to_logical_type() {
+            DataType::FixedSizeList(child, size) => (child.as_ref(), *size as usize),
+            _ => panic!("FixedSizeListArray expects DataType::FixedSizeList"),
         }
     }
 
-    /// Returns a [`DataType`] consistent with this Array.
+    /// Returns a [`DataType`] consistent with [`FixedSizeListArray`].
     pub fn default_datatype(data_type: DataType, size: usize) -> DataType {
         let field = Box::new(Field::new("item", data_type, true));
         DataType::FixedSizeList(field, size as i32)

src/array/list/mod.rs

@@ -52,6 +52,10 @@ impl<O: Offset> ListArray<O> {
     ) -> Self {
         check_offsets(&offsets, values.len());
 
+        if let Some(ref validity) = validity {
+            assert_eq!(offsets.len() - 1, validity.len());
+        }
+
         // validate data_type
         let child_data_type = Self::get_child_type(&data_type);
         assert_eq!(
@@ -172,16 +176,14 @@ impl<O: Offset> ListArray<O> {
 
     pub fn get_child_field(data_type: &DataType) -> &Field {
         if O::is_large() {
-            match data_type {
+            match data_type.to_logical_type() {
                 DataType::LargeList(child) => child.as_ref(),
-                DataType::Extension(_, child, _) => Self::get_child_field(child),
-                _ => panic!("Wrong DataType"),
+                _ => panic!("ListArray<i64> expects DataType::List or DataType::LargeList"),
             }
         } else {
-            match data_type {
+            match data_type.to_logical_type() {
                 DataType::List(child) => child.as_ref(),
-                DataType::Extension(_, child, _) => Self::get_child_field(child),
-                _ => panic!("Wrong DataType"),
+                _ => panic!("ListArray<i32> expects DataType::List or DataType::List"),
             }
         }
     }

src/array/mod.rs

@@ -442,7 +442,7 @@ fn display_fmt<T: std::fmt::Display, I: IntoIterator<Item = Option<T>>>(
 
 /// Trait that list arrays implement for the purposes of DRY.
 pub trait IterableListArray: Array {
-    /// # Safety:
+    /// # Safety
     /// The caller must ensure that `i < self.len()`
     unsafe fn value_unchecked(&self, i: usize) -> Box<dyn Array>;
 }