DRY via macro.

jorgecarleitao · Sep 30, 2021 · 8c6cebc · 8c6cebc
1 parent 76e8992
commit 8c6cebc
Showing 1 changed file with 32 additions and 116 deletions.
diff --git a/src/array/growable/mod.rs b/src/array/growable/mod.rs
@@ -57,11 +57,7 @@ macro_rules! dyn_growable {
             .iter()
             .map(|array| array.as_any().downcast_ref().unwrap())
             .collect::<Vec<_>>();
-        Box::new(primitive::GrowablePrimitive::<$ty>::new(
-            arrays,
-            $use_validity,
-            $capacity,
-        ))
+        Box::new(<$ty>::new(arrays, $use_validity, $capacity))
     }};
 }
 
@@ -101,119 +97,39 @@ pub fn make_growable<'a>(
     use PhysicalType::*;
     match data_type.to_physical_type() {
         Null => Box::new(null::GrowableNull::new(data_type.clone())),
-        Boolean => {
-            let arrays = arrays
-                .iter()
-                .map(|array| array.as_any().downcast_ref().unwrap())
-                .collect::<Vec<_>>();
-            Box::new(boolean::GrowableBoolean::new(
-                arrays,
-                use_validity,
-                capacity,
-            ))
-        }
+        Boolean => dyn_growable!(boolean::GrowableBoolean, arrays, use_validity, capacity),
         Primitive(primitive) => with_match_primitive_type!(primitive, |$T| {
-            dyn_growable!($T, arrays, use_validity, capacity)
+            dyn_growable!(primitive::GrowablePrimitive::<$T>, arrays, use_validity, capacity)
         }),
-        Utf8 => {
-            let arrays = arrays
-                .iter()
-                .map(|array| array.as_any().downcast_ref().unwrap())
-                .collect::<Vec<_>>();
-            Box::new(utf8::GrowableUtf8::<i32>::new(
-                arrays,
-                use_validity,
-                capacity,
-            ))
-        }
-        LargeUtf8 => {
-            let arrays = arrays
-                .iter()
-                .map(|array| array.as_any().downcast_ref().unwrap())
-                .collect::<Vec<_>>();
-            Box::new(utf8::GrowableUtf8::<i64>::new(
-                arrays,
-                use_validity,
-                capacity,
-            ))
-        }
-        Binary => {
-            let arrays = arrays
-                .iter()
-                .map(|array| array.as_any().downcast_ref().unwrap())
-                .collect::<Vec<_>>();
-            Box::new(binary::GrowableBinary::<i32>::new(
-                arrays,
-                use_validity,
-                capacity,
-            ))
-        }
-        LargeBinary => {
-            let arrays = arrays
-                .iter()
-                .map(|array| array.as_any().downcast_ref().unwrap())
-                .collect::<Vec<_>>();
-            Box::new(binary::GrowableBinary::<i64>::new(
-                arrays,
-                use_validity,
-                capacity,
-            ))
-        }
-        FixedSizeBinary => {
-            let arrays = arrays
-                .iter()
-                .map(|array| array.as_any().downcast_ref().unwrap())
-                .collect::<Vec<_>>();
-            Box::new(fixed_binary::GrowableFixedSizeBinary::new(
-                arrays,
-                use_validity,
-                capacity,
-            ))
-        }
-        List => {
-            let arrays = arrays
-                .iter()
-                .map(|array| array.as_any().downcast_ref().unwrap())
-                .collect::<Vec<_>>();
-            Box::new(list::GrowableList::<i32>::new(
-                arrays,
-                use_validity,
-                capacity,
-            ))
-        }
-        LargeList => {
-            let arrays = arrays
-                .iter()
-                .map(|array| array.as_any().downcast_ref().unwrap())
-                .collect::<Vec<_>>();
-            Box::new(list::GrowableList::<i64>::new(
-                arrays,
-                use_validity,
-                capacity,
-            ))
-        }
-        Struct => {
-            let arrays = arrays
-                .iter()
-                .map(|array| array.as_any().downcast_ref().unwrap())
-                .collect::<Vec<_>>();
-            Box::new(structure::GrowableStruct::new(
-                arrays,
-                use_validity,
-                capacity,
-            ))
-        }
-        FixedSizeList => {
-            let arrays = arrays
-                .iter()
-                .map(|array| array.as_any().downcast_ref().unwrap())
-                .collect::<Vec<_>>();
-            Box::new(fixed_size_list::GrowableFixedSizeList::new(
-                arrays,
-                use_validity,
-                capacity,
-            ))
-        }
+        Utf8 => dyn_growable!(utf8::GrowableUtf8::<i32>, arrays, use_validity, capacity),
+        LargeUtf8 => dyn_growable!(utf8::GrowableUtf8::<i64>, arrays, use_validity, capacity),
+        Binary => dyn_growable!(
+            binary::GrowableBinary::<i32>,
+            arrays,
+            use_validity,
+            capacity
+        ),
+        LargeBinary => dyn_growable!(
+            binary::GrowableBinary::<i64>,
+            arrays,
+            use_validity,
+            capacity
+        ),
+        FixedSizeBinary => dyn_growable!(
+            fixed_binary::GrowableFixedSizeBinary,
+            arrays,
+            use_validity,
+            capacity
+        ),
+        List => dyn_growable!(list::GrowableList::<i32>, arrays, use_validity, capacity),
+        LargeList => dyn_growable!(list::GrowableList::<i64>, arrays, use_validity, capacity),
+        Struct => dyn_growable!(structure::GrowableStruct, arrays, use_validity, capacity),
+        FixedSizeList => dyn_growable!(
+            fixed_size_list::GrowableFixedSizeList,
+            arrays,
+            use_validity,
+            capacity
+        ),
         Union => todo!(),
         Dictionary(key_type) => {
             with_match_physical_dictionary_key_type!(key_type, |$T| {