Simplified code (#1183)

src/io/parquet/read/deserialize/binary/dictionary.rs

@@ -7,7 +7,7 @@ use crate::{
     bitmap::MutableBitmap,
     datatypes::{DataType, PhysicalType},
     error::Result,
-    io::parquet::read::deserialize::nested_utils::{InitNested, NestedArrayIter, NestedState},
+    io::parquet::read::deserialize::nested_utils::{InitNested, NestedState},
 };
 
 use super::super::dictionary::*;
@@ -108,6 +108,7 @@ where
     }
 }
 
+/// An iterator adapter that converts [`DataPages`] into an [`Iterator`] of [`DictionaryArray`]
 #[derive(Debug)]
 pub struct NestedDictIter<K, O, I>
 where
@@ -178,25 +179,3 @@ where
         }
     }
 }
-
-/// Converts [`DataPages`] to an [`Iterator`] of [`Array`]
-pub fn iter_to_arrays_nested<'a, K, O, I>(
-    iter: I,
-    init: Vec<InitNested>,
-    data_type: DataType,
-    num_rows: usize,
-    chunk_size: Option<usize>,
-) -> NestedArrayIter<'a>
-where
-    I: 'a + DataPages,
-    O: Offset,
-    K: DictionaryKey,
-{
-    Box::new(
-        NestedDictIter::<K, O, I>::new(iter, init, data_type, num_rows, chunk_size).map(|result| {
-            let (mut nested, array) = result?;
-            let _ = nested.nested.pop().unwrap(); // the primitive
-            Ok((nested, array.boxed()))
-        }),
-    )
-}

src/io/parquet/read/deserialize/binary/mod.rs

@@ -3,7 +3,6 @@ mod dictionary;
 mod nested;
 mod utils;
 
-pub use self::nested::NestedIter;
 pub use basic::Iter;
-pub use dictionary::{iter_to_arrays_nested as iter_to_dict_arrays_nested, DictIter};
-pub use nested::iter_to_arrays_nested;
+pub use dictionary::{DictIter, NestedDictIter};
+pub use nested::NestedIter;

src/io/parquet/read/deserialize/binary/nested.rs

@@ -6,7 +6,6 @@ use parquet2::{
     schema::Repetition,
 };
 
-use crate::array::Array;
 use crate::{
     array::Offset, bitmap::MutableBitmap, datatypes::DataType, error::Result,
     io::parquet::read::DataPages,
@@ -194,27 +193,3 @@ impl<O: Offset, A: TraitBinaryArray<O>, I: DataPages> Iterator for NestedIter<O,
         }
     }
 }
-
-/// Converts [`DataPages`] to an [`Iterator`] of [`TraitBinaryArray`]
-pub fn iter_to_arrays_nested<'a, O, A, I>(
-    iter: I,
-    init: Vec<InitNested>,
-    data_type: DataType,
-    num_rows: usize,
-    chunk_size: Option<usize>,
-) -> NestedArrayIter<'a>
-where
-    I: 'a + DataPages,
-    A: TraitBinaryArray<O>,
-    O: Offset,
-{
-    Box::new(
-        NestedIter::<O, A, I>::new(iter, init, data_type, num_rows, chunk_size).map(|x| {
-            x.map(|(mut nested, array)| {
-                let _ = nested.nested.pop().unwrap(); // the primitive
-                let values = Box::new(array) as Box<dyn Array>;
-                (nested, values)
-            })
-        }),
-    )
-}

src/io/parquet/read/deserialize/boolean/mod.rs

@@ -2,4 +2,4 @@ mod basic;
 mod nested;
 
 pub use self::basic::Iter;
-pub use nested::iter_to_arrays_nested;
+pub use nested::NestedIter;

src/io/parquet/read/deserialize/boolean/nested.rs

@@ -147,22 +147,3 @@ impl<I: DataPages> Iterator for NestedIter<I> {
         }
     }
 }
-
-/// Converts [`DataPages`] to an [`Iterator`] of [`BooleanArray`]
-pub fn iter_to_arrays_nested<'a, I: 'a>(
-    iter: I,
-    init: Vec<InitNested>,
-    num_rows: usize,
-    chunk_size: Option<usize>,
-) -> NestedArrayIter<'a>
-where
-    I: DataPages,
-{
-    Box::new(NestedIter::new(iter, init, num_rows, chunk_size).map(|x| {
-        x.map(|(mut nested, array)| {
-            let _ = nested.nested.pop().unwrap(); // the primitive
-            let values = array.boxed();
-            (nested, values)
-        })
-    }))
-}

src/io/parquet/read/deserialize/fixed_size_binary/dictionary.rs

@@ -7,7 +7,7 @@ use crate::{
     bitmap::MutableBitmap,
     datatypes::DataType,
     error::Result,
-    io::parquet::read::deserialize::nested_utils::{InitNested, NestedArrayIter, NestedState},
+    io::parquet::read::deserialize::nested_utils::{InitNested, NestedState},
 };
 
 use super::super::dictionary::*;
@@ -90,6 +90,7 @@ where
     }
 }
 
+/// An iterator adapter that converts [`DataPages`] into an [`Iterator`] of [`DictionaryArray`].
 #[derive(Debug)]
 pub struct NestedDictIter<K, I>
 where
@@ -155,24 +156,3 @@ where
         }
     }
 }
-
-/// Converts [`DataPages`] to an [`Iterator`] of [`Array`]
-pub fn iter_to_arrays_nested<'a, K, I>(
-    iter: I,
-    init: Vec<InitNested>,
-    data_type: DataType,
-    num_rows: usize,
-    chunk_size: Option<usize>,
-) -> NestedArrayIter<'a>
-where
-    I: 'a + DataPages,
-    K: DictionaryKey,
-{
-    Box::new(
-        NestedDictIter::<K, I>::new(iter, init, data_type, num_rows, chunk_size).map(|result| {
-            let (mut nested, array) = result?;
-            let _ = nested.nested.pop().unwrap(); // the primitive
-            Ok((nested, array.boxed()))
-        }),
-    )
-}

src/io/parquet/read/deserialize/fixed_size_binary/mod.rs

@@ -3,4 +3,4 @@ mod dictionary;
 mod utils;
 
 pub use basic::Iter;
-pub use dictionary::{iter_to_arrays_nested as iter_to_dict_arrays_nested, DictIter};
+pub use dictionary::{DictIter, NestedDictIter};