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

Added MutableArray::as_box #450

Merged
merged 1 commit into from
Sep 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions src/array/binary/mutable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,15 @@ impl<O: Offset> MutableArray for MutableBinaryArray<O> {
&self.validity
}

fn as_box(&mut self) -> Box<dyn Array> {
Box::new(BinaryArray::from_data(
self.data_type.clone(),
std::mem::take(&mut self.offsets).into(),
std::mem::take(&mut self.values).into(),
std::mem::take(&mut self.validity).map(|x| x.into()),
))
}

fn as_arc(&mut self) -> Arc<dyn Array> {
Arc::new(BinaryArray::from_data(
self.data_type.clone(),
Expand Down
8 changes: 8 additions & 0 deletions src/array/boolean/mutable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,14 @@ impl MutableArray for MutableBooleanArray {
&self.validity
}

fn as_box(&mut self) -> Box<dyn Array> {
Box::new(BooleanArray::from_data(
self.data_type.clone(),
std::mem::take(&mut self.values).into(),
std::mem::take(&mut self.validity).map(|x| x.into()),
))
}

fn as_arc(&mut self) -> Arc<dyn Array> {
Arc::new(BooleanArray::from_data(
self.data_type.clone(),
Expand Down
7 changes: 7 additions & 0 deletions src/array/dictionary/mutable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,13 @@ impl<K: DictionaryKey, M: 'static + MutableArray> MutableArray for MutableDictio
self.keys.validity()
}

fn as_box(&mut self) -> Box<dyn Array> {
Box::new(DictionaryArray::<K>::from_data(
std::mem::take(&mut self.keys).into(),
self.values.as_arc(),
))
}

fn as_arc(&mut self) -> Arc<dyn Array> {
Arc::new(DictionaryArray::<K>::from_data(
std::mem::take(&mut self.keys).into(),
Expand Down
8 changes: 8 additions & 0 deletions src/array/fixed_size_binary/mutable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,14 @@ impl MutableArray for MutableFixedSizeBinaryArray {
&self.validity
}

fn as_box(&mut self) -> Box<dyn Array> {
Box::new(FixedSizeBinaryArray::from_data(
DataType::FixedSizeBinary(self.size as i32),
std::mem::take(&mut self.values).into(),
std::mem::take(&mut self.validity).map(|x| x.into()),
))
}

fn as_arc(&mut self) -> Arc<dyn Array> {
Arc::new(FixedSizeBinaryArray::from_data(
DataType::FixedSizeBinary(self.size as i32),
Expand Down
8 changes: 8 additions & 0 deletions src/array/fixed_size_list/mutable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ impl<M: MutableArray + 'static> MutableArray for MutableFixedSizeListArray<M> {
&self.validity
}

fn as_box(&mut self) -> Box<dyn Array> {
Box::new(FixedSizeListArray::from_data(
self.data_type.clone(),
self.values.as_arc(),
std::mem::take(&mut self.validity).map(|x| x.into()),
))
}

fn as_arc(&mut self) -> Arc<dyn Array> {
Arc::new(FixedSizeListArray::from_data(
self.data_type.clone(),
Expand Down
9 changes: 9 additions & 0 deletions src/array/list/mutable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,15 @@ impl<O: Offset, M: MutableArray + 'static> MutableArray for MutableListArray<O,
&self.validity
}

fn as_box(&mut self) -> Box<dyn Array> {
Box::new(ListArray::from_data(
self.data_type.clone(),
std::mem::take(&mut self.offsets).into(),
self.values.as_arc(),
std::mem::take(&mut self.validity).map(|x| x.into()),
))
}

fn as_arc(&mut self) -> Arc<dyn Array> {
Arc::new(ListArray::from_data(
self.data_type.clone(),
Expand Down
12 changes: 10 additions & 2 deletions src/array/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,16 @@ pub trait MutableArray: std::fmt::Debug {
/// The optional validity of the array.
fn validity(&self) -> &Option<MutableBitmap>;

/// Convert itself to an (immutable) [`Array`].
fn as_arc(&mut self) -> Arc<dyn Array>;
/// Convert itself to an (immutable) ['Array'].
fn as_box(&mut self) -> Box<dyn Array>;

/// Convert itself to an (immutable) atomically reference counted [`Array`].
// This provided implementation has an extra allocation as it first
// boxes `self`, then converts the box into an `Arc`. Implementors may wish
// to avoid an allocation by skipping the box completely.
fn as_arc(&mut self) -> Arc<dyn Array> {
self.as_box().into()
sd2k marked this conversation as resolved.
Show resolved Hide resolved
}

/// Convert to `Any`, to enable dynamic casting.
fn as_any(&self) -> &dyn Any;
Expand Down
8 changes: 8 additions & 0 deletions src/array/primitive/mutable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,14 @@ impl<T: NativeType> MutableArray for MutablePrimitiveArray<T> {
&self.validity
}

fn as_box(&mut self) -> Box<dyn Array> {
Box::new(PrimitiveArray::from_data(
self.data_type.clone(),
std::mem::take(&mut self.values).into(),
std::mem::take(&mut self.validity).map(|x| x.into()),
))
}

fn as_arc(&mut self) -> Arc<dyn Array> {
Arc::new(PrimitiveArray::from_data(
self.data_type.clone(),
Expand Down
9 changes: 9 additions & 0 deletions src/array/utf8/mutable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,15 @@ impl<O: Offset> MutableArray for MutableUtf8Array<O> {
&self.validity
}

fn as_box(&mut self) -> Box<dyn Array> {
Box::new(Utf8Array::from_data(
Self::default_data_type(),
std::mem::take(&mut self.offsets).into(),
std::mem::take(&mut self.values).into(),
std::mem::take(&mut self.validity).map(|x| x.into()),
))
}

fn as_arc(&mut self) -> Arc<dyn Array> {
Arc::new(Utf8Array::from_data(
Self::default_data_type(),
Expand Down