Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
gatesn committed Mar 4, 2024
1 parent bd14b94 commit 937f51a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
6 changes: 3 additions & 3 deletions vortex/src/compute/scalar_at.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ pub fn scalar_at(array: &dyn Array, index: usize) -> VortexResult<Box<dyn Scalar
.scalar_at()
.map(|t| t.scalar_at(index))
.unwrap_or_else(|| {
// TODO(ngates): default implementation of decode and then try again
Err(VortexError::ComputeError(
format!("scalar_at not implemented for {}", &array.encoding().id()).into(),
Err(VortexError::NotImplemented(
"scalar_at",
array.encoding().id(),
))
})
}
10 changes: 4 additions & 6 deletions vortex/src/compute/take.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ pub trait TakeFn {
}

pub fn take(array: &dyn Array, indices: &dyn Array) -> VortexResult<ArrayRef> {
array.take().map(|t| t.take(indices)).unwrap_or_else(|| {
// TODO(ngates): default implementation of decode and then try again
Err(VortexError::ComputeError(
format!("take not implemented for {}", &array.encoding().id()).into(),
))
})
array
.take()
.map(|t| t.take(indices))
.unwrap_or_else(|| Err(VortexError::NotImplemented("take", array.encoding().id())))
}

0 comments on commit 937f51a

Please sign in to comment.