Skip to content
This repository has been archived by the owner on Feb 18, 2024. It is now read-only.

DRY via macro. #477

Merged
merged 1 commit into from
Sep 30, 2021
Merged

DRY via macro. #477

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 32 additions & 116 deletions src/array/growable/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}};
}

Expand Down Expand Up @@ -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| {
Expand Down