Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove clone when creating ArrayData to run validation #888

Merged
merged 1 commit into from
Sep 20, 2024
Merged
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
10 changes: 5 additions & 5 deletions vortex-array/src/data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ impl ArrayData {
stats_map: Arc::new(RwLock::new(statistics)),
};

let array = Array::from(data);
// Validate here that the metadata correctly parses, so that an encoding can infallibly
let array = data.to_array();
// FIXME(ngates): run some validation function
// FIXME(robert): Encoding::with_dyn no longer eagerly validates metadata, come up with a way to validate metadata
encoding.with_dyn(&array, &mut |_| Ok(()))?;

Ok(data)
Ok(array.into())
}

pub fn encoding(&self) -> EncodingRef {
Expand Down Expand Up @@ -118,8 +118,8 @@ impl ToArray for ArrayData {

impl From<Array> for ArrayData {
fn from(value: Array) -> ArrayData {
match &value {
Array::Data(d) => d.clone(),
match value {
Array::Data(d) => d,
Array::View(_) => value.with_dyn(|v| v.to_array_data()),
}
}
Expand Down
Loading