diff --git a/encodings/alp/public-api.lock b/encodings/alp/public-api.lock index f2a1ae9089d..e1a0f5f0498 100644 --- a/encodings/alp/public-api.lock +++ b/encodings/alp/public-api.lock @@ -24,9 +24,9 @@ impl core::clone::Clone for vortex_alp::ALPArray pub fn vortex_alp::ALPArray::clone(&self) -> vortex_alp::ALPArray -impl core::convert::AsRef for vortex_alp::ALPArray +impl core::convert::AsRef for vortex_alp::ALPArray -pub fn vortex_alp::ALPArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_alp::ALPArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From for vortex_array::array::ArrayRef @@ -38,7 +38,7 @@ pub fn vortex_alp::ALPArray::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> cor impl core::ops::deref::Deref for vortex_alp::ALPArray -pub type vortex_alp::ALPArray::Target = dyn vortex_array::array::Array +pub type vortex_alp::ALPArray::Target = dyn vortex_array::array::DynArray pub fn vortex_alp::ALPArray::deref(&self) -> &Self::Target @@ -90,9 +90,9 @@ impl core::clone::Clone for vortex_alp::ALPRDArray pub fn vortex_alp::ALPRDArray::clone(&self) -> vortex_alp::ALPRDArray -impl core::convert::AsRef for vortex_alp::ALPRDArray +impl core::convert::AsRef for vortex_alp::ALPRDArray -pub fn vortex_alp::ALPRDArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_alp::ALPRDArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From for vortex_array::array::ArrayRef @@ -104,7 +104,7 @@ pub fn vortex_alp::ALPRDArray::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> c impl core::ops::deref::Deref for vortex_alp::ALPRDArray -pub type vortex_alp::ALPRDArray::Target = dyn vortex_array::array::Array +pub type vortex_alp::ALPRDArray::Target = dyn vortex_array::array::DynArray pub fn vortex_alp::ALPRDArray::deref(&self) -> &Self::Target diff --git a/encodings/alp/src/alp/array.rs b/encodings/alp/src/alp/array.rs index 055bc8583db..a8023054aca 100644 --- a/encodings/alp/src/alp/array.rs +++ b/encodings/alp/src/alp/array.rs @@ -4,11 +4,11 @@ use std::fmt::Debug; use std::hash::Hash; -use vortex_array::Array; use vortex_array::ArrayEq; use vortex_array::ArrayHash; use vortex_array::ArrayRef; use vortex_array::DeserializeMetadata; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::Precision; diff --git a/encodings/alp/src/alp/compute/compare.rs b/encodings/alp/src/alp/compute/compare.rs index 6f98eb8f676..57cd881a970 100644 --- a/encodings/alp/src/alp/compute/compare.rs +++ b/encodings/alp/src/alp/compute/compare.rs @@ -3,8 +3,8 @@ use std::fmt::Debug; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::arrays::ConstantArray; diff --git a/encodings/alp/src/alp/compute/take.rs b/encodings/alp/src/alp/compute/take.rs index 77ed90caa43..8631d6f4d98 100644 --- a/encodings/alp/src/alp/compute/take.rs +++ b/encodings/alp/src/alp/compute/take.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::arrays::TakeExecute; diff --git a/encodings/alp/src/alp_rd/array.rs b/encodings/alp/src/alp_rd/array.rs index 3f351fec007..e015937ae78 100644 --- a/encodings/alp/src/alp_rd/array.rs +++ b/encodings/alp/src/alp_rd/array.rs @@ -5,11 +5,11 @@ use std::fmt::Debug; use std::hash::Hash; use itertools::Itertools; -use vortex_array::Array; use vortex_array::ArrayEq; use vortex_array::ArrayHash; use vortex_array::ArrayRef; use vortex_array::DeserializeMetadata; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::Precision; diff --git a/encodings/alp/src/alp_rd/compute/take.rs b/encodings/alp/src/alp_rd/compute/take.rs index 7b6d5d5c50d..51d20b80ea9 100644 --- a/encodings/alp/src/alp_rd/compute/take.rs +++ b/encodings/alp/src/alp_rd/compute/take.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::arrays::TakeExecute; diff --git a/encodings/alp/src/alp_rd/mod.rs b/encodings/alp/src/alp_rd/mod.rs index f156e50fc50..58188f7ab9f 100644 --- a/encodings/alp/src/alp_rd/mod.rs +++ b/encodings/alp/src/alp_rd/mod.rs @@ -25,7 +25,7 @@ use num_traits::Float; use num_traits::One; use num_traits::PrimInt; use rustc_hash::FxBuildHasher; -use vortex_array::Array; +use vortex_array::DynArray; use vortex_array::arrays::PrimitiveArray; use vortex_array::dtype::DType; use vortex_array::dtype::NativePType; diff --git a/encodings/alp/src/alp_rd/ops.rs b/encodings/alp/src/alp_rd/ops.rs index 5bba5567344..8ae65b15179 100644 --- a/encodings/alp/src/alp_rd/ops.rs +++ b/encodings/alp/src/alp_rd/ops.rs @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; +use vortex_array::DynArray; use vortex_array::scalar::Scalar; use vortex_array::vtable::OperationsVTable; use vortex_error::VortexExpect; diff --git a/encodings/bytebool/public-api.lock b/encodings/bytebool/public-api.lock index 0a1a01e7ae2..1f665afbbb5 100644 --- a/encodings/bytebool/public-api.lock +++ b/encodings/bytebool/public-api.lock @@ -16,9 +16,9 @@ impl core::clone::Clone for vortex_bytebool::ByteBoolArray pub fn vortex_bytebool::ByteBoolArray::clone(&self) -> vortex_bytebool::ByteBoolArray -impl core::convert::AsRef for vortex_bytebool::ByteBoolArray +impl core::convert::AsRef for vortex_bytebool::ByteBoolArray -pub fn vortex_bytebool::ByteBoolArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_bytebool::ByteBoolArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From> for vortex_bytebool::ByteBoolArray @@ -38,7 +38,7 @@ pub fn vortex_bytebool::ByteBoolArray::fmt(&self, f: &mut core::fmt::Formatter<' impl core::ops::deref::Deref for vortex_bytebool::ByteBoolArray -pub type vortex_bytebool::ByteBoolArray::Target = dyn vortex_array::array::Array +pub type vortex_bytebool::ByteBoolArray::Target = dyn vortex_array::array::DynArray pub fn vortex_bytebool::ByteBoolArray::deref(&self) -> &Self::Target diff --git a/encodings/datetime-parts/public-api.lock b/encodings/datetime-parts/public-api.lock index 04626e436e8..b1478078723 100644 --- a/encodings/datetime-parts/public-api.lock +++ b/encodings/datetime-parts/public-api.lock @@ -18,9 +18,9 @@ impl core::clone::Clone for vortex_datetime_parts::DateTimePartsArray pub fn vortex_datetime_parts::DateTimePartsArray::clone(&self) -> vortex_datetime_parts::DateTimePartsArray -impl core::convert::AsRef for vortex_datetime_parts::DateTimePartsArray +impl core::convert::AsRef for vortex_datetime_parts::DateTimePartsArray -pub fn vortex_datetime_parts::DateTimePartsArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_datetime_parts::DateTimePartsArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From for vortex_array::array::ArrayRef @@ -38,7 +38,7 @@ pub fn vortex_datetime_parts::DateTimePartsArray::fmt(&self, f: &mut core::fmt:: impl core::ops::deref::Deref for vortex_datetime_parts::DateTimePartsArray -pub type vortex_datetime_parts::DateTimePartsArray::Target = dyn vortex_array::array::Array +pub type vortex_datetime_parts::DateTimePartsArray::Target = dyn vortex_array::array::DynArray pub fn vortex_datetime_parts::DateTimePartsArray::deref(&self) -> &Self::Target diff --git a/encodings/datetime-parts/src/array.rs b/encodings/datetime-parts/src/array.rs index 0290ec9d0b9..f8b89d1d066 100644 --- a/encodings/datetime-parts/src/array.rs +++ b/encodings/datetime-parts/src/array.rs @@ -4,11 +4,11 @@ use std::fmt::Debug; use std::hash::Hash; -use vortex_array::Array; use vortex_array::ArrayEq; use vortex_array::ArrayHash; use vortex_array::ArrayRef; use vortex_array::DeserializeMetadata; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::Precision; diff --git a/encodings/datetime-parts/src/compute/cast.rs b/encodings/datetime-parts/src/compute/cast.rs index 21da2f1a748..60f10a6cc7e 100644 --- a/encodings/datetime-parts/src/compute/cast.rs +++ b/encodings/datetime-parts/src/compute/cast.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::builtins::ArrayBuiltins; use vortex_array::dtype::DType; @@ -35,8 +35,8 @@ impl CastReduce for DateTimePartsVTable { #[cfg(test)] mod tests { use rstest::rstest; - use vortex_array::Array; use vortex_array::ArrayRef; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::PrimitiveArray; use vortex_array::arrays::TemporalArray; diff --git a/encodings/datetime-parts/src/compute/compare.rs b/encodings/datetime-parts/src/compute/compare.rs index a1eb219c2b2..a1dfd1f9718 100644 --- a/encodings/datetime-parts/src/compute/compare.rs +++ b/encodings/datetime-parts/src/compute/compare.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::arrays::ConstantArray; diff --git a/encodings/datetime-parts/src/compute/rules.rs b/encodings/datetime-parts/src/compute/rules.rs index a4345556f67..810bc73f0fb 100644 --- a/encodings/datetime-parts/src/compute/rules.rs +++ b/encodings/datetime-parts/src/compute/rules.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::AnyScalarFn; use vortex_array::arrays::ConstantArray; diff --git a/encodings/datetime-parts/src/compute/take.rs b/encodings/datetime-parts/src/compute/take.rs index 41e53d061a1..7890bc9a636 100644 --- a/encodings/datetime-parts/src/compute/take.rs +++ b/encodings/datetime-parts/src/compute/take.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::ToCanonical; diff --git a/encodings/datetime-parts/src/ops.rs b/encodings/datetime-parts/src/ops.rs index 0736e731cb8..f6226298e2f 100644 --- a/encodings/datetime-parts/src/ops.rs +++ b/encodings/datetime-parts/src/ops.rs @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; +use vortex_array::DynArray; use vortex_array::dtype::DType; use vortex_array::extension::datetime::Timestamp; use vortex_array::scalar::Scalar; diff --git a/encodings/decimal-byte-parts/public-api.lock b/encodings/decimal-byte-parts/public-api.lock index 310a47c8c9a..1c38097c8f7 100644 --- a/encodings/decimal-byte-parts/public-api.lock +++ b/encodings/decimal-byte-parts/public-api.lock @@ -14,9 +14,9 @@ impl core::clone::Clone for vortex_decimal_byte_parts::DecimalBytePartsArray pub fn vortex_decimal_byte_parts::DecimalBytePartsArray::clone(&self) -> vortex_decimal_byte_parts::DecimalBytePartsArray -impl core::convert::AsRef for vortex_decimal_byte_parts::DecimalBytePartsArray +impl core::convert::AsRef for vortex_decimal_byte_parts::DecimalBytePartsArray -pub fn vortex_decimal_byte_parts::DecimalBytePartsArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_decimal_byte_parts::DecimalBytePartsArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From for vortex_array::array::ArrayRef @@ -28,7 +28,7 @@ pub fn vortex_decimal_byte_parts::DecimalBytePartsArray::fmt(&self, f: &mut core impl core::ops::deref::Deref for vortex_decimal_byte_parts::DecimalBytePartsArray -pub type vortex_decimal_byte_parts::DecimalBytePartsArray::Target = dyn vortex_array::array::Array +pub type vortex_decimal_byte_parts::DecimalBytePartsArray::Target = dyn vortex_array::array::DynArray pub fn vortex_decimal_byte_parts::DecimalBytePartsArray::deref(&self) -> &Self::Target diff --git a/encodings/decimal-byte-parts/src/decimal_byte_parts/compute/cast.rs b/encodings/decimal-byte-parts/src/decimal_byte_parts/compute/cast.rs index ee7dd56e58d..007e09f86ac 100644 --- a/encodings/decimal-byte-parts/src/decimal_byte_parts/compute/cast.rs +++ b/encodings/decimal-byte-parts/src/decimal_byte_parts/compute/cast.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::builtins::ArrayBuiltins; use vortex_array::dtype::DType; diff --git a/encodings/decimal-byte-parts/src/decimal_byte_parts/compute/compare.rs b/encodings/decimal-byte-parts/src/decimal_byte_parts/compute/compare.rs index e182da69724..b1a5f0987d7 100644 --- a/encodings/decimal-byte-parts/src/decimal_byte_parts/compute/compare.rs +++ b/encodings/decimal-byte-parts/src/decimal_byte_parts/compute/compare.rs @@ -3,8 +3,8 @@ use Sign::Negative; use num_traits::NumCast; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::arrays::ConstantArray; use vortex_array::builtins::ArrayBuiltins; @@ -140,7 +140,7 @@ where #[cfg(test)] mod tests { - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::BoolArray; use vortex_array::arrays::ConstantArray; diff --git a/encodings/decimal-byte-parts/src/decimal_byte_parts/compute/take.rs b/encodings/decimal-byte-parts/src/decimal_byte_parts/compute/take.rs index 1cd0c5831c2..7fd5017f8bf 100644 --- a/encodings/decimal-byte-parts/src/decimal_byte_parts/compute/take.rs +++ b/encodings/decimal-byte-parts/src/decimal_byte_parts/compute/take.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::arrays::TakeExecute; use vortex_error::VortexResult; diff --git a/encodings/decimal-byte-parts/src/decimal_byte_parts/mod.rs b/encodings/decimal-byte-parts/src/decimal_byte_parts/mod.rs index 51a5e62c10e..2e58f78340b 100644 --- a/encodings/decimal-byte-parts/src/decimal_byte_parts/mod.rs +++ b/encodings/decimal-byte-parts/src/decimal_byte_parts/mod.rs @@ -8,10 +8,10 @@ mod slice; use std::hash::Hash; use prost::Message as _; -use vortex_array::Array; use vortex_array::ArrayEq; use vortex_array::ArrayHash; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::Precision; @@ -325,7 +325,7 @@ impl ValidityChild for DecimalBytePartsVTable { #[cfg(test)] mod tests { - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::arrays::BoolArray; use vortex_array::arrays::PrimitiveArray; use vortex_array::dtype::DType; diff --git a/encodings/decimal-byte-parts/src/decimal_byte_parts/rules.rs b/encodings/decimal-byte-parts/src/decimal_byte_parts/rules.rs index 0155d657606..8aa19ced134 100644 --- a/encodings/decimal-byte-parts/src/decimal_byte_parts/rules.rs +++ b/encodings/decimal-byte-parts/src/decimal_byte_parts/rules.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::FilterArray; use vortex_array::arrays::FilterReduceAdaptor; diff --git a/encodings/fastlanes/benches/bitpacking_take.rs b/encodings/fastlanes/benches/bitpacking_take.rs index a71c5655b3f..ef94963a672 100644 --- a/encodings/fastlanes/benches/bitpacking_take.rs +++ b/encodings/fastlanes/benches/bitpacking_take.rs @@ -9,7 +9,7 @@ use rand::Rng; use rand::SeedableRng; use rand::distr::Uniform; use rand::prelude::StdRng; -use vortex_array::Array; +use vortex_array::DynArray; use vortex_array::IntoArray as _; use vortex_array::LEGACY_SESSION; use vortex_array::RecursiveCanonical; diff --git a/encodings/fastlanes/benches/canonicalize_bench.rs b/encodings/fastlanes/benches/canonicalize_bench.rs index e18c47c778f..c568a2e61dc 100644 --- a/encodings/fastlanes/benches/canonicalize_bench.rs +++ b/encodings/fastlanes/benches/canonicalize_bench.rs @@ -6,8 +6,8 @@ use std::sync::LazyLock; use divan::Bencher; use rand::SeedableRng; use rand::prelude::StdRng; -use vortex_array::Array; use vortex_array::Canonical; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::VortexSessionExecute; use vortex_array::arrays::ChunkedArray; diff --git a/encodings/fastlanes/public-api.lock b/encodings/fastlanes/public-api.lock index a6797c89530..91ee80e65b7 100644 --- a/encodings/fastlanes/public-api.lock +++ b/encodings/fastlanes/public-api.lock @@ -138,9 +138,9 @@ impl core::clone::Clone for vortex_fastlanes::BitPackedArray pub fn vortex_fastlanes::BitPackedArray::clone(&self) -> vortex_fastlanes::BitPackedArray -impl core::convert::AsRef for vortex_fastlanes::BitPackedArray +impl core::convert::AsRef for vortex_fastlanes::BitPackedArray -pub fn vortex_fastlanes::BitPackedArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_fastlanes::BitPackedArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From for vortex_array::array::ArrayRef @@ -152,7 +152,7 @@ pub fn vortex_fastlanes::BitPackedArray::fmt(&self, f: &mut core::fmt::Formatter impl core::ops::deref::Deref for vortex_fastlanes::BitPackedArray -pub type vortex_fastlanes::BitPackedArray::Target = dyn vortex_array::array::Array +pub type vortex_fastlanes::BitPackedArray::Target = dyn vortex_array::array::DynArray pub fn vortex_fastlanes::BitPackedArray::deref(&self) -> &Self::Target @@ -292,9 +292,9 @@ impl core::clone::Clone for vortex_fastlanes::DeltaArray pub fn vortex_fastlanes::DeltaArray::clone(&self) -> vortex_fastlanes::DeltaArray -impl core::convert::AsRef for vortex_fastlanes::DeltaArray +impl core::convert::AsRef for vortex_fastlanes::DeltaArray -pub fn vortex_fastlanes::DeltaArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_fastlanes::DeltaArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From for vortex_array::array::ArrayRef @@ -306,7 +306,7 @@ pub fn vortex_fastlanes::DeltaArray::fmt(&self, f: &mut core::fmt::Formatter<'_> impl core::ops::deref::Deref for vortex_fastlanes::DeltaArray -pub type vortex_fastlanes::DeltaArray::Target = dyn vortex_array::array::Array +pub type vortex_fastlanes::DeltaArray::Target = dyn vortex_array::array::DynArray pub fn vortex_fastlanes::DeltaArray::deref(&self) -> &Self::Target @@ -408,9 +408,9 @@ impl core::clone::Clone for vortex_fastlanes::FoRArray pub fn vortex_fastlanes::FoRArray::clone(&self) -> vortex_fastlanes::FoRArray -impl core::convert::AsRef for vortex_fastlanes::FoRArray +impl core::convert::AsRef for vortex_fastlanes::FoRArray -pub fn vortex_fastlanes::FoRArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_fastlanes::FoRArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From for vortex_array::array::ArrayRef @@ -422,7 +422,7 @@ pub fn vortex_fastlanes::FoRArray::fmt(&self, f: &mut core::fmt::Formatter<'_>) impl core::ops::deref::Deref for vortex_fastlanes::FoRArray -pub type vortex_fastlanes::FoRArray::Target = dyn vortex_array::array::Array +pub type vortex_fastlanes::FoRArray::Target = dyn vortex_array::array::DynArray pub fn vortex_fastlanes::FoRArray::deref(&self) -> &Self::Target @@ -558,9 +558,9 @@ impl core::clone::Clone for vortex_fastlanes::RLEArray pub fn vortex_fastlanes::RLEArray::clone(&self) -> vortex_fastlanes::RLEArray -impl core::convert::AsRef for vortex_fastlanes::RLEArray +impl core::convert::AsRef for vortex_fastlanes::RLEArray -pub fn vortex_fastlanes::RLEArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_fastlanes::RLEArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From for vortex_array::array::ArrayRef @@ -572,7 +572,7 @@ pub fn vortex_fastlanes::RLEArray::fmt(&self, f: &mut core::fmt::Formatter<'_>) impl core::ops::deref::Deref for vortex_fastlanes::RLEArray -pub type vortex_fastlanes::RLEArray::Target = dyn vortex_array::array::Array +pub type vortex_fastlanes::RLEArray::Target = dyn vortex_array::array::DynArray pub fn vortex_fastlanes::RLEArray::deref(&self) -> &Self::Target diff --git a/encodings/fastlanes/src/bitpacking/compute/filter.rs b/encodings/fastlanes/src/bitpacking/compute/filter.rs index 87cf47193ed..54116ac9251 100644 --- a/encodings/fastlanes/src/bitpacking/compute/filter.rs +++ b/encodings/fastlanes/src/bitpacking/compute/filter.rs @@ -161,7 +161,7 @@ fn filter_with_indices( #[cfg(test)] mod test { - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray as _; use vortex_array::ToCanonical; use vortex_array::arrays::PrimitiveArray; diff --git a/encodings/fastlanes/src/bitpacking/compute/slice.rs b/encodings/fastlanes/src/bitpacking/compute/slice.rs index 55cd12b3975..674480b679a 100644 --- a/encodings/fastlanes/src/bitpacking/compute/slice.rs +++ b/encodings/fastlanes/src/bitpacking/compute/slice.rs @@ -53,7 +53,7 @@ impl SliceKernel for BitPackedVTable { mod tests { use std::sync::LazyLock; - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::VortexSessionExecute; use vortex_array::arrays::SliceArray; diff --git a/encodings/fastlanes/src/bitpacking/compute/take.rs b/encodings/fastlanes/src/bitpacking/compute/take.rs index 2be6affde8b..4955f53ca18 100644 --- a/encodings/fastlanes/src/bitpacking/compute/take.rs +++ b/encodings/fastlanes/src/bitpacking/compute/take.rs @@ -5,8 +5,8 @@ use std::mem; use std::mem::MaybeUninit; use fastlanes::BitPacking; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::ToCanonical; @@ -151,7 +151,7 @@ mod test { use rand::distr::Uniform; use rand::rng; use rstest::rstest; - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::LEGACY_SESSION; use vortex_array::ToCanonical; diff --git a/encodings/fastlanes/src/bitpacking/vtable/operations.rs b/encodings/fastlanes/src/bitpacking/vtable/operations.rs index 6077379bab8..9424bc0bc29 100644 --- a/encodings/fastlanes/src/bitpacking/vtable/operations.rs +++ b/encodings/fastlanes/src/bitpacking/vtable/operations.rs @@ -28,7 +28,7 @@ mod test { use std::ops::Range; use std::sync::LazyLock; - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::VortexSessionExecute; use vortex_array::arrays::PrimitiveArray; diff --git a/encodings/fastlanes/src/for/array/for_compress.rs b/encodings/fastlanes/src/for/array/for_compress.rs index 9990df5fb6a..3b681d0fdad 100644 --- a/encodings/fastlanes/src/for/array/for_compress.rs +++ b/encodings/fastlanes/src/for/array/for_compress.rs @@ -54,7 +54,7 @@ mod test { use std::sync::LazyLock; use itertools::Itertools; - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::ToCanonical; use vortex_array::VortexSessionExecute; use vortex_array::assert_arrays_eq; diff --git a/encodings/fastlanes/src/for/compute/compare.rs b/encodings/fastlanes/src/for/compute/compare.rs index 5c07914de0e..4de2093d937 100644 --- a/encodings/fastlanes/src/for/compute/compare.rs +++ b/encodings/fastlanes/src/for/compute/compare.rs @@ -4,8 +4,8 @@ use std::ops::Shr; use num_traits::WrappingSub; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::arrays::ConstantArray; diff --git a/encodings/fastlanes/src/for/compute/mod.rs b/encodings/fastlanes/src/for/compute/mod.rs index 6bf519f0f16..1374d826cb3 100644 --- a/encodings/fastlanes/src/for/compute/mod.rs +++ b/encodings/fastlanes/src/for/compute/mod.rs @@ -6,8 +6,8 @@ mod compare; mod is_constant; mod is_sorted; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::arrays::FilterReduce; diff --git a/encodings/fastlanes/src/for/vtable/rules.rs b/encodings/fastlanes/src/for/vtable/rules.rs index 131827c24b3..972d8b6e65e 100644 --- a/encodings/fastlanes/src/for/vtable/rules.rs +++ b/encodings/fastlanes/src/for/vtable/rules.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::FilterArray; use vortex_array::arrays::FilterReduceAdaptor; diff --git a/encodings/fastlanes/src/rle/array/mod.rs b/encodings/fastlanes/src/rle/array/mod.rs index b8c50848ed9..5823a791b0b 100644 --- a/encodings/fastlanes/src/rle/array/mod.rs +++ b/encodings/fastlanes/src/rle/array/mod.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::dtype::DType; use vortex_array::dtype::PType; use vortex_array::stats::ArrayStats; @@ -215,8 +215,8 @@ impl RLEArray { #[cfg(test)] mod tests { - use vortex_array::Array; use vortex_array::ArrayContext; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::ToCanonical; use vortex_array::arrays::PrimitiveArray; diff --git a/encodings/fastlanes/src/rle/array/rle_decompress.rs b/encodings/fastlanes/src/rle/array/rle_decompress.rs index cf5e72f9624..2f6292cf908 100644 --- a/encodings/fastlanes/src/rle/array/rle_decompress.rs +++ b/encodings/fastlanes/src/rle/array/rle_decompress.rs @@ -5,7 +5,7 @@ use arrayref::array_mut_ref; use arrayref::array_ref; use fastlanes::RLE; use num_traits::AsPrimitive; -use vortex_array::Array; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::arrays::PrimitiveArray; use vortex_array::dtype::NativePType; diff --git a/encodings/fastlanes/src/rle/compute/cast.rs b/encodings/fastlanes/src/rle/compute/cast.rs index abe2aefdceb..1143b57d82f 100644 --- a/encodings/fastlanes/src/rle/compute/cast.rs +++ b/encodings/fastlanes/src/rle/compute/cast.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::builtins::ArrayBuiltins; use vortex_array::dtype::DType; use vortex_array::scalar_fn::fns::cast::CastReduce; @@ -43,7 +43,7 @@ impl CastReduce for RLEVTable { #[cfg(test)] mod tests { use rstest::rstest; - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::PrimitiveArray; use vortex_array::assert_arrays_eq; diff --git a/encodings/fastlanes/src/rle/vtable/operations.rs b/encodings/fastlanes/src/rle/vtable/operations.rs index 6e45f8f949e..2c717090411 100644 --- a/encodings/fastlanes/src/rle/vtable/operations.rs +++ b/encodings/fastlanes/src/rle/vtable/operations.rs @@ -33,7 +33,7 @@ impl OperationsVTable for RLEVTable { #[cfg(test)] mod tests { - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::ToCanonical; use vortex_array::arrays::PrimitiveArray; diff --git a/encodings/fsst/benches/chunked_dict_fsst_builder.rs b/encodings/fsst/benches/chunked_dict_fsst_builder.rs index 893dd7e6f3b..901dd6f1836 100644 --- a/encodings/fsst/benches/chunked_dict_fsst_builder.rs +++ b/encodings/fsst/benches/chunked_dict_fsst_builder.rs @@ -4,8 +4,8 @@ use std::sync::LazyLock; use divan::Bencher; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::VortexSessionExecute; use vortex_array::arrays::ChunkedArray; diff --git a/encodings/fsst/public-api.lock b/encodings/fsst/public-api.lock index 103abc8a38c..5976429baf8 100644 --- a/encodings/fsst/public-api.lock +++ b/encodings/fsst/public-api.lock @@ -26,9 +26,9 @@ impl core::clone::Clone for vortex_fsst::FSSTArray pub fn vortex_fsst::FSSTArray::clone(&self) -> vortex_fsst::FSSTArray -impl core::convert::AsRef for vortex_fsst::FSSTArray +impl core::convert::AsRef for vortex_fsst::FSSTArray -pub fn vortex_fsst::FSSTArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_fsst::FSSTArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From for vortex_array::array::ArrayRef @@ -40,7 +40,7 @@ pub fn vortex_fsst::FSSTArray::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> c impl core::ops::deref::Deref for vortex_fsst::FSSTArray -pub type vortex_fsst::FSSTArray::Target = dyn vortex_array::array::Array +pub type vortex_fsst::FSSTArray::Target = dyn vortex_array::array::DynArray pub fn vortex_fsst::FSSTArray::deref(&self) -> &Self::Target @@ -172,7 +172,7 @@ impl vortex_array::vtable::validity::ValidityChild for pub fn vortex_fsst::FSSTVTable::validity_child(array: &vortex_fsst::FSSTArray) -> &vortex_array::array::ArrayRef -pub fn vortex_fsst::fsst_compress + core::convert::AsRef>(strings: A, compressor: &fsst::Compressor) -> vortex_fsst::FSSTArray +pub fn vortex_fsst::fsst_compress + core::convert::AsRef>(strings: A, compressor: &fsst::Compressor) -> vortex_fsst::FSSTArray pub fn vortex_fsst::fsst_compress_iter<'a, I>(iter: I, len: usize, dtype: vortex_array::dtype::DType, compressor: &fsst::Compressor) -> vortex_fsst::FSSTArray where I: core::iter::traits::iterator::Iterator> diff --git a/encodings/fsst/src/array.rs b/encodings/fsst/src/array.rs index 0831f25002a..05b554d55d0 100644 --- a/encodings/fsst/src/array.rs +++ b/encodings/fsst/src/array.rs @@ -10,12 +10,12 @@ use std::sync::LazyLock; use fsst::Compressor; use fsst::Decompressor; use fsst::Symbol; -use vortex_array::Array; use vortex_array::ArrayEq; use vortex_array::ArrayHash; use vortex_array::ArrayRef; use vortex_array::Canonical; use vortex_array::DeserializeMetadata; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::Precision; @@ -519,7 +519,7 @@ impl ValidityChild for FSSTVTable { mod test { use fsst::Compressor; use fsst::Symbol; - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::LEGACY_SESSION; use vortex_array::ProstMetadata; diff --git a/encodings/fsst/src/compress.rs b/encodings/fsst/src/compress.rs index 4230ac34520..9a1e6828eaf 100644 --- a/encodings/fsst/src/compress.rs +++ b/encodings/fsst/src/compress.rs @@ -5,7 +5,7 @@ use fsst::Compressor; use fsst::Symbol; -use vortex_array::Array; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::accessor::ArrayAccessor; use vortex_array::arrays::builder::VarBinBuilder; @@ -17,7 +17,7 @@ use vortex_error::VortexExpect; use crate::FSSTArray; /// Compress a string array using FSST. -pub fn fsst_compress + AsRef>( +pub fn fsst_compress + AsRef>( strings: A, compressor: &Compressor, ) -> FSSTArray { diff --git a/encodings/fsst/src/compute/compare.rs b/encodings/fsst/src/compute/compare.rs index 38bc4caaaae..9cc99285001 100644 --- a/encodings/fsst/src/compute/compare.rs +++ b/encodings/fsst/src/compute/compare.rs @@ -123,7 +123,7 @@ fn compare_fsst_constant( #[cfg(test)] mod tests { - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::ToCanonical; use vortex_array::arrays::BoolArray; use vortex_array::arrays::ConstantArray; diff --git a/encodings/fsst/src/compute/mod.rs b/encodings/fsst/src/compute/mod.rs index f8046d7a87b..3afd0ee2da0 100644 --- a/encodings/fsst/src/compute/mod.rs +++ b/encodings/fsst/src/compute/mod.rs @@ -5,8 +5,8 @@ mod cast; mod compare; mod filter; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::arrays::TakeExecute; @@ -53,7 +53,7 @@ impl TakeExecute for FSSTVTable { #[cfg(test)] mod tests { use rstest::rstest; - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::arrays::PrimitiveArray; use vortex_array::arrays::VarBinArray; use vortex_array::compute::conformance::consistency::test_array_consistency; diff --git a/encodings/fsst/src/kernel.rs b/encodings/fsst/src/kernel.rs index eea4234b4ba..df1febb2226 100644 --- a/encodings/fsst/src/kernel.rs +++ b/encodings/fsst/src/kernel.rs @@ -18,9 +18,9 @@ pub(super) const PARENT_KERNELS: ParentKernelSet = ParentKernelSet:: mod tests { use std::sync::LazyLock; - use vortex_array::Array; use vortex_array::ArrayRef; use vortex_array::Canonical; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::VortexSessionExecute; use vortex_array::arrays::FilterArray; diff --git a/encodings/fsst/src/tests.rs b/encodings/fsst/src/tests.rs index c9a9a524652..ed48e4eb8e7 100644 --- a/encodings/fsst/src/tests.rs +++ b/encodings/fsst/src/tests.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::ToCanonical; use vortex_array::arrays::builder::VarBinBuilder; diff --git a/encodings/pco/public-api.lock b/encodings/pco/public-api.lock index 2cbb6087556..a3b019777f7 100644 --- a/encodings/pco/public-api.lock +++ b/encodings/pco/public-api.lock @@ -16,9 +16,9 @@ impl core::clone::Clone for vortex_pco::PcoArray pub fn vortex_pco::PcoArray::clone(&self) -> vortex_pco::PcoArray -impl core::convert::AsRef for vortex_pco::PcoArray +impl core::convert::AsRef for vortex_pco::PcoArray -pub fn vortex_pco::PcoArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_pco::PcoArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From for vortex_array::array::ArrayRef @@ -30,7 +30,7 @@ pub fn vortex_pco::PcoArray::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> cor impl core::ops::deref::Deref for vortex_pco::PcoArray -pub type vortex_pco::PcoArray::Target = dyn vortex_array::array::Array +pub type vortex_pco::PcoArray::Target = dyn vortex_array::array::DynArray pub fn vortex_pco::PcoArray::deref(&self) -> &Self::Target diff --git a/encodings/runend/benches/run_end_compress.rs b/encodings/runend/benches/run_end_compress.rs index cc57faf7c30..e4d84b36038 100644 --- a/encodings/runend/benches/run_end_compress.rs +++ b/encodings/runend/benches/run_end_compress.rs @@ -5,7 +5,7 @@ use divan::Bencher; use itertools::repeat_n; -use vortex_array::Array; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::LEGACY_SESSION; use vortex_array::RecursiveCanonical; diff --git a/encodings/runend/benches/run_end_null_count.rs b/encodings/runend/benches/run_end_null_count.rs index d5613b01c18..4a3b8823e2c 100644 --- a/encodings/runend/benches/run_end_null_count.rs +++ b/encodings/runend/benches/run_end_null_count.rs @@ -7,7 +7,7 @@ use divan::Bencher; use rand::Rng; use rand::SeedableRng; use rand::rngs::StdRng; -use vortex_array::Array; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::PrimitiveArray; use vortex_array::compute::warm_up_vtables; diff --git a/encodings/runend/public-api.lock b/encodings/runend/public-api.lock index b6dce876336..adfff3d56e6 100644 --- a/encodings/runend/public-api.lock +++ b/encodings/runend/public-api.lock @@ -40,9 +40,9 @@ impl core::clone::Clone for vortex_runend::RunEndArray pub fn vortex_runend::RunEndArray::clone(&self) -> vortex_runend::RunEndArray -impl core::convert::AsRef for vortex_runend::RunEndArray +impl core::convert::AsRef for vortex_runend::RunEndArray -pub fn vortex_runend::RunEndArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_runend::RunEndArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From for vortex_array::array::ArrayRef @@ -54,7 +54,7 @@ pub fn vortex_runend::RunEndArray::fmt(&self, f: &mut core::fmt::Formatter<'_>) impl core::ops::deref::Deref for vortex_runend::RunEndArray -pub type vortex_runend::RunEndArray::Target = dyn vortex_array::array::Array +pub type vortex_runend::RunEndArray::Target = dyn vortex_array::array::DynArray pub fn vortex_runend::RunEndArray::deref(&self) -> &Self::Target diff --git a/encodings/runend/src/array.rs b/encodings/runend/src/array.rs index 65d2c57cb5d..0f4b2949300 100644 --- a/encodings/runend/src/array.rs +++ b/encodings/runend/src/array.rs @@ -4,11 +4,11 @@ use std::fmt::Debug; use std::hash::Hash; -use vortex_array::Array; use vortex_array::ArrayEq; use vortex_array::ArrayHash; use vortex_array::ArrayRef; use vortex_array::DeserializeMetadata; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::Precision; diff --git a/encodings/runend/src/compute/cast.rs b/encodings/runend/src/compute/cast.rs index d3fa10fdb4c..7d68c5e11cb 100644 --- a/encodings/runend/src/compute/cast.rs +++ b/encodings/runend/src/compute/cast.rs @@ -34,7 +34,7 @@ impl CastReduce for RunEndVTable { #[cfg(test)] mod tests { use rstest::rstest; - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::ToCanonical; use vortex_array::arrays::BoolArray; diff --git a/encodings/runend/src/compute/compare.rs b/encodings/runend/src/compute/compare.rs index a364f0be719..2ace60024f8 100644 --- a/encodings/runend/src/compute/compare.rs +++ b/encodings/runend/src/compute/compare.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::ToCanonical; diff --git a/encodings/runend/src/compute/filter.rs b/encodings/runend/src/compute/filter.rs index a85c694f5ad..a1c7e84a551 100644 --- a/encodings/runend/src/compute/filter.rs +++ b/encodings/runend/src/compute/filter.rs @@ -115,7 +115,7 @@ fn filter_run_end_primitive + AsPrimitiv #[cfg(test)] mod tests { - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::PrimitiveArray; use vortex_array::assert_arrays_eq; diff --git a/encodings/runend/src/compute/is_constant.rs b/encodings/runend/src/compute/is_constant.rs index 9e1f4ccbe45..cd4df321672 100644 --- a/encodings/runend/src/compute/is_constant.rs +++ b/encodings/runend/src/compute/is_constant.rs @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; +use vortex_array::DynArray; use vortex_array::compute::IsConstantKernel; use vortex_array::compute::IsConstantKernelAdapter; use vortex_array::compute::IsConstantOpts; diff --git a/encodings/runend/src/compute/take.rs b/encodings/runend/src/compute/take.rs index 0b09f831b4c..1d4861096ea 100644 --- a/encodings/runend/src/compute/take.rs +++ b/encodings/runend/src/compute/take.rs @@ -3,8 +3,8 @@ use num_traits::AsPrimitive; use num_traits::NumCast; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::ToCanonical; use vortex_array::arrays::PrimitiveArray; @@ -90,9 +90,9 @@ pub fn take_indices_unchecked>( #[cfg(test)] mod test { use rstest::rstest; - use vortex_array::Array; use vortex_array::ArrayRef; use vortex_array::Canonical; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::LEGACY_SESSION; use vortex_array::VortexSessionExecute; diff --git a/encodings/runend/src/compute/take_from.rs b/encodings/runend/src/compute/take_from.rs index 1611dc3ba37..cf6b3117be2 100644 --- a/encodings/runend/src/compute/take_from.rs +++ b/encodings/runend/src/compute/take_from.rs @@ -52,7 +52,7 @@ impl ExecuteParentKernel for RunEndVTableTakeFrom { #[cfg(test)] mod tests { - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::arrays::DictArray; diff --git a/encodings/runend/src/ops.rs b/encodings/runend/src/ops.rs index eb089d75c96..5c7b60e0727 100644 --- a/encodings/runend/src/ops.rs +++ b/encodings/runend/src/ops.rs @@ -42,7 +42,7 @@ pub(crate) fn find_slice_end_index(array: &ArrayRef, index: usize) -> VortexResu #[cfg(test)] mod tests { - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::PrimitiveArray; use vortex_array::assert_arrays_eq; diff --git a/encodings/sequence/public-api.lock b/encodings/sequence/public-api.lock index 5c1e127b7c6..35c15b6cde0 100644 --- a/encodings/sequence/public-api.lock +++ b/encodings/sequence/public-api.lock @@ -22,9 +22,9 @@ impl core::clone::Clone for vortex_sequence::SequenceArray pub fn vortex_sequence::SequenceArray::clone(&self) -> vortex_sequence::SequenceArray -impl core::convert::AsRef for vortex_sequence::SequenceArray +impl core::convert::AsRef for vortex_sequence::SequenceArray -pub fn vortex_sequence::SequenceArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_sequence::SequenceArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From for vortex_array::array::ArrayRef @@ -36,7 +36,7 @@ pub fn vortex_sequence::SequenceArray::fmt(&self, f: &mut core::fmt::Formatter<' impl core::ops::deref::Deref for vortex_sequence::SequenceArray -pub type vortex_sequence::SequenceArray::Target = dyn vortex_array::array::Array +pub type vortex_sequence::SequenceArray::Target = dyn vortex_array::array::DynArray pub fn vortex_sequence::SequenceArray::deref(&self) -> &Self::Target diff --git a/encodings/sequence/src/compute/compare.rs b/encodings/sequence/src/compute/compare.rs index 7d85da472a9..512d4e2f590 100644 --- a/encodings/sequence/src/compute/compare.rs +++ b/encodings/sequence/src/compute/compare.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::arrays::BoolArray; use vortex_array::arrays::ConstantArray; diff --git a/encodings/sequence/src/compute/list_contains.rs b/encodings/sequence/src/compute/list_contains.rs index ad2d7bf9611..bd4d29aa04b 100644 --- a/encodings/sequence/src/compute/list_contains.rs +++ b/encodings/sequence/src/compute/list_contains.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::arrays::BoolArray; use vortex_array::scalar_fn::fns::list_contains::ListContainsElementReduce; use vortex_error::VortexExpect; @@ -49,7 +49,7 @@ impl ListContainsElementReduce for SequenceVTable { mod tests { use std::sync::Arc; - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::arrays::BoolArray; use vortex_array::assert_arrays_eq; use vortex_array::dtype::Nullability; diff --git a/encodings/sequence/src/compute/take.rs b/encodings/sequence/src/compute/take.rs index f7de138b780..437afa8eeae 100644 --- a/encodings/sequence/src/compute/take.rs +++ b/encodings/sequence/src/compute/take.rs @@ -2,8 +2,8 @@ // SPDX-FileCopyrightText: Copyright the Vortex contributors use num_traits::cast::NumCast; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::ToCanonical; diff --git a/encodings/sparse/public-api.lock b/encodings/sparse/public-api.lock index ed3682bdffc..a6fd6046034 100644 --- a/encodings/sparse/public-api.lock +++ b/encodings/sparse/public-api.lock @@ -40,9 +40,9 @@ impl core::clone::Clone for vortex_sparse::SparseArray pub fn vortex_sparse::SparseArray::clone(&self) -> vortex_sparse::SparseArray -impl core::convert::AsRef for vortex_sparse::SparseArray +impl core::convert::AsRef for vortex_sparse::SparseArray -pub fn vortex_sparse::SparseArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_sparse::SparseArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From for vortex_array::array::ArrayRef @@ -54,7 +54,7 @@ pub fn vortex_sparse::SparseArray::fmt(&self, f: &mut core::fmt::Formatter<'_>) impl core::ops::deref::Deref for vortex_sparse::SparseArray -pub type vortex_sparse::SparseArray::Target = dyn vortex_array::array::Array +pub type vortex_sparse::SparseArray::Target = dyn vortex_array::array::DynArray pub fn vortex_sparse::SparseArray::deref(&self) -> &Self::Target diff --git a/encodings/sparse/src/canonical.rs b/encodings/sparse/src/canonical.rs index 5176b18c0e1..7711719c3b0 100644 --- a/encodings/sparse/src/canonical.rs +++ b/encodings/sparse/src/canonical.rs @@ -5,8 +5,8 @@ use std::sync::Arc; use itertools::Itertools; use num_traits::NumCast; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::arrays::BoolArray; diff --git a/encodings/sparse/src/compute/filter.rs b/encodings/sparse/src/compute/filter.rs index b37a9b5ad32..7643a9f54e7 100644 --- a/encodings/sparse/src/compute/filter.rs +++ b/encodings/sparse/src/compute/filter.rs @@ -37,8 +37,8 @@ impl FilterKernel for SparseVTable { mod tests { use rstest::fixture; use rstest::rstest; - use vortex_array::Array; use vortex_array::ArrayRef; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::PrimitiveArray; use vortex_array::assert_arrays_eq; diff --git a/encodings/sparse/src/compute/take.rs b/encodings/sparse/src/compute/take.rs index 4fac9e3a6a0..54be265818f 100644 --- a/encodings/sparse/src/compute/take.rs +++ b/encodings/sparse/src/compute/take.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::arrays::ConstantArray; @@ -57,8 +57,8 @@ impl TakeExecute for SparseVTable { #[cfg(test)] mod test { use rstest::rstest; - use vortex_array::Array; use vortex_array::ArrayRef; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::ConstantArray; use vortex_array::arrays::PrimitiveArray; diff --git a/encodings/sparse/src/lib.rs b/encodings/sparse/src/lib.rs index 29c8d5c190e..6e896fa8364 100644 --- a/encodings/sparse/src/lib.rs +++ b/encodings/sparse/src/lib.rs @@ -6,15 +6,13 @@ use std::hash::Hash; use kernel::PARENT_KERNELS; use prost::Message as _; -use vortex_array::Array; use vortex_array::ArrayEq; use vortex_array::ArrayHash; use vortex_array::ArrayRef; -use vortex_array::DeserializeMetadata; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::Precision; -use vortex_array::ProstMetadata; use vortex_array::ToCanonical; use vortex_array::arrays::ConstantArray; use vortex_array::buffer::BufferHandle; @@ -166,8 +164,7 @@ impl VTable for SparseVTable { buffers: &[BufferHandle], _session: &VortexSession, ) -> VortexResult { - let prost_patches = - as DeserializeMetadata>::deserialize(bytes)?; + let prost_patches = ProstPatchesMetadata::decode(bytes)?; // Once we have the patches metadata, we need to get the fill value from the buffers. @@ -491,6 +488,7 @@ impl ValidityVTable for SparseVTable { #[cfg(test)] mod test { use itertools::Itertools; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::ConstantArray; use vortex_array::arrays::PrimitiveArray; diff --git a/encodings/zigzag/public-api.lock b/encodings/zigzag/public-api.lock index 60dc4b073f9..06498353837 100644 --- a/encodings/zigzag/public-api.lock +++ b/encodings/zigzag/public-api.lock @@ -16,9 +16,9 @@ impl core::clone::Clone for vortex_zigzag::ZigZagArray pub fn vortex_zigzag::ZigZagArray::clone(&self) -> vortex_zigzag::ZigZagArray -impl core::convert::AsRef for vortex_zigzag::ZigZagArray +impl core::convert::AsRef for vortex_zigzag::ZigZagArray -pub fn vortex_zigzag::ZigZagArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_zigzag::ZigZagArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From for vortex_array::array::ArrayRef @@ -30,7 +30,7 @@ pub fn vortex_zigzag::ZigZagArray::fmt(&self, f: &mut core::fmt::Formatter<'_>) impl core::ops::deref::Deref for vortex_zigzag::ZigZagArray -pub type vortex_zigzag::ZigZagArray::Target = dyn vortex_array::array::Array +pub type vortex_zigzag::ZigZagArray::Target = dyn vortex_array::array::DynArray pub fn vortex_zigzag::ZigZagArray::deref(&self) -> &Self::Target diff --git a/encodings/zigzag/src/array.rs b/encodings/zigzag/src/array.rs index 38155892d24..319c7e2616d 100644 --- a/encodings/zigzag/src/array.rs +++ b/encodings/zigzag/src/array.rs @@ -3,10 +3,10 @@ use std::hash::Hash; -use vortex_array::Array; use vortex_array::ArrayEq; use vortex_array::ArrayHash; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::EmptyMetadata; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; diff --git a/encodings/zigzag/src/compute/cast.rs b/encodings/zigzag/src/compute/cast.rs index be5a3c368f5..ec5bab5efc9 100644 --- a/encodings/zigzag/src/compute/cast.rs +++ b/encodings/zigzag/src/compute/cast.rs @@ -27,7 +27,7 @@ impl CastReduce for ZigZagVTable { #[cfg(test)] mod tests { use rstest::rstest; - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::arrays::PrimitiveArray; use vortex_array::assert_arrays_eq; use vortex_array::builtins::ArrayBuiltins; diff --git a/encodings/zigzag/src/compute/mod.rs b/encodings/zigzag/src/compute/mod.rs index 85d5f8d9c2b..06c8a416374 100644 --- a/encodings/zigzag/src/compute/mod.rs +++ b/encodings/zigzag/src/compute/mod.rs @@ -3,8 +3,8 @@ mod cast; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ExecutionCtx; use vortex_array::IntoArray; use vortex_array::arrays::FilterReduce; @@ -71,8 +71,8 @@ impl ZigZagEncoded for u64 { #[cfg(test)] mod tests { use rstest::rstest; - use vortex_array::Array; use vortex_array::ArrayRef; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::ToCanonical; use vortex_array::arrays::PrimitiveArray; diff --git a/encodings/zstd/public-api.lock b/encodings/zstd/public-api.lock index 04d8faf7109..05a3767339d 100644 --- a/encodings/zstd/public-api.lock +++ b/encodings/zstd/public-api.lock @@ -26,9 +26,9 @@ impl core::clone::Clone for vortex_zstd::ZstdArray pub fn vortex_zstd::ZstdArray::clone(&self) -> vortex_zstd::ZstdArray -impl core::convert::AsRef for vortex_zstd::ZstdArray +impl core::convert::AsRef for vortex_zstd::ZstdArray -pub fn vortex_zstd::ZstdArray::as_ref(&self) -> &dyn vortex_array::array::Array +pub fn vortex_zstd::ZstdArray::as_ref(&self) -> &dyn vortex_array::array::DynArray impl core::convert::From for vortex_array::array::ArrayRef @@ -40,7 +40,7 @@ pub fn vortex_zstd::ZstdArray::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> c impl core::ops::deref::Deref for vortex_zstd::ZstdArray -pub type vortex_zstd::ZstdArray::Target = dyn vortex_array::array::Array +pub type vortex_zstd::ZstdArray::Target = dyn vortex_array::array::DynArray pub fn vortex_zstd::ZstdArray::deref(&self) -> &Self::Target diff --git a/fuzz/fuzz_targets/file_io.rs b/fuzz/fuzz_targets/file_io.rs index 518ac323086..a67ceb53fb3 100644 --- a/fuzz/fuzz_targets/file_io.rs +++ b/fuzz/fuzz_targets/file_io.rs @@ -7,8 +7,8 @@ use itertools::Itertools; use libfuzzer_sys::Corpus; use libfuzzer_sys::fuzz_target; -use vortex_array::Array; use vortex_array::Canonical; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::ToCanonical; use vortex_array::arrays::ChunkedArray; diff --git a/fuzz/src/array/cast.rs b/fuzz/src/array/cast.rs index afa54b6f076..6332f5252ed 100644 --- a/fuzz/src/array/cast.rs +++ b/fuzz/src/array/cast.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::ToCanonical; use vortex_array::arrays::PrimitiveArray; use vortex_array::dtype::DType; diff --git a/fuzz/src/array/compare.rs b/fuzz/src/array/compare.rs index a6960022780..a43f8e89b3c 100644 --- a/fuzz/src/array/compare.rs +++ b/fuzz/src/array/compare.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::ToCanonical; use vortex_array::accessor::ArrayAccessor; diff --git a/fuzz/src/array/fill_null.rs b/fuzz/src/array/fill_null.rs index 1e9319963d6..7b0969c26ba 100644 --- a/fuzz/src/array/fill_null.rs +++ b/fuzz/src/array/fill_null.rs @@ -249,7 +249,7 @@ fn fill_varbinview_array( #[cfg(test)] mod tests { - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::BoolArray; use vortex_array::arrays::DecimalArray; diff --git a/fuzz/src/array/filter.rs b/fuzz/src/array/filter.rs index 5b611b4b004..fb4f96cd484 100644 --- a/fuzz/src/array/filter.rs +++ b/fuzz/src/array/filter.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::ToCanonical; use vortex_array::accessor::ArrayAccessor; diff --git a/fuzz/src/array/mask.rs b/fuzz/src/array/mask.rs index 5d0fd87e605..692a13cd35d 100644 --- a/fuzz/src/array/mask.rs +++ b/fuzz/src/array/mask.rs @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; use vortex_array::ArrayRef; use vortex_array::Canonical; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::ToCanonical; use vortex_array::arrays::BoolArray; @@ -138,7 +138,7 @@ pub fn mask_canonical_array(canonical: Canonical, mask: &Mask) -> VortexResult = &'a vortex_array::arrays::ScalarFnArray -pub fn vortex_array::arrays::AnyScalarFn::matches(array: &dyn vortex_array::Array) -> bool +pub fn vortex_array::arrays::AnyScalarFn::matches(array: &dyn vortex_array::DynArray) -> bool -pub fn vortex_array::arrays::AnyScalarFn::try_match(array: &dyn vortex_array::Array) -> core::option::Option +pub fn vortex_array::arrays::AnyScalarFn::try_match(array: &dyn vortex_array::DynArray) -> core::option::Option pub struct vortex_array::arrays::BoolArray @@ -360,9 +360,9 @@ impl core::clone::Clone for vortex_array::arrays::BoolArray pub fn vortex_array::arrays::BoolArray::clone(&self) -> vortex_array::arrays::BoolArray -impl core::convert::AsRef for vortex_array::arrays::BoolArray +impl core::convert::AsRef for vortex_array::arrays::BoolArray -pub fn vortex_array::arrays::BoolArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::BoolArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -386,7 +386,7 @@ pub fn vortex_array::arrays::BoolArray::from_iter &Self::Target @@ -574,9 +574,9 @@ impl core::clone::Clone for vortex_array::arrays::ChunkedArray pub fn vortex_array::arrays::ChunkedArray::clone(&self) -> vortex_array::arrays::ChunkedArray -impl core::convert::AsRef for vortex_array::arrays::ChunkedArray +impl core::convert::AsRef for vortex_array::arrays::ChunkedArray -pub fn vortex_array::arrays::ChunkedArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::ChunkedArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -586,13 +586,13 @@ impl core::fmt::Debug for vortex_array::arrays::ChunkedArray pub fn vortex_array::arrays::ChunkedArray::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result -impl core::iter::traits::collect::FromIterator> for vortex_array::arrays::ChunkedArray +impl core::iter::traits::collect::FromIterator> for vortex_array::arrays::ChunkedArray pub fn vortex_array::arrays::ChunkedArray::from_iter>(iter: T) -> Self impl core::ops::deref::Deref for vortex_array::arrays::ChunkedArray -pub type vortex_array::arrays::ChunkedArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::ChunkedArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::ChunkedArray::deref(&self) -> &Self::Target @@ -732,9 +732,9 @@ impl core::clone::Clone for vortex_array::arrays::ConstantArray pub fn vortex_array::arrays::ConstantArray::clone(&self) -> vortex_array::arrays::ConstantArray -impl core::convert::AsRef for vortex_array::arrays::ConstantArray +impl core::convert::AsRef for vortex_array::arrays::ConstantArray -pub fn vortex_array::arrays::ConstantArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::ConstantArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -746,7 +746,7 @@ pub fn vortex_array::arrays::ConstantArray::fmt(&self, f: &mut core::fmt::Format impl core::ops::deref::Deref for vortex_array::arrays::ConstantArray -pub type vortex_array::arrays::ConstantArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::ConstantArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::ConstantArray::deref(&self) -> &Self::Target @@ -908,9 +908,9 @@ impl core::clone::Clone for vortex_array::arrays::DecimalArray pub fn vortex_array::arrays::DecimalArray::clone(&self) -> vortex_array::arrays::DecimalArray -impl core::convert::AsRef for vortex_array::arrays::DecimalArray +impl core::convert::AsRef for vortex_array::arrays::DecimalArray -pub fn vortex_array::arrays::DecimalArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::DecimalArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -922,7 +922,7 @@ pub fn vortex_array::arrays::DecimalArray::fmt(&self, f: &mut core::fmt::Formatt impl core::ops::deref::Deref for vortex_array::arrays::DecimalArray -pub type vortex_array::arrays::DecimalArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::DecimalArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::DecimalArray::deref(&self) -> &Self::Target @@ -1108,9 +1108,9 @@ impl core::clone::Clone for vortex_array::arrays::DictArray pub fn vortex_array::arrays::DictArray::clone(&self) -> vortex_array::arrays::DictArray -impl core::convert::AsRef for vortex_array::arrays::DictArray +impl core::convert::AsRef for vortex_array::arrays::DictArray -pub fn vortex_array::arrays::DictArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::DictArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -1122,7 +1122,7 @@ pub fn vortex_array::arrays::DictArray::fmt(&self, f: &mut core::fmt::Formatter< impl core::ops::deref::Deref for vortex_array::arrays::DictArray -pub type vortex_array::arrays::DictArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::DictArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::DictArray::deref(&self) -> &Self::Target @@ -1304,9 +1304,9 @@ impl vortex_array::matcher::Matcher pub type vortex_array::arrays::ExactScalarFn::Match<'a> = vortex_array::arrays::ScalarFnArrayView<'a, F> -pub fn vortex_array::arrays::ExactScalarFn::matches(array: &dyn vortex_array::Array) -> bool +pub fn vortex_array::arrays::ExactScalarFn::matches(array: &dyn vortex_array::DynArray) -> bool -pub fn vortex_array::arrays::ExactScalarFn::try_match(array: &dyn vortex_array::Array) -> core::option::Option +pub fn vortex_array::arrays::ExactScalarFn::try_match(array: &dyn vortex_array::DynArray) -> core::option::Option pub struct vortex_array::arrays::ExtensionArray @@ -1324,9 +1324,9 @@ impl core::clone::Clone for vortex_array::arrays::ExtensionArray pub fn vortex_array::arrays::ExtensionArray::clone(&self) -> vortex_array::arrays::ExtensionArray -impl core::convert::AsRef for vortex_array::arrays::ExtensionArray +impl core::convert::AsRef for vortex_array::arrays::ExtensionArray -pub fn vortex_array::arrays::ExtensionArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::ExtensionArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From<&vortex_array::arrays::TemporalArray> for vortex_array::arrays::ExtensionArray @@ -1352,7 +1352,7 @@ pub fn vortex_array::arrays::ExtensionArray::fmt(&self, f: &mut core::fmt::Forma impl core::ops::deref::Deref for vortex_array::arrays::ExtensionArray -pub type vortex_array::arrays::ExtensionArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::ExtensionArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::ExtensionArray::deref(&self) -> &Self::Target @@ -1496,9 +1496,9 @@ impl core::clone::Clone for vortex_array::arrays::FilterArray pub fn vortex_array::arrays::FilterArray::clone(&self) -> vortex_array::arrays::FilterArray -impl core::convert::AsRef for vortex_array::arrays::FilterArray +impl core::convert::AsRef for vortex_array::arrays::FilterArray -pub fn vortex_array::arrays::FilterArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::FilterArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -1510,7 +1510,7 @@ pub fn vortex_array::arrays::FilterArray::fmt(&self, f: &mut core::fmt::Formatte impl core::ops::deref::Deref for vortex_array::arrays::FilterArray -pub type vortex_array::arrays::FilterArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::FilterArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::FilterArray::deref(&self) -> &Self::Target @@ -1652,9 +1652,9 @@ impl core::clone::Clone for vortex_array::arrays::FixedSizeListArray pub fn vortex_array::arrays::FixedSizeListArray::clone(&self) -> vortex_array::arrays::FixedSizeListArray -impl core::convert::AsRef for vortex_array::arrays::FixedSizeListArray +impl core::convert::AsRef for vortex_array::arrays::FixedSizeListArray -pub fn vortex_array::arrays::FixedSizeListArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::FixedSizeListArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -1666,7 +1666,7 @@ pub fn vortex_array::arrays::FixedSizeListArray::fmt(&self, f: &mut core::fmt::F impl core::ops::deref::Deref for vortex_array::arrays::FixedSizeListArray -pub type vortex_array::arrays::FixedSizeListArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::FixedSizeListArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::FixedSizeListArray::deref(&self) -> &Self::Target @@ -1840,9 +1840,9 @@ impl core::clone::Clone for vortex_array::arrays::ListArray pub fn vortex_array::arrays::ListArray::clone(&self) -> vortex_array::arrays::ListArray -impl core::convert::AsRef for vortex_array::arrays::ListArray +impl core::convert::AsRef for vortex_array::arrays::ListArray -pub fn vortex_array::arrays::ListArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::ListArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -1854,7 +1854,7 @@ pub fn vortex_array::arrays::ListArray::fmt(&self, f: &mut core::fmt::Formatter< impl core::ops::deref::Deref for vortex_array::arrays::ListArray -pub type vortex_array::arrays::ListArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::ListArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::ListArray::deref(&self) -> &Self::Target @@ -2018,9 +2018,9 @@ impl core::clone::Clone for vortex_array::arrays::ListViewArray pub fn vortex_array::arrays::ListViewArray::clone(&self) -> vortex_array::arrays::ListViewArray -impl core::convert::AsRef for vortex_array::arrays::ListViewArray +impl core::convert::AsRef for vortex_array::arrays::ListViewArray -pub fn vortex_array::arrays::ListViewArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::ListViewArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -2032,7 +2032,7 @@ pub fn vortex_array::arrays::ListViewArray::fmt(&self, f: &mut core::fmt::Format impl core::ops::deref::Deref for vortex_array::arrays::ListViewArray -pub type vortex_array::arrays::ListViewArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::ListViewArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::ListViewArray::deref(&self) -> &Self::Target @@ -2170,9 +2170,9 @@ impl core::clone::Clone for vortex_array::arrays::MaskedArray pub fn vortex_array::arrays::MaskedArray::clone(&self) -> vortex_array::arrays::MaskedArray -impl core::convert::AsRef for vortex_array::arrays::MaskedArray +impl core::convert::AsRef for vortex_array::arrays::MaskedArray -pub fn vortex_array::arrays::MaskedArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::MaskedArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -2184,7 +2184,7 @@ pub fn vortex_array::arrays::MaskedArray::fmt(&self, f: &mut core::fmt::Formatte impl core::ops::deref::Deref for vortex_array::arrays::MaskedArray -pub type vortex_array::arrays::MaskedArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::MaskedArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::MaskedArray::deref(&self) -> &Self::Target @@ -2356,9 +2356,9 @@ impl core::clone::Clone for vortex_array::arrays::NullArray pub fn vortex_array::arrays::NullArray::clone(&self) -> vortex_array::arrays::NullArray -impl core::convert::AsRef for vortex_array::arrays::NullArray +impl core::convert::AsRef for vortex_array::arrays::NullArray -pub fn vortex_array::arrays::NullArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::NullArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -2370,7 +2370,7 @@ pub fn vortex_array::arrays::NullArray::fmt(&self, f: &mut core::fmt::Formatter< impl core::ops::deref::Deref for vortex_array::arrays::NullArray -pub type vortex_array::arrays::NullArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::NullArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::NullArray::deref(&self) -> &Self::Target @@ -2550,9 +2550,9 @@ impl core::clone::Clone for vortex_array::arrays::PrimitiveArray pub fn vortex_array::arrays::PrimitiveArray::clone(&self) -> vortex_array::arrays::PrimitiveArray -impl core::convert::AsRef for vortex_array::arrays::PrimitiveArray +impl core::convert::AsRef for vortex_array::arrays::PrimitiveArray -pub fn vortex_array::arrays::PrimitiveArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::PrimitiveArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -2564,7 +2564,7 @@ pub fn vortex_array::arrays::PrimitiveArray::fmt(&self, f: &mut core::fmt::Forma impl core::ops::deref::Deref for vortex_array::arrays::PrimitiveArray -pub type vortex_array::arrays::PrimitiveArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::PrimitiveArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::PrimitiveArray::deref(&self) -> &Self::Target @@ -2776,9 +2776,9 @@ impl core::clone::Clone for vortex_array::arrays::ScalarFnArray pub fn vortex_array::arrays::ScalarFnArray::clone(&self) -> vortex_array::arrays::ScalarFnArray -impl core::convert::AsRef for vortex_array::arrays::ScalarFnArray +impl core::convert::AsRef for vortex_array::arrays::ScalarFnArray -pub fn vortex_array::arrays::ScalarFnArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::ScalarFnArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -2790,7 +2790,7 @@ pub fn vortex_array::arrays::ScalarFnArray::fmt(&self, f: &mut core::fmt::Format impl core::ops::deref::Deref for vortex_array::arrays::ScalarFnArray -pub type vortex_array::arrays::ScalarFnArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::ScalarFnArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::ScalarFnArray::deref(&self) -> &Self::Target @@ -2818,7 +2818,7 @@ pub vortex_array::arrays::ScalarFnArrayView::vtable: &'a F impl core::ops::deref::Deref for vortex_array::arrays::ScalarFnArrayView<'_, F> -pub type vortex_array::arrays::ScalarFnArrayView<'_, F>::Target = dyn vortex_array::Array +pub type vortex_array::arrays::ScalarFnArrayView<'_, F>::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::ScalarFnArrayView<'_, F>::deref(&self) -> &Self::Target @@ -2912,9 +2912,9 @@ impl core::clone::Clone for vortex_array::arrays::SharedArray pub fn vortex_array::arrays::SharedArray::clone(&self) -> vortex_array::arrays::SharedArray -impl core::convert::AsRef for vortex_array::arrays::SharedArray +impl core::convert::AsRef for vortex_array::arrays::SharedArray -pub fn vortex_array::arrays::SharedArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::SharedArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -2926,7 +2926,7 @@ pub fn vortex_array::arrays::SharedArray::fmt(&self, f: &mut core::fmt::Formatte impl core::ops::deref::Deref for vortex_array::arrays::SharedArray -pub type vortex_array::arrays::SharedArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::SharedArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::SharedArray::deref(&self) -> &Self::Target @@ -3024,9 +3024,9 @@ impl core::clone::Clone for vortex_array::arrays::SliceArray pub fn vortex_array::arrays::SliceArray::clone(&self) -> vortex_array::arrays::SliceArray -impl core::convert::AsRef for vortex_array::arrays::SliceArray +impl core::convert::AsRef for vortex_array::arrays::SliceArray -pub fn vortex_array::arrays::SliceArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::SliceArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -3038,7 +3038,7 @@ pub fn vortex_array::arrays::SliceArray::fmt(&self, f: &mut core::fmt::Formatter impl core::ops::deref::Deref for vortex_array::arrays::SliceArray -pub type vortex_array::arrays::SliceArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::SliceArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::SliceArray::deref(&self) -> &Self::Target @@ -3216,9 +3216,9 @@ impl core::clone::Clone for vortex_array::arrays::StructArray pub fn vortex_array::arrays::StructArray::clone(&self) -> vortex_array::arrays::StructArray -impl core::convert::AsRef for vortex_array::arrays::StructArray +impl core::convert::AsRef for vortex_array::arrays::StructArray -pub fn vortex_array::arrays::StructArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::StructArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -3230,7 +3230,7 @@ pub fn vortex_array::arrays::StructArray::fmt(&self, f: &mut core::fmt::Formatte impl core::ops::deref::Deref for vortex_array::arrays::StructArray -pub type vortex_array::arrays::StructArray::Target = dyn vortex_array::Array +pub type vortex_array::arrays::StructArray::Target = dyn vortex_array::DynArray pub fn vortex_array::arrays::StructArray::deref(&self) -> &Self::Target @@ -3406,9 +3406,9 @@ impl core::clone::Clone for vortex_array::arrays::TemporalArray pub fn vortex_array::arrays::TemporalArray::clone(&self) -> vortex_array::arrays::TemporalArray -impl core::convert::AsRef for vortex_array::arrays::TemporalArray +impl core::convert::AsRef for vortex_array::arrays::TemporalArray -pub fn vortex_array::arrays::TemporalArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::TemporalArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From<&vortex_array::arrays::TemporalArray> for vortex_array::arrays::ExtensionArray @@ -3422,7 +3422,7 @@ impl core::convert::From for vortex_array:: pub fn vortex_array::arrays::ExtensionArray::from(value: vortex_array::arrays::TemporalArray) -> Self -impl core::convert::TryFrom> for vortex_array::arrays::TemporalArray +impl core::convert::TryFrom> for vortex_array::arrays::TemporalArray pub type vortex_array::arrays::TemporalArray::Error = vortex_error::VortexError @@ -3484,9 +3484,9 @@ impl core::clone::Clone for vortex_array::arrays::VarBinArray pub fn vortex_array::arrays::VarBinArray::clone(&self) -> vortex_array::arrays::VarBinArray -impl core::convert::AsRef for vortex_array::arrays::VarBinArray +impl core::convert::AsRef for vortex_array::arrays::VarBinArray -pub fn vortex_array::arrays::VarBinArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::VarBinArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From> for vortex_array::arrays::VarBinArray @@ -3538,7 +3538,7 @@ pub fn vortex_array::arrays::VarBinArray::from_iter &Self::Target @@ -3728,9 +3728,9 @@ impl core::clone::Clone for vortex_array::arrays::VarBinViewArray pub fn vortex_array::arrays::VarBinViewArray::clone(&self) -> vortex_array::arrays::VarBinViewArray -impl core::convert::AsRef for vortex_array::arrays::VarBinViewArray +impl core::convert::AsRef for vortex_array::arrays::VarBinViewArray -pub fn vortex_array::arrays::VarBinViewArray::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::arrays::VarBinViewArray::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From for vortex_array::ArrayRef @@ -3750,7 +3750,7 @@ pub fn vortex_array::arrays::VarBinViewArray::from_iter &Self::Target @@ -4140,7 +4140,7 @@ pub fn vortex_array::arrow::ArrowArrayStreamAdapter::new(stream: arrow_array::ff impl core::iter::traits::iterator::Iterator for vortex_array::arrow::ArrowArrayStreamAdapter -pub type vortex_array::arrow::ArrowArrayStreamAdapter::Item = core::result::Result, vortex_error::VortexError> +pub type vortex_array::arrow::ArrowArrayStreamAdapter::Item = core::result::Result, vortex_error::VortexError> pub fn vortex_array::arrow::ArrowArrayStreamAdapter::next(&mut self) -> core::option::Option @@ -5708,7 +5708,7 @@ impl core::marker::StructuralPartialEq for vortex_array::compute::Cost pub enum vortex_array::compute::Input<'a> -pub vortex_array::compute::Input::Array(&'a dyn vortex_array::Array) +pub vortex_array::compute::Input::Array(&'a dyn vortex_array::DynArray) pub vortex_array::compute::Input::Builder(&'a mut dyn vortex_array::builders::ArrayBuilder) @@ -5720,7 +5720,7 @@ pub vortex_array::compute::Input::Scalar(&'a vortex_array::scalar::Scalar) impl<'a> vortex_array::compute::Input<'a> -pub fn vortex_array::compute::Input<'a>::array(&self) -> core::option::Option<&'a dyn vortex_array::Array> +pub fn vortex_array::compute::Input<'a>::array(&self) -> core::option::Option<&'a dyn vortex_array::DynArray> pub fn vortex_array::compute::Input<'a>::builder(&'a mut self) -> core::option::Option<&'a mut dyn vortex_array::builders::ArrayBuilder> @@ -5734,11 +5734,11 @@ impl core::fmt::Debug for vortex_array::compute::Input<'_> pub fn vortex_array::compute::Input<'_>::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result -impl<'a> core::convert::From<&'a (dyn vortex_array::Array + 'static)> for vortex_array::compute::Input<'a> +impl<'a> core::convert::From<&'a (dyn vortex_array::DynArray + 'static)> for vortex_array::compute::Input<'a> -pub fn vortex_array::compute::Input<'a>::from(value: &'a dyn vortex_array::Array) -> Self +pub fn vortex_array::compute::Input<'a>::from(value: &'a dyn vortex_array::DynArray) -> Self -impl<'a> core::convert::From<&'a alloc::sync::Arc> for vortex_array::compute::Input<'a> +impl<'a> core::convert::From<&'a alloc::sync::Arc> for vortex_array::compute::Input<'a> pub fn vortex_array::compute::Input<'a>::from(value: &'a vortex_array::ArrayRef) -> Self @@ -5770,7 +5770,7 @@ pub fn vortex_array::compute::Output::unwrap_array(self) -> vortex_error::Vortex pub fn vortex_array::compute::Output::unwrap_scalar(self) -> vortex_error::VortexResult -impl core::convert::From> for vortex_array::compute::Output +impl core::convert::From> for vortex_array::compute::Output pub fn vortex_array::compute::Output::from(value: vortex_array::ArrayRef) -> Self @@ -5784,11 +5784,11 @@ pub fn vortex_array::compute::Output::fmt(&self, f: &mut core::fmt::Formatter<'_ pub struct vortex_array::compute::BinaryArgs<'a, O: vortex_array::compute::Options> -pub vortex_array::compute::BinaryArgs::lhs: &'a dyn vortex_array::Array +pub vortex_array::compute::BinaryArgs::lhs: &'a dyn vortex_array::DynArray pub vortex_array::compute::BinaryArgs::options: &'a O -pub vortex_array::compute::BinaryArgs::rhs: &'a dyn vortex_array::Array +pub vortex_array::compute::BinaryArgs::rhs: &'a dyn vortex_array::DynArray impl<'a, O: vortex_array::compute::Options> core::convert::TryFrom<&vortex_array::compute::InvocationArgs<'a>> for vortex_array::compute::BinaryArgs<'a, O> @@ -5982,7 +5982,7 @@ pub struct vortex_array::compute::SumArgs<'a> pub vortex_array::compute::SumArgs::accumulator: &'a vortex_array::scalar::Scalar -pub vortex_array::compute::SumArgs::array: &'a dyn vortex_array::Array +pub vortex_array::compute::SumArgs::array: &'a dyn vortex_array::DynArray impl<'a> core::convert::TryFrom<&vortex_array::compute::InvocationArgs<'a>> for vortex_array::compute::SumArgs<'a> @@ -6010,7 +6010,7 @@ impl inventory::Collect for vortex_array::compute::SumKernelRef pub struct vortex_array::compute::UnaryArgs<'a, O: vortex_array::compute::Options> -pub vortex_array::compute::UnaryArgs::array: &'a dyn vortex_array::Array +pub vortex_array::compute::UnaryArgs::array: &'a dyn vortex_array::DynArray pub vortex_array::compute::UnaryArgs::options: &'a O @@ -6316,7 +6316,7 @@ pub fn vortex_array::compute::and_kleene(lhs: &vortex_array::ArrayRef, rhs: &vor pub fn vortex_array::compute::arrow_filter_fn(array: &vortex_array::ArrayRef, mask: &vortex_mask::Mask) -> vortex_error::VortexResult -pub fn vortex_array::compute::cast(array: &dyn vortex_array::Array, dtype: &vortex_array::dtype::DType) -> vortex_error::VortexResult +pub fn vortex_array::compute::cast(array: &dyn vortex_array::DynArray, dtype: &vortex_array::dtype::DType) -> vortex_error::VortexResult pub fn vortex_array::compute::div(lhs: &vortex_array::ArrayRef, rhs: &vortex_array::ArrayRef) -> vortex_error::VortexResult @@ -6388,7 +6388,7 @@ impl core::default::Default for vortex_array::display::DisplayOptions pub fn vortex_array::display::DisplayOptions::default() -> Self -pub struct vortex_array::display::DisplayArrayAs<'a>(pub &'a dyn vortex_array::Array, pub vortex_array::display::DisplayOptions) +pub struct vortex_array::display::DisplayArrayAs<'a>(pub &'a dyn vortex_array::DynArray, pub vortex_array::display::DisplayOptions) impl core::fmt::Display for vortex_array::display::DisplayArrayAs<'_> @@ -10610,7 +10610,7 @@ pub fn vortex_array::iter::ArrayIteratorAdapter::new(dtype: vortex_array::dty impl core::iter::traits::iterator::Iterator for vortex_array::iter::ArrayIteratorAdapter where I: core::iter::traits::iterator::Iterator> -pub type vortex_array::iter::ArrayIteratorAdapter::Item = core::result::Result, vortex_error::VortexError> +pub type vortex_array::iter::ArrayIteratorAdapter::Item = core::result::Result, vortex_error::VortexError> pub fn vortex_array::iter::ArrayIteratorAdapter::next(&mut self) -> core::option::Option @@ -10772,67 +10772,67 @@ pub fn vortex_array::matcher::AnyArray::fmt(&self, f: &mut core::fmt::Formatter< impl vortex_array::matcher::Matcher for vortex_array::matcher::AnyArray -pub type vortex_array::matcher::AnyArray::Match<'a> = &'a (dyn vortex_array::Array + 'static) +pub type vortex_array::matcher::AnyArray::Match<'a> = &'a (dyn vortex_array::DynArray + 'static) -pub fn vortex_array::matcher::AnyArray::matches(_array: &dyn vortex_array::Array) -> bool +pub fn vortex_array::matcher::AnyArray::matches(_array: &dyn vortex_array::DynArray) -> bool -pub fn vortex_array::matcher::AnyArray::try_match(array: &dyn vortex_array::Array) -> core::option::Option +pub fn vortex_array::matcher::AnyArray::try_match(array: &dyn vortex_array::DynArray) -> core::option::Option pub trait vortex_array::matcher::Matcher pub type vortex_array::matcher::Matcher::Match<'a> -pub fn vortex_array::matcher::Matcher::matches(array: &dyn vortex_array::Array) -> bool +pub fn vortex_array::matcher::Matcher::matches(array: &dyn vortex_array::DynArray) -> bool -pub fn vortex_array::matcher::Matcher::try_match<'a>(array: &'a dyn vortex_array::Array) -> core::option::Option +pub fn vortex_array::matcher::Matcher::try_match<'a>(array: &'a dyn vortex_array::DynArray) -> core::option::Option impl vortex_array::matcher::Matcher for vortex_array::AnyCanonical pub type vortex_array::AnyCanonical::Match<'a> = vortex_array::CanonicalView<'a> -pub fn vortex_array::AnyCanonical::matches(array: &dyn vortex_array::Array) -> bool +pub fn vortex_array::AnyCanonical::matches(array: &dyn vortex_array::DynArray) -> bool -pub fn vortex_array::AnyCanonical::try_match<'a>(array: &'a dyn vortex_array::Array) -> core::option::Option +pub fn vortex_array::AnyCanonical::try_match<'a>(array: &'a dyn vortex_array::DynArray) -> core::option::Option impl vortex_array::matcher::Matcher for vortex_array::AnyColumnar pub type vortex_array::AnyColumnar::Match<'a> = vortex_array::ColumnarView<'a> -pub fn vortex_array::AnyColumnar::matches(array: &dyn vortex_array::Array) -> bool +pub fn vortex_array::AnyColumnar::matches(array: &dyn vortex_array::DynArray) -> bool -pub fn vortex_array::AnyColumnar::try_match<'a>(array: &'a dyn vortex_array::Array) -> core::option::Option +pub fn vortex_array::AnyColumnar::try_match<'a>(array: &'a dyn vortex_array::DynArray) -> core::option::Option impl vortex_array::matcher::Matcher for vortex_array::arrays::AnyScalarFn pub type vortex_array::arrays::AnyScalarFn::Match<'a> = &'a vortex_array::arrays::ScalarFnArray -pub fn vortex_array::arrays::AnyScalarFn::matches(array: &dyn vortex_array::Array) -> bool +pub fn vortex_array::arrays::AnyScalarFn::matches(array: &dyn vortex_array::DynArray) -> bool -pub fn vortex_array::arrays::AnyScalarFn::try_match(array: &dyn vortex_array::Array) -> core::option::Option +pub fn vortex_array::arrays::AnyScalarFn::try_match(array: &dyn vortex_array::DynArray) -> core::option::Option impl vortex_array::matcher::Matcher for vortex_array::matcher::AnyArray -pub type vortex_array::matcher::AnyArray::Match<'a> = &'a (dyn vortex_array::Array + 'static) +pub type vortex_array::matcher::AnyArray::Match<'a> = &'a (dyn vortex_array::DynArray + 'static) -pub fn vortex_array::matcher::AnyArray::matches(_array: &dyn vortex_array::Array) -> bool +pub fn vortex_array::matcher::AnyArray::matches(_array: &dyn vortex_array::DynArray) -> bool -pub fn vortex_array::matcher::AnyArray::try_match(array: &dyn vortex_array::Array) -> core::option::Option +pub fn vortex_array::matcher::AnyArray::try_match(array: &dyn vortex_array::DynArray) -> core::option::Option impl vortex_array::matcher::Matcher for vortex_array::arrays::ExactScalarFn pub type vortex_array::arrays::ExactScalarFn::Match<'a> = vortex_array::arrays::ScalarFnArrayView<'a, F> -pub fn vortex_array::arrays::ExactScalarFn::matches(array: &dyn vortex_array::Array) -> bool +pub fn vortex_array::arrays::ExactScalarFn::matches(array: &dyn vortex_array::DynArray) -> bool -pub fn vortex_array::arrays::ExactScalarFn::try_match(array: &dyn vortex_array::Array) -> core::option::Option +pub fn vortex_array::arrays::ExactScalarFn::try_match(array: &dyn vortex_array::DynArray) -> core::option::Option impl vortex_array::matcher::Matcher for V pub type V::Match<'a> = &'a ::Array -pub fn V::matches(array: &dyn vortex_array::Array) -> bool +pub fn V::matches(array: &dyn vortex_array::DynArray) -> bool -pub fn V::try_match<'a>(array: &'a dyn vortex_array::Array) -> core::option::Option +pub fn V::try_match<'a>(array: &'a dyn vortex_array::DynArray) -> core::option::Option pub mod vortex_array::normalize @@ -12714,19 +12714,19 @@ impl core::hash::Hash for vortex_array::scalar::Scalar pub fn vortex_array::scalar::Scalar::hash(&self, state: &mut H) -impl vortex_array::search_sorted::IndexOrd for (dyn vortex_array::Array + '_) +impl vortex_array::search_sorted::IndexOrd for (dyn vortex_array::DynArray + '_) -pub fn (dyn vortex_array::Array + '_)::index_cmp(&self, idx: usize, elem: &vortex_array::scalar::Scalar) -> vortex_error::VortexResult> +pub fn (dyn vortex_array::DynArray + '_)::index_cmp(&self, idx: usize, elem: &vortex_array::scalar::Scalar) -> vortex_error::VortexResult> -pub fn (dyn vortex_array::Array + '_)::index_ge(&self, idx: usize, elem: &V) -> vortex_error::VortexResult +pub fn (dyn vortex_array::DynArray + '_)::index_ge(&self, idx: usize, elem: &V) -> vortex_error::VortexResult -pub fn (dyn vortex_array::Array + '_)::index_gt(&self, idx: usize, elem: &V) -> vortex_error::VortexResult +pub fn (dyn vortex_array::DynArray + '_)::index_gt(&self, idx: usize, elem: &V) -> vortex_error::VortexResult -pub fn (dyn vortex_array::Array + '_)::index_le(&self, idx: usize, elem: &V) -> vortex_error::VortexResult +pub fn (dyn vortex_array::DynArray + '_)::index_le(&self, idx: usize, elem: &V) -> vortex_error::VortexResult -pub fn (dyn vortex_array::Array + '_)::index_len(&self) -> usize +pub fn (dyn vortex_array::DynArray + '_)::index_len(&self) -> usize -pub fn (dyn vortex_array::Array + '_)::index_lt(&self, idx: usize, elem: &V) -> vortex_error::VortexResult +pub fn (dyn vortex_array::DynArray + '_)::index_lt(&self, idx: usize, elem: &V) -> vortex_error::VortexResult impl<'a, T> core::convert::TryFrom<&'a vortex_array::scalar::Scalar> for alloc::vec::Vec where T: for<'b> core::convert::TryFrom<&'b vortex_array::scalar::Scalar, Error = vortex_error::VortexError> @@ -15750,19 +15750,19 @@ pub fn vortex_array::variants::PrimitiveTyped<'_>::index_len(&self) -> usize pub fn vortex_array::variants::PrimitiveTyped<'_>::index_lt(&self, idx: usize, elem: &V) -> vortex_error::VortexResult -impl vortex_array::search_sorted::IndexOrd for (dyn vortex_array::Array + '_) +impl vortex_array::search_sorted::IndexOrd for (dyn vortex_array::DynArray + '_) -pub fn (dyn vortex_array::Array + '_)::index_cmp(&self, idx: usize, elem: &vortex_array::scalar::Scalar) -> vortex_error::VortexResult> +pub fn (dyn vortex_array::DynArray + '_)::index_cmp(&self, idx: usize, elem: &vortex_array::scalar::Scalar) -> vortex_error::VortexResult> -pub fn (dyn vortex_array::Array + '_)::index_ge(&self, idx: usize, elem: &V) -> vortex_error::VortexResult +pub fn (dyn vortex_array::DynArray + '_)::index_ge(&self, idx: usize, elem: &V) -> vortex_error::VortexResult -pub fn (dyn vortex_array::Array + '_)::index_gt(&self, idx: usize, elem: &V) -> vortex_error::VortexResult +pub fn (dyn vortex_array::DynArray + '_)::index_gt(&self, idx: usize, elem: &V) -> vortex_error::VortexResult -pub fn (dyn vortex_array::Array + '_)::index_le(&self, idx: usize, elem: &V) -> vortex_error::VortexResult +pub fn (dyn vortex_array::DynArray + '_)::index_le(&self, idx: usize, elem: &V) -> vortex_error::VortexResult -pub fn (dyn vortex_array::Array + '_)::index_len(&self) -> usize +pub fn (dyn vortex_array::DynArray + '_)::index_len(&self) -> usize -pub fn (dyn vortex_array::Array + '_)::index_lt(&self, idx: usize, elem: &V) -> vortex_error::VortexResult +pub fn (dyn vortex_array::DynArray + '_)::index_lt(&self, idx: usize, elem: &V) -> vortex_error::VortexResult impl vortex_array::search_sorted::IndexOrd for [T] @@ -15796,7 +15796,7 @@ pub struct vortex_array::serde::ArrayNodeFlatBuffer<'a> impl<'a> vortex_array::serde::ArrayNodeFlatBuffer<'a> -pub fn vortex_array::serde::ArrayNodeFlatBuffer<'a>::try_new(ctx: &'a vortex_array::ArrayContext, array: &'a dyn vortex_array::Array) -> vortex_error::VortexResult +pub fn vortex_array::serde::ArrayNodeFlatBuffer<'a>::try_new(ctx: &'a vortex_array::ArrayContext, array: &'a dyn vortex_array::DynArray) -> vortex_error::VortexResult pub fn vortex_array::serde::ArrayNodeFlatBuffer<'a>::try_write_flatbuffer<'fb>(&self, fbb: &mut flatbuffers::builder::FlatBufferBuilder<'fb>) -> vortex_error::VortexResult>> @@ -15920,7 +15920,7 @@ pub fn vortex_array::stats::ArrayStats::retain(&self, stats: &[vortex_array::exp pub fn vortex_array::stats::ArrayStats::set(&self, stat: vortex_array::expr::stats::Stat, value: vortex_array::expr::stats::Precision) -pub fn vortex_array::stats::ArrayStats::to_ref<'a>(&'a self, array: &'a dyn vortex_array::Array) -> vortex_array::stats::StatsSetRef<'a> +pub fn vortex_array::stats::ArrayStats::to_ref<'a>(&'a self, array: &'a dyn vortex_array::DynArray) -> vortex_array::stats::StatsSetRef<'a> impl core::clone::Clone for vortex_array::stats::ArrayStats @@ -16152,7 +16152,7 @@ impl<'__pin, S> core::marker::Unpin for vortex_array::stream::ArrayStreamAdapter impl futures_core::stream::Stream for vortex_array::stream::ArrayStreamAdapter where S: futures_core::stream::Stream> -pub type vortex_array::stream::ArrayStreamAdapter::Item = core::result::Result, vortex_error::VortexError> +pub type vortex_array::stream::ArrayStreamAdapter::Item = core::result::Result, vortex_error::VortexError> pub fn vortex_array::stream::ArrayStreamAdapter::poll_next(self: core::pin::Pin<&mut Self>, cx: &mut core::task::wake::Context<'_>) -> core::task::poll::Poll> @@ -16510,7 +16510,7 @@ pub fn vortex_array::vtable::NotSupported::scalar_at(array: & + vortex_array::IntoArray +pub type vortex_array::vtable::VTable::Array: 'static + core::marker::Send + core::marker::Sync + core::clone::Clone + core::fmt::Debug + core::ops::deref::Deref + vortex_array::IntoArray pub type vortex_array::vtable::VTable::Metadata: core::fmt::Debug @@ -17818,9 +17818,9 @@ impl core::clone::Clone for vortex_array::Canonical pub fn vortex_array::Canonical::clone(&self) -> vortex_array::Canonical -impl core::convert::AsRef for vortex_array::Canonical +impl core::convert::AsRef for vortex_array::Canonical -pub fn vortex_array::Canonical::as_ref(&self) -> &(dyn vortex_array::Array + 'static) +pub fn vortex_array::Canonical::as_ref(&self) -> &(dyn vortex_array::DynArray + 'static) impl core::convert::From for vortex_array::ArrayRef @@ -17862,9 +17862,9 @@ pub vortex_array::CanonicalView::Struct(&'a vortex_array::arrays::StructArray) pub vortex_array::CanonicalView::VarBinView(&'a vortex_array::arrays::VarBinViewArray) -impl core::convert::AsRef for vortex_array::CanonicalView<'_> +impl core::convert::AsRef for vortex_array::CanonicalView<'_> -pub fn vortex_array::CanonicalView<'_>::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::CanonicalView<'_>::as_ref(&self) -> &dyn vortex_array::DynArray impl core::convert::From> for vortex_array::Canonical @@ -17908,9 +17908,9 @@ pub vortex_array::ColumnarView::Canonical(vortex_array::CanonicalView<'a>) pub vortex_array::ColumnarView::Constant(&'a vortex_array::arrays::ConstantArray) -impl<'a> core::convert::AsRef for vortex_array::ColumnarView<'a> +impl<'a> core::convert::AsRef for vortex_array::ColumnarView<'a> -pub fn vortex_array::ColumnarView<'a>::as_ref(&self) -> &dyn vortex_array::Array +pub fn vortex_array::ColumnarView<'a>::as_ref(&self) -> &dyn vortex_array::DynArray pub enum vortex_array::Precision @@ -17934,9 +17934,9 @@ impl vortex_array::matcher::Matcher for vortex_array::AnyCanonical pub type vortex_array::AnyCanonical::Match<'a> = vortex_array::CanonicalView<'a> -pub fn vortex_array::AnyCanonical::matches(array: &dyn vortex_array::Array) -> bool +pub fn vortex_array::AnyCanonical::matches(array: &dyn vortex_array::DynArray) -> bool -pub fn vortex_array::AnyCanonical::try_match<'a>(array: &'a dyn vortex_array::Array) -> core::option::Option +pub fn vortex_array::AnyCanonical::try_match<'a>(array: &'a dyn vortex_array::DynArray) -> core::option::Option pub struct vortex_array::AnyColumnar @@ -17944,9 +17944,9 @@ impl vortex_array::matcher::Matcher for vortex_array::AnyColumnar pub type vortex_array::AnyColumnar::Match<'a> = vortex_array::ColumnarView<'a> -pub fn vortex_array::AnyColumnar::matches(array: &dyn vortex_array::Array) -> bool +pub fn vortex_array::AnyColumnar::matches(array: &dyn vortex_array::DynArray) -> bool -pub fn vortex_array::AnyColumnar::try_match<'a>(array: &'a dyn vortex_array::Array) -> core::option::Option +pub fn vortex_array::AnyColumnar::try_match<'a>(array: &'a dyn vortex_array::DynArray) -> core::option::Option #[repr(transparent)] pub struct vortex_array::ArrayAdapter(_) @@ -17958,7 +17958,43 @@ impl core::fmt::Debug for vortex_array::ArrayAd pub fn vortex_array::ArrayAdapter::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result -impl vortex_array::Array for vortex_array::ArrayAdapter +impl vortex_array::ArrayEq for vortex_array::ArrayAdapter + +pub fn vortex_array::ArrayAdapter::array_eq(&self, other: &Self, precision: vortex_array::Precision) -> bool + +impl vortex_array::ArrayHash for vortex_array::ArrayAdapter + +pub fn vortex_array::ArrayAdapter::array_hash(&self, state: &mut H, precision: vortex_array::Precision) + +impl vortex_array::ArrayVisitor for vortex_array::ArrayAdapter + +pub fn vortex_array::ArrayAdapter::buffer_handles(&self) -> alloc::vec::Vec + +pub fn vortex_array::ArrayAdapter::buffer_names(&self) -> alloc::vec::Vec + +pub fn vortex_array::ArrayAdapter::buffers(&self) -> alloc::vec::Vec + +pub fn vortex_array::ArrayAdapter::children(&self) -> alloc::vec::Vec + +pub fn vortex_array::ArrayAdapter::children_names(&self) -> alloc::vec::Vec + +pub fn vortex_array::ArrayAdapter::is_host(&self) -> bool + +pub fn vortex_array::ArrayAdapter::metadata(&self) -> vortex_error::VortexResult>> + +pub fn vortex_array::ArrayAdapter::metadata_fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result + +pub fn vortex_array::ArrayAdapter::named_buffers(&self) -> alloc::vec::Vec<(alloc::string::String, vortex_array::buffer::BufferHandle)> + +pub fn vortex_array::ArrayAdapter::named_children(&self) -> alloc::vec::Vec<(alloc::string::String, vortex_array::ArrayRef)> + +pub fn vortex_array::ArrayAdapter::nbuffers(&self) -> usize + +pub fn vortex_array::ArrayAdapter::nchildren(&self) -> usize + +pub fn vortex_array::ArrayAdapter::nth_child(&self, idx: usize) -> core::option::Option + +impl vortex_array::DynArray for vortex_array::ArrayAdapter pub fn vortex_array::ArrayAdapter::all_invalid(&self) -> vortex_error::VortexResult @@ -18008,42 +18044,6 @@ pub fn vortex_array::ArrayAdapter::vtable(&self) -> &dyn vortex_array::vtable pub fn vortex_array::ArrayAdapter::with_children(&self, children: alloc::vec::Vec) -> vortex_error::VortexResult -impl vortex_array::ArrayEq for vortex_array::ArrayAdapter - -pub fn vortex_array::ArrayAdapter::array_eq(&self, other: &Self, precision: vortex_array::Precision) -> bool - -impl vortex_array::ArrayHash for vortex_array::ArrayAdapter - -pub fn vortex_array::ArrayAdapter::array_hash(&self, state: &mut H, precision: vortex_array::Precision) - -impl vortex_array::ArrayVisitor for vortex_array::ArrayAdapter - -pub fn vortex_array::ArrayAdapter::buffer_handles(&self) -> alloc::vec::Vec - -pub fn vortex_array::ArrayAdapter::buffer_names(&self) -> alloc::vec::Vec - -pub fn vortex_array::ArrayAdapter::buffers(&self) -> alloc::vec::Vec - -pub fn vortex_array::ArrayAdapter::children(&self) -> alloc::vec::Vec - -pub fn vortex_array::ArrayAdapter::children_names(&self) -> alloc::vec::Vec - -pub fn vortex_array::ArrayAdapter::is_host(&self) -> bool - -pub fn vortex_array::ArrayAdapter::metadata(&self) -> vortex_error::VortexResult>> - -pub fn vortex_array::ArrayAdapter::metadata_fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result - -pub fn vortex_array::ArrayAdapter::named_buffers(&self) -> alloc::vec::Vec<(alloc::string::String, vortex_array::buffer::BufferHandle)> - -pub fn vortex_array::ArrayAdapter::named_children(&self) -> alloc::vec::Vec<(alloc::string::String, vortex_array::ArrayRef)> - -pub fn vortex_array::ArrayAdapter::nbuffers(&self) -> usize - -pub fn vortex_array::ArrayAdapter::nchildren(&self) -> usize - -pub fn vortex_array::ArrayAdapter::nth_child(&self, idx: usize) -> core::option::Option - impl vortex_array::scalar_fn::ReduceNode for vortex_array::ArrayAdapter pub fn vortex_array::ArrayAdapter::as_any(&self) -> &dyn core::any::Any @@ -18170,163 +18170,13 @@ pub fn vortex_array::RecursiveCanonical::execute(array: vortex_array::ArrayRef, pub static vortex_array::LEGACY_SESSION: std::sync::lazy_lock::LazyLock -pub trait vortex_array::Array: 'static + vortex_array::array::private::Sealed + core::marker::Send + core::marker::Sync + core::fmt::Debug + vortex_array::DynArrayEq + vortex_array::DynArrayHash + vortex_array::ArrayVisitor + vortex_array::scalar_fn::ReduceNode - -pub fn vortex_array::Array::all_invalid(&self) -> vortex_error::VortexResult - -pub fn vortex_array::Array::all_valid(&self) -> vortex_error::VortexResult - -pub fn vortex_array::Array::append_to_builder(&self, builder: &mut dyn vortex_array::builders::ArrayBuilder, ctx: &mut vortex_array::ExecutionCtx) -> vortex_error::VortexResult<()> - -pub fn vortex_array::Array::as_any(&self) -> &dyn core::any::Any - -pub fn vortex_array::Array::as_any_arc(self: alloc::sync::Arc) -> alloc::sync::Arc<(dyn core::any::Any + core::marker::Send + core::marker::Sync)> - -pub fn vortex_array::Array::dtype(&self) -> &vortex_array::dtype::DType - -pub fn vortex_array::Array::encoding_id(&self) -> vortex_array::vtable::ArrayId - -pub fn vortex_array::Array::filter(&self, mask: vortex_mask::Mask) -> vortex_error::VortexResult - -pub fn vortex_array::Array::invalid_count(&self) -> vortex_error::VortexResult - -pub fn vortex_array::Array::is_empty(&self) -> bool - -pub fn vortex_array::Array::is_invalid(&self, index: usize) -> vortex_error::VortexResult - -pub fn vortex_array::Array::is_valid(&self, index: usize) -> vortex_error::VortexResult - -pub fn vortex_array::Array::len(&self) -> usize - -pub fn vortex_array::Array::scalar_at(&self, index: usize) -> vortex_error::VortexResult - -pub fn vortex_array::Array::slice(&self, range: core::ops::range::Range) -> vortex_error::VortexResult - -pub fn vortex_array::Array::statistics(&self) -> vortex_array::stats::StatsSetRef<'_> - -pub fn vortex_array::Array::take(&self, indices: vortex_array::ArrayRef) -> vortex_error::VortexResult - -pub fn vortex_array::Array::to_array(&self) -> vortex_array::ArrayRef - -pub fn vortex_array::Array::to_canonical(&self) -> vortex_error::VortexResult - -pub fn vortex_array::Array::valid_count(&self) -> vortex_error::VortexResult - -pub fn vortex_array::Array::validity(&self) -> vortex_error::VortexResult - -pub fn vortex_array::Array::validity_mask(&self) -> vortex_error::VortexResult - -pub fn vortex_array::Array::vtable(&self) -> &dyn vortex_array::vtable::DynVTable - -pub fn vortex_array::Array::with_children(&self, children: alloc::vec::Vec) -> vortex_error::VortexResult - -impl vortex_array::Array for alloc::sync::Arc - -pub fn alloc::sync::Arc::all_invalid(&self) -> vortex_error::VortexResult - -pub fn alloc::sync::Arc::all_valid(&self) -> vortex_error::VortexResult - -pub fn alloc::sync::Arc::append_to_builder(&self, builder: &mut dyn vortex_array::builders::ArrayBuilder, ctx: &mut vortex_array::ExecutionCtx) -> vortex_error::VortexResult<()> - -pub fn alloc::sync::Arc::as_any(&self) -> &dyn core::any::Any - -pub fn alloc::sync::Arc::as_any_arc(self: alloc::sync::Arc) -> alloc::sync::Arc<(dyn core::any::Any + core::marker::Send + core::marker::Sync)> - -pub fn alloc::sync::Arc::dtype(&self) -> &vortex_array::dtype::DType - -pub fn alloc::sync::Arc::encoding_id(&self) -> vortex_array::vtable::ArrayId - -pub fn alloc::sync::Arc::filter(&self, mask: vortex_mask::Mask) -> vortex_error::VortexResult - -pub fn alloc::sync::Arc::invalid_count(&self) -> vortex_error::VortexResult - -pub fn alloc::sync::Arc::is_empty(&self) -> bool - -pub fn alloc::sync::Arc::is_invalid(&self, index: usize) -> vortex_error::VortexResult - -pub fn alloc::sync::Arc::is_valid(&self, index: usize) -> vortex_error::VortexResult - -pub fn alloc::sync::Arc::len(&self) -> usize - -pub fn alloc::sync::Arc::scalar_at(&self, index: usize) -> vortex_error::VortexResult - -pub fn alloc::sync::Arc::slice(&self, range: core::ops::range::Range) -> vortex_error::VortexResult - -pub fn alloc::sync::Arc::statistics(&self) -> vortex_array::stats::StatsSetRef<'_> - -pub fn alloc::sync::Arc::take(&self, indices: vortex_array::ArrayRef) -> vortex_error::VortexResult - -pub fn alloc::sync::Arc::to_array(&self) -> vortex_array::ArrayRef - -pub fn alloc::sync::Arc::to_canonical(&self) -> vortex_error::VortexResult - -pub fn alloc::sync::Arc::valid_count(&self) -> vortex_error::VortexResult - -pub fn alloc::sync::Arc::validity(&self) -> vortex_error::VortexResult - -pub fn alloc::sync::Arc::validity_mask(&self) -> vortex_error::VortexResult - -pub fn alloc::sync::Arc::vtable(&self) -> &dyn vortex_array::vtable::DynVTable - -pub fn alloc::sync::Arc::with_children(&self, children: alloc::vec::Vec) -> vortex_error::VortexResult - -impl vortex_array::Array for vortex_array::ArrayAdapter - -pub fn vortex_array::ArrayAdapter::all_invalid(&self) -> vortex_error::VortexResult - -pub fn vortex_array::ArrayAdapter::all_valid(&self) -> vortex_error::VortexResult - -pub fn vortex_array::ArrayAdapter::append_to_builder(&self, builder: &mut dyn vortex_array::builders::ArrayBuilder, ctx: &mut vortex_array::ExecutionCtx) -> vortex_error::VortexResult<()> - -pub fn vortex_array::ArrayAdapter::as_any(&self) -> &dyn core::any::Any - -pub fn vortex_array::ArrayAdapter::as_any_arc(self: alloc::sync::Arc) -> alloc::sync::Arc<(dyn core::any::Any + core::marker::Send + core::marker::Sync)> - -pub fn vortex_array::ArrayAdapter::dtype(&self) -> &vortex_array::dtype::DType - -pub fn vortex_array::ArrayAdapter::encoding_id(&self) -> vortex_array::vtable::ArrayId - -pub fn vortex_array::ArrayAdapter::filter(&self, mask: vortex_mask::Mask) -> vortex_error::VortexResult - -pub fn vortex_array::ArrayAdapter::invalid_count(&self) -> vortex_error::VortexResult - -pub fn vortex_array::ArrayAdapter::is_empty(&self) -> bool - -pub fn vortex_array::ArrayAdapter::is_invalid(&self, index: usize) -> vortex_error::VortexResult - -pub fn vortex_array::ArrayAdapter::is_valid(&self, index: usize) -> vortex_error::VortexResult - -pub fn vortex_array::ArrayAdapter::len(&self) -> usize - -pub fn vortex_array::ArrayAdapter::scalar_at(&self, index: usize) -> vortex_error::VortexResult - -pub fn vortex_array::ArrayAdapter::slice(&self, range: core::ops::range::Range) -> vortex_error::VortexResult - -pub fn vortex_array::ArrayAdapter::statistics(&self) -> vortex_array::stats::StatsSetRef<'_> - -pub fn vortex_array::ArrayAdapter::take(&self, indices: vortex_array::ArrayRef) -> vortex_error::VortexResult - -pub fn vortex_array::ArrayAdapter::to_array(&self) -> vortex_array::ArrayRef - -pub fn vortex_array::ArrayAdapter::to_canonical(&self) -> vortex_error::VortexResult - -pub fn vortex_array::ArrayAdapter::valid_count(&self) -> vortex_error::VortexResult - -pub fn vortex_array::ArrayAdapter::validity(&self) -> vortex_error::VortexResult - -pub fn vortex_array::ArrayAdapter::validity_mask(&self) -> vortex_error::VortexResult - -pub fn vortex_array::ArrayAdapter::vtable(&self) -> &dyn vortex_array::vtable::DynVTable - -pub fn vortex_array::ArrayAdapter::with_children(&self, children: alloc::vec::Vec) -> vortex_error::VortexResult - pub trait vortex_array::ArrayEq pub fn vortex_array::ArrayEq::array_eq(&self, other: &Self, precision: vortex_array::Precision) -> bool -impl vortex_array::ArrayEq for (dyn vortex_array::Array + '_) +impl vortex_array::ArrayEq for (dyn vortex_array::DynArray + '_) -pub fn (dyn vortex_array::Array + '_)::array_eq(&self, other: &Self, precision: vortex_array::Precision) -> bool +pub fn (dyn vortex_array::DynArray + '_)::array_eq(&self, other: &Self, precision: vortex_array::Precision) -> bool impl vortex_array::ArrayEq for vortex_array::ArrayRef @@ -18368,9 +18218,9 @@ pub trait vortex_array::ArrayHash pub fn vortex_array::ArrayHash::array_hash(&self, state: &mut H, precision: vortex_array::Precision) -impl vortex_array::ArrayHash for (dyn vortex_array::Array + '_) +impl vortex_array::ArrayHash for (dyn vortex_array::DynArray + '_) -pub fn (dyn vortex_array::Array + '_)::array_hash(&self, state: &mut H, precision: vortex_array::Precision) +pub fn (dyn vortex_array::DynArray + '_)::array_hash(&self, state: &mut H, precision: vortex_array::Precision) impl vortex_array::ArrayHash for vortex_array::ArrayRef @@ -18436,33 +18286,33 @@ pub fn vortex_array::ArrayVisitor::nchildren(&self) -> usize pub fn vortex_array::ArrayVisitor::nth_child(&self, idx: usize) -> core::option::Option -impl vortex_array::ArrayVisitor for alloc::sync::Arc +impl vortex_array::ArrayVisitor for alloc::sync::Arc -pub fn alloc::sync::Arc::buffer_handles(&self) -> alloc::vec::Vec +pub fn alloc::sync::Arc::buffer_handles(&self) -> alloc::vec::Vec -pub fn alloc::sync::Arc::buffer_names(&self) -> alloc::vec::Vec +pub fn alloc::sync::Arc::buffer_names(&self) -> alloc::vec::Vec -pub fn alloc::sync::Arc::buffers(&self) -> alloc::vec::Vec +pub fn alloc::sync::Arc::buffers(&self) -> alloc::vec::Vec -pub fn alloc::sync::Arc::children(&self) -> alloc::vec::Vec +pub fn alloc::sync::Arc::children(&self) -> alloc::vec::Vec -pub fn alloc::sync::Arc::children_names(&self) -> alloc::vec::Vec +pub fn alloc::sync::Arc::children_names(&self) -> alloc::vec::Vec -pub fn alloc::sync::Arc::is_host(&self) -> bool +pub fn alloc::sync::Arc::is_host(&self) -> bool -pub fn alloc::sync::Arc::metadata(&self) -> vortex_error::VortexResult>> +pub fn alloc::sync::Arc::metadata(&self) -> vortex_error::VortexResult>> -pub fn alloc::sync::Arc::metadata_fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result +pub fn alloc::sync::Arc::metadata_fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result -pub fn alloc::sync::Arc::named_buffers(&self) -> alloc::vec::Vec<(alloc::string::String, vortex_array::buffer::BufferHandle)> +pub fn alloc::sync::Arc::named_buffers(&self) -> alloc::vec::Vec<(alloc::string::String, vortex_array::buffer::BufferHandle)> -pub fn alloc::sync::Arc::named_children(&self) -> alloc::vec::Vec<(alloc::string::String, vortex_array::ArrayRef)> +pub fn alloc::sync::Arc::named_children(&self) -> alloc::vec::Vec<(alloc::string::String, vortex_array::ArrayRef)> -pub fn alloc::sync::Arc::nbuffers(&self) -> usize +pub fn alloc::sync::Arc::nbuffers(&self) -> usize -pub fn alloc::sync::Arc::nchildren(&self) -> usize +pub fn alloc::sync::Arc::nchildren(&self) -> usize -pub fn alloc::sync::Arc::nth_child(&self, idx: usize) -> core::option::Option +pub fn alloc::sync::Arc::nth_child(&self, idx: usize) -> core::option::Option impl vortex_array::ArrayVisitor for vortex_array::ArrayAdapter @@ -18492,13 +18342,13 @@ pub fn vortex_array::ArrayAdapter::nchildren(&self) -> usize pub fn vortex_array::ArrayAdapter::nth_child(&self, idx: usize) -> core::option::Option -pub trait vortex_array::ArrayVisitorExt: vortex_array::Array +pub trait vortex_array::ArrayVisitorExt: vortex_array::DynArray pub fn vortex_array::ArrayVisitorExt::depth_first_traversal(&self) -> impl core::iter::traits::iterator::Iterator pub fn vortex_array::ArrayVisitorExt::nbuffers_recursive(&self) -> usize -impl vortex_array::ArrayVisitorExt for A +impl vortex_array::ArrayVisitorExt for A pub fn A::depth_first_traversal(&self) -> impl core::iter::traits::iterator::Iterator @@ -18528,6 +18378,156 @@ pub type vortex_array::ProstMetadata::Output = M pub fn vortex_array::ProstMetadata::deserialize(metadata: &[u8]) -> vortex_error::VortexResult +pub trait vortex_array::DynArray: 'static + vortex_array::array::private::Sealed + core::marker::Send + core::marker::Sync + core::fmt::Debug + vortex_array::DynArrayEq + vortex_array::DynArrayHash + vortex_array::ArrayVisitor + vortex_array::scalar_fn::ReduceNode + +pub fn vortex_array::DynArray::all_invalid(&self) -> vortex_error::VortexResult + +pub fn vortex_array::DynArray::all_valid(&self) -> vortex_error::VortexResult + +pub fn vortex_array::DynArray::append_to_builder(&self, builder: &mut dyn vortex_array::builders::ArrayBuilder, ctx: &mut vortex_array::ExecutionCtx) -> vortex_error::VortexResult<()> + +pub fn vortex_array::DynArray::as_any(&self) -> &dyn core::any::Any + +pub fn vortex_array::DynArray::as_any_arc(self: alloc::sync::Arc) -> alloc::sync::Arc<(dyn core::any::Any + core::marker::Send + core::marker::Sync)> + +pub fn vortex_array::DynArray::dtype(&self) -> &vortex_array::dtype::DType + +pub fn vortex_array::DynArray::encoding_id(&self) -> vortex_array::vtable::ArrayId + +pub fn vortex_array::DynArray::filter(&self, mask: vortex_mask::Mask) -> vortex_error::VortexResult + +pub fn vortex_array::DynArray::invalid_count(&self) -> vortex_error::VortexResult + +pub fn vortex_array::DynArray::is_empty(&self) -> bool + +pub fn vortex_array::DynArray::is_invalid(&self, index: usize) -> vortex_error::VortexResult + +pub fn vortex_array::DynArray::is_valid(&self, index: usize) -> vortex_error::VortexResult + +pub fn vortex_array::DynArray::len(&self) -> usize + +pub fn vortex_array::DynArray::scalar_at(&self, index: usize) -> vortex_error::VortexResult + +pub fn vortex_array::DynArray::slice(&self, range: core::ops::range::Range) -> vortex_error::VortexResult + +pub fn vortex_array::DynArray::statistics(&self) -> vortex_array::stats::StatsSetRef<'_> + +pub fn vortex_array::DynArray::take(&self, indices: vortex_array::ArrayRef) -> vortex_error::VortexResult + +pub fn vortex_array::DynArray::to_array(&self) -> vortex_array::ArrayRef + +pub fn vortex_array::DynArray::to_canonical(&self) -> vortex_error::VortexResult + +pub fn vortex_array::DynArray::valid_count(&self) -> vortex_error::VortexResult + +pub fn vortex_array::DynArray::validity(&self) -> vortex_error::VortexResult + +pub fn vortex_array::DynArray::validity_mask(&self) -> vortex_error::VortexResult + +pub fn vortex_array::DynArray::vtable(&self) -> &dyn vortex_array::vtable::DynVTable + +pub fn vortex_array::DynArray::with_children(&self, children: alloc::vec::Vec) -> vortex_error::VortexResult + +impl vortex_array::DynArray for alloc::sync::Arc + +pub fn alloc::sync::Arc::all_invalid(&self) -> vortex_error::VortexResult + +pub fn alloc::sync::Arc::all_valid(&self) -> vortex_error::VortexResult + +pub fn alloc::sync::Arc::append_to_builder(&self, builder: &mut dyn vortex_array::builders::ArrayBuilder, ctx: &mut vortex_array::ExecutionCtx) -> vortex_error::VortexResult<()> + +pub fn alloc::sync::Arc::as_any(&self) -> &dyn core::any::Any + +pub fn alloc::sync::Arc::as_any_arc(self: alloc::sync::Arc) -> alloc::sync::Arc<(dyn core::any::Any + core::marker::Send + core::marker::Sync)> + +pub fn alloc::sync::Arc::dtype(&self) -> &vortex_array::dtype::DType + +pub fn alloc::sync::Arc::encoding_id(&self) -> vortex_array::vtable::ArrayId + +pub fn alloc::sync::Arc::filter(&self, mask: vortex_mask::Mask) -> vortex_error::VortexResult + +pub fn alloc::sync::Arc::invalid_count(&self) -> vortex_error::VortexResult + +pub fn alloc::sync::Arc::is_empty(&self) -> bool + +pub fn alloc::sync::Arc::is_invalid(&self, index: usize) -> vortex_error::VortexResult + +pub fn alloc::sync::Arc::is_valid(&self, index: usize) -> vortex_error::VortexResult + +pub fn alloc::sync::Arc::len(&self) -> usize + +pub fn alloc::sync::Arc::scalar_at(&self, index: usize) -> vortex_error::VortexResult + +pub fn alloc::sync::Arc::slice(&self, range: core::ops::range::Range) -> vortex_error::VortexResult + +pub fn alloc::sync::Arc::statistics(&self) -> vortex_array::stats::StatsSetRef<'_> + +pub fn alloc::sync::Arc::take(&self, indices: vortex_array::ArrayRef) -> vortex_error::VortexResult + +pub fn alloc::sync::Arc::to_array(&self) -> vortex_array::ArrayRef + +pub fn alloc::sync::Arc::to_canonical(&self) -> vortex_error::VortexResult + +pub fn alloc::sync::Arc::valid_count(&self) -> vortex_error::VortexResult + +pub fn alloc::sync::Arc::validity(&self) -> vortex_error::VortexResult + +pub fn alloc::sync::Arc::validity_mask(&self) -> vortex_error::VortexResult + +pub fn alloc::sync::Arc::vtable(&self) -> &dyn vortex_array::vtable::DynVTable + +pub fn alloc::sync::Arc::with_children(&self, children: alloc::vec::Vec) -> vortex_error::VortexResult + +impl vortex_array::DynArray for vortex_array::ArrayAdapter + +pub fn vortex_array::ArrayAdapter::all_invalid(&self) -> vortex_error::VortexResult + +pub fn vortex_array::ArrayAdapter::all_valid(&self) -> vortex_error::VortexResult + +pub fn vortex_array::ArrayAdapter::append_to_builder(&self, builder: &mut dyn vortex_array::builders::ArrayBuilder, ctx: &mut vortex_array::ExecutionCtx) -> vortex_error::VortexResult<()> + +pub fn vortex_array::ArrayAdapter::as_any(&self) -> &dyn core::any::Any + +pub fn vortex_array::ArrayAdapter::as_any_arc(self: alloc::sync::Arc) -> alloc::sync::Arc<(dyn core::any::Any + core::marker::Send + core::marker::Sync)> + +pub fn vortex_array::ArrayAdapter::dtype(&self) -> &vortex_array::dtype::DType + +pub fn vortex_array::ArrayAdapter::encoding_id(&self) -> vortex_array::vtable::ArrayId + +pub fn vortex_array::ArrayAdapter::filter(&self, mask: vortex_mask::Mask) -> vortex_error::VortexResult + +pub fn vortex_array::ArrayAdapter::invalid_count(&self) -> vortex_error::VortexResult + +pub fn vortex_array::ArrayAdapter::is_empty(&self) -> bool + +pub fn vortex_array::ArrayAdapter::is_invalid(&self, index: usize) -> vortex_error::VortexResult + +pub fn vortex_array::ArrayAdapter::is_valid(&self, index: usize) -> vortex_error::VortexResult + +pub fn vortex_array::ArrayAdapter::len(&self) -> usize + +pub fn vortex_array::ArrayAdapter::scalar_at(&self, index: usize) -> vortex_error::VortexResult + +pub fn vortex_array::ArrayAdapter::slice(&self, range: core::ops::range::Range) -> vortex_error::VortexResult + +pub fn vortex_array::ArrayAdapter::statistics(&self) -> vortex_array::stats::StatsSetRef<'_> + +pub fn vortex_array::ArrayAdapter::take(&self, indices: vortex_array::ArrayRef) -> vortex_error::VortexResult + +pub fn vortex_array::ArrayAdapter::to_array(&self) -> vortex_array::ArrayRef + +pub fn vortex_array::ArrayAdapter::to_canonical(&self) -> vortex_error::VortexResult + +pub fn vortex_array::ArrayAdapter::valid_count(&self) -> vortex_error::VortexResult + +pub fn vortex_array::ArrayAdapter::validity(&self) -> vortex_error::VortexResult + +pub fn vortex_array::ArrayAdapter::validity_mask(&self) -> vortex_error::VortexResult + +pub fn vortex_array::ArrayAdapter::vtable(&self) -> &dyn vortex_array::vtable::DynVTable + +pub fn vortex_array::ArrayAdapter::with_children(&self, children: alloc::vec::Vec) -> vortex_error::VortexResult + pub trait vortex_array::DynArrayEq: vortex_array::hash::private::SealedEq pub fn vortex_array::DynArrayEq::dyn_array_eq(&self, other: &dyn core::any::Any, precision: vortex_array::Precision) -> bool @@ -18788,7 +18788,7 @@ pub fn vortex_array::ToCanonical::to_struct(&self) -> vortex_array::arrays::Stru pub fn vortex_array::ToCanonical::to_varbinview(&self) -> vortex_array::arrays::VarBinViewArray -impl vortex_array::ToCanonical for A +impl vortex_array::ToCanonical for A pub fn A::to_bool(&self) -> vortex_array::arrays::BoolArray @@ -18818,4 +18818,4 @@ pub fn vortex_session::VortexSession::create_execution_ctx(&self) -> vortex_arra pub type vortex_array::ArrayContext = vortex_session::registry::Context<&'static dyn vortex_array::vtable::DynVTable> -pub type vortex_array::ArrayRef = alloc::sync::Arc +pub type vortex_array::ArrayRef = alloc::sync::Arc diff --git a/vortex-array/src/accessor.rs b/vortex-array/src/accessor.rs index d0bcb1243c4..1eae91edb58 100644 --- a/vortex-array/src/accessor.rs +++ b/vortex-array/src/accessor.rs @@ -5,8 +5,8 @@ pub trait ArrayAccessor { /// Iterate over each element of the array, in-order. /// - /// The function `f` will be passed an [`Iterator`], it can call [`next`][Iterator::next] on the - /// iterator [`len`][crate::Array::len] times. Iterator elements are `Option` types, + /// The function `f` will be passed an [`Iterator`], it can call [`Iterator::next`] on the + /// iterator [`crate::DynArray::len`] times. Iterator elements are `Option` types, /// regardless of the nullability of the underlying array data. fn with_iterator(&self, f: F) -> R where diff --git a/vortex-array/src/array/mod.rs b/vortex-array/src/array/mod.rs index d5159edbc9f..4cfda53a1d5 100644 --- a/vortex-array/src/array/mod.rs +++ b/vortex-array/src/array/mod.rs @@ -65,7 +65,7 @@ use crate::vtable::VTable; use crate::vtable::ValidityVTable; /// The public API trait for all Vortex arrays. -pub trait Array: +pub trait DynArray: 'static + private::Sealed + Send @@ -166,10 +166,10 @@ pub trait Array: fn with_children(&self, children: Vec) -> VortexResult; } -impl Array for Arc { +impl DynArray for Arc { #[inline] fn as_any(&self) -> &dyn Any { - Array::as_any(self.as_ref()) + DynArray::as_any(self.as_ref()) } fn as_any_arc(self: Arc) -> Arc { @@ -279,10 +279,10 @@ impl Array for Arc { } } -/// A reference counted pointer to a dynamic [`Array`] trait object. -pub type ArrayRef = Arc; +/// A reference counted pointer to a dynamic [`DynArray`] trait object. +pub type ArrayRef = Arc; -impl ToOwned for dyn Array { +impl ToOwned for dyn DynArray { type Owned = ArrayRef; fn to_owned(&self) -> Self::Owned { @@ -290,7 +290,7 @@ impl ToOwned for dyn Array { } } -impl dyn Array + '_ { +impl dyn DynArray + '_ { /// Does the array match the given matcher. pub fn is(&self) -> bool { M::matches(self) @@ -371,10 +371,10 @@ mod private { pub trait Sealed {} impl Sealed for ArrayAdapter {} - impl Sealed for Arc {} + impl Sealed for Arc {} } -/// Adapter struct used to lift the [`VTable`] trait into an object-safe [`Array`] +/// Adapter struct used to lift the [`VTable`] trait into an object-safe [`DynArray`] /// implementation. /// /// Since this is a unit struct with `repr(transparent)`, we are able to turn un-adapted array @@ -419,7 +419,7 @@ impl ReduceNode for ArrayAdapter { } } -impl Array for ArrayAdapter { +impl DynArray for ArrayAdapter { fn as_any(&self) -> &dyn Any { self } @@ -742,12 +742,12 @@ impl ArrayVisitor for ArrayAdapter { impl Matcher for V { type Match<'a> = &'a V::Array; - fn matches(array: &dyn Array) -> bool { - Array::as_any(array).is::>() + fn matches(array: &dyn DynArray) -> bool { + DynArray::as_any(array).is::>() } - fn try_match<'a>(array: &'a dyn Array) -> Option> { - Array::as_any(array) + fn try_match<'a>(array: &'a dyn DynArray) -> Option> { + DynArray::as_any(array) .downcast_ref::>() .map(|array_adapter| &array_adapter.0) } diff --git a/vortex-array/src/array/visitor.rs b/vortex-array/src/array/visitor.rs index 0b1ddf58ec4..24440a99ada 100644 --- a/vortex-array/src/array/visitor.rs +++ b/vortex-array/src/array/visitor.rs @@ -7,8 +7,8 @@ use std::sync::Arc; use vortex_buffer::ByteBuffer; use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::buffer::BufferHandle; pub trait ArrayVisitor { @@ -57,7 +57,7 @@ pub trait ArrayVisitor { fn is_host(&self) -> bool; } -impl ArrayVisitor for Arc { +impl ArrayVisitor for Arc { fn children(&self) -> Vec { self.as_ref().children() } @@ -111,7 +111,7 @@ impl ArrayVisitor for Arc { } } -pub trait ArrayVisitorExt: Array { +pub trait ArrayVisitorExt: DynArray { /// Count the number of buffers encoded by self and all child arrays. fn nbuffers_recursive(&self) -> usize { self.children() @@ -146,4 +146,4 @@ pub trait ArrayVisitorExt: Array { } } -impl ArrayVisitorExt for A {} +impl ArrayVisitorExt for A {} diff --git a/vortex-array/src/arrays/arbitrary.rs b/vortex-array/src/arrays/arbitrary.rs index 05ad2193308..711f0c0a65f 100644 --- a/vortex-array/src/arrays/arbitrary.rs +++ b/vortex-array/src/arrays/arbitrary.rs @@ -16,8 +16,8 @@ use super::ChunkedArray; use super::NullArray; use super::PrimitiveArray; use super::StructArray; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::ToCanonical; use crate::arrays::VarBinArray; diff --git a/vortex-array/src/arrays/bool/array.rs b/vortex-array/src/arrays/bool/array.rs index 2d5b398de88..124aa3f2427 100644 --- a/vortex-array/src/arrays/bool/array.rs +++ b/vortex-array/src/arrays/bool/array.rs @@ -307,7 +307,7 @@ mod tests { use vortex_buffer::BitBufferMut; use vortex_buffer::buffer; - use crate::Array; + use crate::DynArray; use crate::IntoArray; use crate::LEGACY_SESSION; use crate::VortexSessionExecute; diff --git a/vortex-array/src/arrays/bool/compute/take.rs b/vortex-array/src/arrays/bool/compute/take.rs index 4c7fee8f324..7d688ff75eb 100644 --- a/vortex-array/src/arrays/bool/compute/take.rs +++ b/vortex-array/src/arrays/bool/compute/take.rs @@ -8,8 +8,8 @@ use vortex_buffer::get_bit; use vortex_error::VortexResult; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::BoolArray; use crate::arrays::BoolVTable; @@ -83,7 +83,7 @@ mod test { use rstest::rstest; use vortex_buffer::buffer; - use crate::Array; + use crate::DynArray; use crate::IntoArray as _; use crate::ToCanonical; use crate::arrays::BoolArray; diff --git a/vortex-array/src/arrays/chunked/array.rs b/vortex-array/src/arrays/chunked/array.rs index 73ee89fd9be..12a34adf4a4 100644 --- a/vortex-array/src/arrays/chunked/array.rs +++ b/vortex-array/src/arrays/chunked/array.rs @@ -14,8 +14,8 @@ use vortex_error::VortexExpect as _; use vortex_error::VortexResult; use vortex_error::vortex_bail; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::PrimitiveArray; use crate::dtype::DType; @@ -227,7 +227,7 @@ mod test { use vortex_error::VortexResult; use crate::IntoArray; - use crate::array::Array; + use crate::array::DynArray; use crate::arrays::PrimitiveArray; use crate::arrays::chunked::ChunkedArray; use crate::assert_arrays_eq; diff --git a/vortex-array/src/arrays/chunked/compute/fill_null.rs b/vortex-array/src/arrays/chunked/compute/fill_null.rs index a4d6a52cd0c..7ae0a08c7a8 100644 --- a/vortex-array/src/arrays/chunked/compute/fill_null.rs +++ b/vortex-array/src/arrays/chunked/compute/fill_null.rs @@ -31,7 +31,7 @@ impl FillNullReduce for ChunkedVTable { mod tests { use vortex_buffer::BitBuffer; - use crate::array::Array; + use crate::array::DynArray; use crate::arrays::BoolArray; use crate::arrays::ChunkedArray; use crate::builtins::ArrayBuiltins; diff --git a/vortex-array/src/arrays/chunked/compute/filter.rs b/vortex-array/src/arrays/chunked/compute/filter.rs index 14f1505f75a..7d1eb0bcf8e 100644 --- a/vortex-array/src/arrays/chunked/compute/filter.rs +++ b/vortex-array/src/arrays/chunked/compute/filter.rs @@ -7,8 +7,8 @@ use vortex_error::VortexResult; use vortex_mask::Mask; use vortex_mask::MaskIter; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::arrays::ChunkedArray; @@ -205,7 +205,7 @@ mod test { use vortex_mask::Mask; use crate::IntoArray; - use crate::array::Array; + use crate::array::DynArray; use crate::arrays::ChunkedArray; use crate::arrays::PrimitiveArray; use crate::compute::conformance::filter::test_filter_conformance; diff --git a/vortex-array/src/arrays/chunked/compute/is_constant.rs b/vortex-array/src/arrays/chunked/compute/is_constant.rs index 9d913c18fd2..630e56fbaa6 100644 --- a/vortex-array/src/arrays/chunked/compute/is_constant.rs +++ b/vortex-array/src/arrays/chunked/compute/is_constant.rs @@ -4,7 +4,7 @@ use vortex_error::VortexExpect; use vortex_error::VortexResult; -use crate::Array; +use crate::DynArray; use crate::arrays::ChunkedArray; use crate::arrays::ChunkedVTable; use crate::compute::IsConstantKernel; @@ -58,7 +58,7 @@ mod tests { use vortex_buffer::Buffer; use vortex_buffer::buffer; - use crate::Array; + use crate::DynArray; use crate::IntoArray; use crate::arrays::ChunkedArray; use crate::dtype::DType; diff --git a/vortex-array/src/arrays/chunked/compute/is_sorted.rs b/vortex-array/src/arrays/chunked/compute/is_sorted.rs index 8dddf2fb95d..be06d84a83a 100644 --- a/vortex-array/src/arrays/chunked/compute/is_sorted.rs +++ b/vortex-array/src/arrays/chunked/compute/is_sorted.rs @@ -3,8 +3,8 @@ use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::arrays::ChunkedArray; use crate::arrays::ChunkedVTable; use crate::compute::IsSortedKernel; diff --git a/vortex-array/src/arrays/chunked/compute/take.rs b/vortex-array/src/arrays/chunked/compute/take.rs index 675214e9abf..cb77bbfc4cb 100644 --- a/vortex-array/src/arrays/chunked/compute/take.rs +++ b/vortex-array/src/arrays/chunked/compute/take.rs @@ -5,9 +5,9 @@ use vortex_buffer::BufferMut; use vortex_error::VortexResult; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; use crate::Canonical; +use crate::DynArray; use crate::IntoArray; use crate::arrays::ChunkedVTable; use crate::arrays::PrimitiveArray; @@ -118,7 +118,7 @@ mod test { use crate::IntoArray; use crate::ToCanonical; - use crate::array::Array; + use crate::array::DynArray; use crate::arrays::BoolArray; use crate::arrays::PrimitiveArray; use crate::arrays::StructArray; diff --git a/vortex-array/src/arrays/chunked/compute/zip.rs b/vortex-array/src/arrays/chunked/compute/zip.rs index 12123ce1804..54083c10603 100644 --- a/vortex-array/src/arrays/chunked/compute/zip.rs +++ b/vortex-array/src/arrays/chunked/compute/zip.rs @@ -4,8 +4,8 @@ use vortex_error::VortexResult; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::ChunkedArray; use crate::arrays::ChunkedVTable; diff --git a/vortex-array/src/arrays/chunked/vtable/canonical.rs b/vortex-array/src/arrays/chunked/vtable/canonical.rs index 11db33be1f7..a3884b05fde 100644 --- a/vortex-array/src/arrays/chunked/vtable/canonical.rs +++ b/vortex-array/src/arrays/chunked/vtable/canonical.rs @@ -5,9 +5,9 @@ use vortex_buffer::BufferMut; use vortex_error::VortexExpect; use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; use crate::Canonical; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::arrays::ChunkedArray; @@ -58,7 +58,7 @@ pub(super) fn _canonicalize( }) } -/// Packs many [`StructArray`]s to instead be a single [`StructArray`], where the [`Array`] for each +/// Packs many [`StructArray`]s to instead be a single [`StructArray`], where the [`DynArray`] for each /// field is a [`ChunkedArray`]. /// /// The caller guarantees there are at least 2 chunks. diff --git a/vortex-array/src/arrays/chunked/vtable/operations.rs b/vortex-array/src/arrays/chunked/vtable/operations.rs index e2bfd9d7e78..37e800b42fa 100644 --- a/vortex-array/src/arrays/chunked/vtable/operations.rs +++ b/vortex-array/src/arrays/chunked/vtable/operations.rs @@ -3,7 +3,7 @@ use vortex_error::VortexResult; -use crate::Array; +use crate::DynArray; use crate::arrays::ChunkedArray; use crate::arrays::ChunkedVTable; use crate::scalar::Scalar; diff --git a/vortex-array/src/arrays/chunked/vtable/validity.rs b/vortex-array/src/arrays/chunked/vtable/validity.rs index f3d12224838..f5e3b75a86c 100644 --- a/vortex-array/src/arrays/chunked/vtable/validity.rs +++ b/vortex-array/src/arrays/chunked/vtable/validity.rs @@ -4,7 +4,7 @@ use itertools::Itertools; use vortex_error::VortexResult; -use crate::Array; +use crate::DynArray; use crate::IntoArray; use crate::arrays::ChunkedArray; use crate::arrays::ChunkedVTable; diff --git a/vortex-array/src/arrays/constant/compute/sum.rs b/vortex-array/src/arrays/constant/compute/sum.rs index b633619aa93..e0d7510f65f 100644 --- a/vortex-array/src/arrays/constant/compute/sum.rs +++ b/vortex-array/src/arrays/constant/compute/sum.rs @@ -171,7 +171,7 @@ register_kernel!(SumKernelAdapter(ConstantVTable).lift()); mod tests { use vortex_error::VortexExpect; - use crate::Array; + use crate::DynArray; use crate::IntoArray; use crate::arrays::ConstantArray; use crate::compute::sum; diff --git a/vortex-array/src/arrays/constant/compute/take.rs b/vortex-array/src/arrays/constant/compute/take.rs index ed11f0e2c0c..4a38c8c80f7 100644 --- a/vortex-array/src/arrays/constant/compute/take.rs +++ b/vortex-array/src/arrays/constant/compute/take.rs @@ -4,8 +4,8 @@ use vortex_error::VortexResult; use vortex_mask::AllOr; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::ConstantArray; use crate::arrays::ConstantVTable; @@ -63,7 +63,7 @@ mod tests { use vortex_buffer::buffer; use vortex_mask::AllOr; - use crate::Array; + use crate::DynArray; use crate::IntoArray; use crate::ToCanonical; use crate::arrays::ConstantArray; diff --git a/vortex-array/src/arrays/constant/vtable/canonical.rs b/vortex-array/src/arrays/constant/vtable/canonical.rs index 71a1a5cb582..af8c5ee8e4f 100644 --- a/vortex-array/src/arrays/constant/vtable/canonical.rs +++ b/vortex-array/src/arrays/constant/vtable/canonical.rs @@ -314,7 +314,7 @@ mod tests { use itertools::Itertools; use vortex_error::VortexResult; - use crate::Array; + use crate::DynArray; use crate::IntoArray; use crate::arrays::ConstantArray; use crate::arrays::ListViewRebuildMode; diff --git a/vortex-array/src/arrays/datetime/mod.rs b/vortex-array/src/arrays/datetime/mod.rs index 606cc9a9c79..b10c4ad4668 100644 --- a/vortex-array/src/arrays/datetime/mod.rs +++ b/vortex-array/src/arrays/datetime/mod.rs @@ -10,8 +10,8 @@ use vortex_error::VortexError; use vortex_error::vortex_bail; use vortex_error::vortex_err; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::ExtensionArray; use crate::arrays::ExtensionVTable; @@ -147,8 +147,8 @@ impl TemporalArray { } } -impl AsRef for TemporalArray { - fn as_ref(&self) -> &dyn Array { +impl AsRef for TemporalArray { + fn as_ref(&self) -> &dyn DynArray { self.ext.as_ref() } } diff --git a/vortex-array/src/arrays/datetime/test.rs b/vortex-array/src/arrays/datetime/test.rs index 69d7d4c7793..66dbacfaa29 100644 --- a/vortex-array/src/arrays/datetime/test.rs +++ b/vortex-array/src/arrays/datetime/test.rs @@ -7,7 +7,7 @@ use vortex_error::VortexResult; use crate::IntoArray; use crate::ToCanonical; -use crate::array::Array; +use crate::array::DynArray; use crate::arrays::PrimitiveArray; use crate::arrays::TemporalArray; use crate::assert_arrays_eq; diff --git a/vortex-array/src/arrays/decimal/vtable/operations.rs b/vortex-array/src/arrays/decimal/vtable/operations.rs index e1eeca36977..cdc59501d63 100644 --- a/vortex-array/src/arrays/decimal/vtable/operations.rs +++ b/vortex-array/src/arrays/decimal/vtable/operations.rs @@ -26,7 +26,7 @@ impl OperationsVTable for DecimalVTable { mod tests { use vortex_buffer::buffer; - use crate::Array; + use crate::DynArray; use crate::arrays::DecimalArray; use crate::arrays::DecimalVTable; use crate::dtype::DecimalDType; diff --git a/vortex-array/src/arrays/dict/array.rs b/vortex-array/src/arrays/dict/array.rs index d6fa3bfe23d..c8106243550 100644 --- a/vortex-array/src/arrays/dict/array.rs +++ b/vortex-array/src/arrays/dict/array.rs @@ -241,8 +241,8 @@ mod test { use vortex_error::vortex_panic; use vortex_mask::AllOr; - use crate::Array; use crate::ArrayRef; + use crate::DynArray; use crate::IntoArray; use crate::LEGACY_SESSION; use crate::ToCanonical; diff --git a/vortex-array/src/arrays/dict/compute/cast.rs b/vortex-array/src/arrays/dict/compute/cast.rs index 7b224f39898..ae45788a6bf 100644 --- a/vortex-array/src/arrays/dict/compute/cast.rs +++ b/vortex-array/src/arrays/dict/compute/cast.rs @@ -5,8 +5,8 @@ use vortex_error::VortexResult; use super::DictArray; use super::DictVTable; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::builtins::ArrayBuiltins; use crate::dtype::DType; diff --git a/vortex-array/src/arrays/dict/compute/compare.rs b/vortex-array/src/arrays/dict/compute/compare.rs index bf022722cb3..b1ff767478d 100644 --- a/vortex-array/src/arrays/dict/compute/compare.rs +++ b/vortex-array/src/arrays/dict/compute/compare.rs @@ -5,9 +5,9 @@ use vortex_error::VortexResult; use super::DictArray; use super::DictVTable; -use crate::Array; use crate::ArrayRef; use crate::Canonical; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::arrays::ConstantArray; diff --git a/vortex-array/src/arrays/dict/compute/fill_null.rs b/vortex-array/src/arrays/dict/compute/fill_null.rs index a8699ae5d57..27e64734ec9 100644 --- a/vortex-array/src/arrays/dict/compute/fill_null.rs +++ b/vortex-array/src/arrays/dict/compute/fill_null.rs @@ -5,9 +5,9 @@ use vortex_error::VortexResult; use super::DictArray; use super::DictVTable; -use crate::Array; use crate::ArrayRef; use crate::Canonical; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::arrays::BoolArray; diff --git a/vortex-array/src/arrays/dict/compute/like.rs b/vortex-array/src/arrays/dict/compute/like.rs index 109e4b21607..07dd0c14c02 100644 --- a/vortex-array/src/arrays/dict/compute/like.rs +++ b/vortex-array/src/arrays/dict/compute/like.rs @@ -5,8 +5,8 @@ use vortex_error::VortexResult; use super::DictArray; use super::DictVTable; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::ConstantArray; use crate::arrays::ScalarFnArrayExt; diff --git a/vortex-array/src/arrays/dict/compute/min_max.rs b/vortex-array/src/arrays/dict/compute/min_max.rs index db2abbbee12..96f89169804 100644 --- a/vortex-array/src/arrays/dict/compute/min_max.rs +++ b/vortex-array/src/arrays/dict/compute/min_max.rs @@ -5,7 +5,7 @@ use vortex_error::VortexResult; use super::DictArray; use super::DictVTable; -use crate::Array as _; +use crate::DynArray as _; use crate::IntoArray; use crate::arrays::BoolArray; use crate::builtins::ArrayBuiltins; diff --git a/vortex-array/src/arrays/dict/compute/mod.rs b/vortex-array/src/arrays/dict/compute/mod.rs index d8f81eee47e..75f38e9b7fb 100644 --- a/vortex-array/src/arrays/dict/compute/mod.rs +++ b/vortex-array/src/arrays/dict/compute/mod.rs @@ -18,8 +18,8 @@ use vortex_mask::Mask; use super::DictArray; use super::DictVTable; use super::TakeExecute; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::arrays::filter::FilterReduce; @@ -57,8 +57,8 @@ mod test { use itertools::Itertools; use vortex_buffer::buffer; - use crate::Array; use crate::ArrayRef; + use crate::DynArray; use crate::IntoArray; use crate::ToCanonical; use crate::accessor::ArrayAccessor; diff --git a/vortex-array/src/arrays/dict/compute/rules.rs b/vortex-array/src/arrays/dict/compute/rules.rs index 6a109e39cf7..b9971ce5a6b 100644 --- a/vortex-array/src/arrays/dict/compute/rules.rs +++ b/vortex-array/src/arrays/dict/compute/rules.rs @@ -3,9 +3,9 @@ use vortex_error::VortexResult; -use crate::Array; use crate::ArrayEq; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::Precision; use crate::arrays::AnyScalarFn; diff --git a/vortex-array/src/arrays/dict/compute/slice.rs b/vortex-array/src/arrays/dict/compute/slice.rs index 29a61454849..ac8c0eac02c 100644 --- a/vortex-array/src/arrays/dict/compute/slice.rs +++ b/vortex-array/src/arrays/dict/compute/slice.rs @@ -48,7 +48,7 @@ mod tests { use vortex_buffer::buffer; use vortex_error::VortexResult; - use crate::Array; + use crate::DynArray; use crate::IntoArray; use crate::arrays::ConstantArray; use crate::arrays::DictArray; diff --git a/vortex-array/src/arrays/dict/take.rs b/vortex-array/src/arrays/dict/take.rs index 71b9d4cec92..13135a1abbe 100644 --- a/vortex-array/src/arrays/dict/take.rs +++ b/vortex-array/src/arrays/dict/take.rs @@ -5,9 +5,9 @@ use vortex_error::VortexResult; use super::DictArray; use super::DictVTable; -use crate::Array; use crate::ArrayRef; use crate::Canonical; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::arrays::ConstantArray; diff --git a/vortex-array/src/arrays/dict/tests.rs b/vortex-array/src/arrays/dict/tests.rs index b5fae87ae35..1ad0e244d26 100644 --- a/vortex-array/src/arrays/dict/tests.rs +++ b/vortex-array/src/arrays/dict/tests.rs @@ -4,7 +4,7 @@ use vortex_buffer::buffer; use super::DictArray; -use crate::Array; +use crate::DynArray; use crate::IntoArray; use crate::arrays::BoolArray; use crate::arrays::ListArray; diff --git a/vortex-array/src/arrays/dict/vtable/mod.rs b/vortex-array/src/arrays/dict/vtable/mod.rs index 8c2c9197019..6c6555b596a 100644 --- a/vortex-array/src/arrays/dict/vtable/mod.rs +++ b/vortex-array/src/arrays/dict/vtable/mod.rs @@ -14,10 +14,10 @@ use vortex_session::VortexSession; use super::DictArray; use super::DictMetadata; use super::take_canonical; -use crate::Array; use crate::ArrayRef; use crate::Canonical; use crate::DeserializeMetadata; +use crate::DynArray; use crate::IntoArray; use crate::Precision; use crate::ProstMetadata; diff --git a/vortex-array/src/arrays/dict/vtable/operations.rs b/vortex-array/src/arrays/dict/vtable/operations.rs index edfbd408165..874e09810cd 100644 --- a/vortex-array/src/arrays/dict/vtable/operations.rs +++ b/vortex-array/src/arrays/dict/vtable/operations.rs @@ -5,7 +5,7 @@ use vortex_error::VortexExpect; use vortex_error::VortexResult; use super::DictVTable; -use crate::Array; +use crate::DynArray; use crate::arrays::dict::DictArray; use crate::scalar::Scalar; use crate::vtable::OperationsVTable; diff --git a/vortex-array/src/arrays/dict/vtable/validity.rs b/vortex-array/src/arrays/dict/vtable/validity.rs index 838d66aae36..3590fe9fd7e 100644 --- a/vortex-array/src/arrays/dict/vtable/validity.rs +++ b/vortex-array/src/arrays/dict/vtable/validity.rs @@ -4,7 +4,7 @@ use vortex_error::VortexResult; use super::DictVTable; -use crate::Array; +use crate::DynArray; use crate::IntoArray; use crate::arrays::dict::DictArray; use crate::builtins::ArrayBuiltins; diff --git a/vortex-array/src/arrays/extension/compute/compare.rs b/vortex-array/src/arrays/extension/compute/compare.rs index e35c69d3014..f2daa5cdff9 100644 --- a/vortex-array/src/arrays/extension/compute/compare.rs +++ b/vortex-array/src/arrays/extension/compute/compare.rs @@ -3,8 +3,8 @@ use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ExecutionCtx; use crate::arrays::ConstantArray; use crate::arrays::ExtensionArray; diff --git a/vortex-array/src/arrays/extension/compute/rules.rs b/vortex-array/src/arrays/extension/compute/rules.rs index ee3b49201cb..2bd4d5a2b49 100644 --- a/vortex-array/src/arrays/extension/compute/rules.rs +++ b/vortex-array/src/arrays/extension/compute/rules.rs @@ -54,7 +54,7 @@ mod tests { use vortex_error::VortexResult; use vortex_mask::Mask; - use crate::Array; + use crate::DynArray; use crate::IntoArray; use crate::ToCanonical; use crate::arrays::ConstantArray; diff --git a/vortex-array/src/arrays/extension/compute/take.rs b/vortex-array/src/arrays/extension/compute/take.rs index 741dc432fbb..e7fbf542127 100644 --- a/vortex-array/src/arrays/extension/compute/take.rs +++ b/vortex-array/src/arrays/extension/compute/take.rs @@ -3,8 +3,8 @@ use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::arrays::ExtensionArray; diff --git a/vortex-array/src/arrays/extension/vtable/operations.rs b/vortex-array/src/arrays/extension/vtable/operations.rs index 3a3ac7c7de4..343c0a52567 100644 --- a/vortex-array/src/arrays/extension/vtable/operations.rs +++ b/vortex-array/src/arrays/extension/vtable/operations.rs @@ -3,7 +3,7 @@ use vortex_error::VortexResult; -use crate::Array; +use crate::DynArray; use crate::arrays::extension::ExtensionArray; use crate::arrays::extension::ExtensionVTable; use crate::scalar::Scalar; diff --git a/vortex-array/src/arrays/filter/rules.rs b/vortex-array/src/arrays/filter/rules.rs index 388ae2da254..f912d3bf616 100644 --- a/vortex-array/src/arrays/filter/rules.rs +++ b/vortex-array/src/arrays/filter/rules.rs @@ -4,9 +4,9 @@ use vortex_error::VortexResult; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; use crate::Canonical; +use crate::DynArray; use crate::IntoArray; use crate::arrays::FilterArray; use crate::arrays::FilterVTable; diff --git a/vortex-array/src/arrays/filter/vtable.rs b/vortex-array/src/arrays/filter/vtable.rs index 7deae7af8a0..23b22612873 100644 --- a/vortex-array/src/arrays/filter/vtable.rs +++ b/vortex-array/src/arrays/filter/vtable.rs @@ -13,10 +13,10 @@ use vortex_error::vortex_panic; use vortex_mask::Mask; use vortex_session::VortexSession; -use crate::Array; use crate::ArrayEq; use crate::ArrayHash; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::Precision; use crate::arrays::filter::array::FilterArray; diff --git a/vortex-array/src/arrays/fixed_size_list/array.rs b/vortex-array/src/arrays/fixed_size_list/array.rs index 19fa527c924..12a9e044c11 100644 --- a/vortex-array/src/arrays/fixed_size_list/array.rs +++ b/vortex-array/src/arrays/fixed_size_list/array.rs @@ -7,8 +7,8 @@ use vortex_error::VortexExpect; use vortex_error::VortexResult; use vortex_error::vortex_ensure; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::dtype::DType; use crate::stats::ArrayStats; use crate::validity::Validity; diff --git a/vortex-array/src/arrays/fixed_size_list/compute/take.rs b/vortex-array/src/arrays/fixed_size_list/compute/take.rs index 53856958098..e41b0324c03 100644 --- a/vortex-array/src/arrays/fixed_size_list/compute/take.rs +++ b/vortex-array/src/arrays/fixed_size_list/compute/take.rs @@ -7,8 +7,8 @@ use vortex_error::VortexExpect; use vortex_error::VortexResult; use vortex_error::vortex_panic; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::FixedSizeListArray; use crate::arrays::FixedSizeListVTable; diff --git a/vortex-array/src/arrays/fixed_size_list/tests/basic.rs b/vortex-array/src/arrays/fixed_size_list/tests/basic.rs index a53c62ae8ea..e3cdc9b2789 100644 --- a/vortex-array/src/arrays/fixed_size_list/tests/basic.rs +++ b/vortex-array/src/arrays/fixed_size_list/tests/basic.rs @@ -5,7 +5,7 @@ use std::sync::Arc; use vortex_buffer::buffer; -use crate::Array; +use crate::DynArray; use crate::IntoArray; use crate::arrays::FixedSizeListArray; use crate::dtype::DType; diff --git a/vortex-array/src/arrays/fixed_size_list/tests/degenerate.rs b/vortex-array/src/arrays/fixed_size_list/tests/degenerate.rs index dec183141f3..d1b08fb0d04 100644 --- a/vortex-array/src/arrays/fixed_size_list/tests/degenerate.rs +++ b/vortex-array/src/arrays/fixed_size_list/tests/degenerate.rs @@ -5,7 +5,7 @@ use std::sync::Arc; use vortex_buffer::buffer; -use crate::Array; +use crate::DynArray; use crate::IntoArray; use crate::arrays::FixedSizeListArray; use crate::arrays::PrimitiveArray; diff --git a/vortex-array/src/arrays/fixed_size_list/tests/filter.rs b/vortex-array/src/arrays/fixed_size_list/tests/filter.rs index 945e778eeb3..c58e97bc719 100644 --- a/vortex-array/src/arrays/fixed_size_list/tests/filter.rs +++ b/vortex-array/src/arrays/fixed_size_list/tests/filter.rs @@ -6,8 +6,8 @@ use vortex_buffer::BitBuffer; use vortex_buffer::buffer; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::FixedSizeListArray; use crate::arrays::PrimitiveArray; diff --git a/vortex-array/src/arrays/fixed_size_list/tests/nested.rs b/vortex-array/src/arrays/fixed_size_list/tests/nested.rs index e63969b9862..f49cdd7f2b0 100644 --- a/vortex-array/src/arrays/fixed_size_list/tests/nested.rs +++ b/vortex-array/src/arrays/fixed_size_list/tests/nested.rs @@ -5,7 +5,7 @@ use std::sync::Arc; use vortex_buffer::buffer; -use crate::Array; +use crate::DynArray; use crate::IntoArray; use crate::ToCanonical; use crate::arrays::FixedSizeListArray; diff --git a/vortex-array/src/arrays/fixed_size_list/tests/take.rs b/vortex-array/src/arrays/fixed_size_list/tests/take.rs index 077b8651330..68ff369fe52 100644 --- a/vortex-array/src/arrays/fixed_size_list/tests/take.rs +++ b/vortex-array/src/arrays/fixed_size_list/tests/take.rs @@ -9,7 +9,7 @@ use super::common::create_empty_fsl; use super::common::create_large_fsl; use super::common::create_nullable_fsl; use super::common::create_single_element_fsl; -use crate::Array; +use crate::DynArray; use crate::IntoArray; use crate::arrays::FixedSizeListArray; use crate::arrays::PrimitiveArray; diff --git a/vortex-array/src/arrays/list/array.rs b/vortex-array/src/arrays/list/array.rs index 205cf125167..cdca1ae04f2 100644 --- a/vortex-array/src/arrays/list/array.rs +++ b/vortex-array/src/arrays/list/array.rs @@ -10,8 +10,8 @@ use vortex_error::vortex_bail; use vortex_error::vortex_ensure; use vortex_error::vortex_panic; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::ConstantArray; use crate::arrays::ListVTable; diff --git a/vortex-array/src/arrays/list/compute/take.rs b/vortex-array/src/arrays/list/compute/take.rs index 6e79f4320ed..1d299516b59 100644 --- a/vortex-array/src/arrays/list/compute/take.rs +++ b/vortex-array/src/arrays/list/compute/take.rs @@ -4,8 +4,8 @@ use vortex_error::VortexExpect; use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::arrays::ListArray; use crate::arrays::ListVTable; use crate::arrays::PrimitiveArray; @@ -186,7 +186,7 @@ mod test { use rstest::rstest; use vortex_buffer::buffer; - use crate::Array; + use crate::DynArray; use crate::IntoArray as _; use crate::ToCanonical; use crate::arrays::BoolArray; diff --git a/vortex-array/src/arrays/list/vtable/mod.rs b/vortex-array/src/arrays/list/vtable/mod.rs index d574757b008..99c052565b2 100644 --- a/vortex-array/src/arrays/list/vtable/mod.rs +++ b/vortex-array/src/arrays/list/vtable/mod.rs @@ -10,8 +10,8 @@ use vortex_error::vortex_ensure; use vortex_error::vortex_panic; use vortex_session::VortexSession; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::Precision; diff --git a/vortex-array/src/arrays/listview/array.rs b/vortex-array/src/arrays/listview/array.rs index c450b548b88..2d43320bd95 100644 --- a/vortex-array/src/arrays/listview/array.rs +++ b/vortex-array/src/arrays/listview/array.rs @@ -10,8 +10,8 @@ use vortex_error::vortex_bail; use vortex_error::vortex_ensure; use vortex_error::vortex_err; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ToCanonical; use crate::arrays::PrimitiveArray; use crate::arrays::PrimitiveVTable; diff --git a/vortex-array/src/arrays/listview/compute/rules.rs b/vortex-array/src/arrays/listview/compute/rules.rs index bcb09d1951f..c43deecf287 100644 --- a/vortex-array/src/arrays/listview/compute/rules.rs +++ b/vortex-array/src/arrays/listview/compute/rules.rs @@ -3,8 +3,8 @@ use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::FilterArray; use crate::arrays::FilterVTable; diff --git a/vortex-array/src/arrays/listview/compute/take.rs b/vortex-array/src/arrays/listview/compute/take.rs index 55f3e10a223..af1eac44e55 100644 --- a/vortex-array/src/arrays/listview/compute/take.rs +++ b/vortex-array/src/arrays/listview/compute/take.rs @@ -4,8 +4,8 @@ use num_traits::Zero; use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::ListViewArray; use crate::arrays::ListViewRebuildMode; diff --git a/vortex-array/src/arrays/listview/conversion.rs b/vortex-array/src/arrays/listview/conversion.rs index 3bc3d461209..fb8a45161cd 100644 --- a/vortex-array/src/arrays/listview/conversion.rs +++ b/vortex-array/src/arrays/listview/conversion.rs @@ -6,9 +6,9 @@ use std::sync::Arc; use vortex_error::VortexExpect; use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; use crate::Canonical; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::ToCanonical; diff --git a/vortex-array/src/arrays/listview/rebuild.rs b/vortex-array/src/arrays/listview/rebuild.rs index 1e6ca4752d4..9e336f90b19 100644 --- a/vortex-array/src/arrays/listview/rebuild.rs +++ b/vortex-array/src/arrays/listview/rebuild.rs @@ -6,7 +6,7 @@ use vortex_buffer::BufferMut; use vortex_error::VortexExpect; use vortex_error::VortexResult; -use crate::Array; +use crate::DynArray; use crate::IntoArray; use crate::ToCanonical; use crate::arrays::ConstantArray; diff --git a/vortex-array/src/arrays/listview/tests/basic.rs b/vortex-array/src/arrays/listview/tests/basic.rs index 331af7ee484..09dce5797bf 100644 --- a/vortex-array/src/arrays/listview/tests/basic.rs +++ b/vortex-array/src/arrays/listview/tests/basic.rs @@ -7,7 +7,7 @@ use rstest::rstest; use vortex_buffer::buffer; use vortex_error::VortexResult; -use crate::Array; +use crate::DynArray; use crate::IntoArray; use crate::LEGACY_SESSION; use crate::VortexSessionExecute; diff --git a/vortex-array/src/arrays/listview/tests/filter.rs b/vortex-array/src/arrays/listview/tests/filter.rs index 5e7b4ceabb2..1baed673c2b 100644 --- a/vortex-array/src/arrays/listview/tests/filter.rs +++ b/vortex-array/src/arrays/listview/tests/filter.rs @@ -10,7 +10,7 @@ use super::common::create_empty_lists_listview; use super::common::create_large_listview; use super::common::create_nullable_listview; use super::common::create_overlapping_listview; -use crate::Array; +use crate::DynArray; use crate::IntoArray; use crate::ToCanonical; use crate::arrays::ConstantArray; diff --git a/vortex-array/src/arrays/listview/tests/nested.rs b/vortex-array/src/arrays/listview/tests/nested.rs index b72b64af558..5358c7c423f 100644 --- a/vortex-array/src/arrays/listview/tests/nested.rs +++ b/vortex-array/src/arrays/listview/tests/nested.rs @@ -3,7 +3,7 @@ use vortex_buffer::buffer; -use crate::Array; +use crate::DynArray; use crate::IntoArray; use crate::arrays::ListViewArray; use crate::arrays::ListViewVTable; diff --git a/vortex-array/src/arrays/listview/tests/operations.rs b/vortex-array/src/arrays/listview/tests/operations.rs index 2edd81f46dc..45f8f22e9b1 100644 --- a/vortex-array/src/arrays/listview/tests/operations.rs +++ b/vortex-array/src/arrays/listview/tests/operations.rs @@ -10,7 +10,7 @@ use vortex_mask::Mask; use super::common::create_basic_listview; use super::common::create_large_listview; use super::common::create_nullable_listview; -use crate::Array; +use crate::DynArray; use crate::IntoArray; use crate::ToCanonical; use crate::arrays::BoolArray; diff --git a/vortex-array/src/arrays/listview/tests/take.rs b/vortex-array/src/arrays/listview/tests/take.rs index a3a710af0e5..eea03cd5f03 100644 --- a/vortex-array/src/arrays/listview/tests/take.rs +++ b/vortex-array/src/arrays/listview/tests/take.rs @@ -9,7 +9,7 @@ use super::common::create_empty_lists_listview; use super::common::create_large_listview; use super::common::create_nullable_listview; use super::common::create_overlapping_listview; -use crate::Array; +use crate::DynArray; use crate::IntoArray; use crate::ToCanonical; use crate::arrays::ConstantArray; diff --git a/vortex-array/src/arrays/masked/compute/take.rs b/vortex-array/src/arrays/masked/compute/take.rs index 5bb908f0cdf..7a705b8f7af 100644 --- a/vortex-array/src/arrays/masked/compute/take.rs +++ b/vortex-array/src/arrays/masked/compute/take.rs @@ -3,8 +3,8 @@ use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::MaskedArray; use crate::arrays::MaskedVTable; diff --git a/vortex-array/src/arrays/masked/tests.rs b/vortex-array/src/arrays/masked/tests.rs index 4024f4d8d79..84a41586173 100644 --- a/vortex-array/src/arrays/masked/tests.rs +++ b/vortex-array/src/arrays/masked/tests.rs @@ -5,7 +5,7 @@ use rstest::rstest; use vortex_error::VortexResult; use super::*; -use crate::Array; +use crate::DynArray; use crate::IntoArray; use crate::ToCanonical as _; use crate::arrays::PrimitiveArray; diff --git a/vortex-array/src/arrays/masked/vtable/operations.rs b/vortex-array/src/arrays/masked/vtable/operations.rs index 5109c6993e9..bb1c93b381f 100644 --- a/vortex-array/src/arrays/masked/vtable/operations.rs +++ b/vortex-array/src/arrays/masked/vtable/operations.rs @@ -3,7 +3,7 @@ use vortex_error::VortexResult; -use crate::Array; +use crate::DynArray; use crate::arrays::MaskedVTable; use crate::arrays::masked::MaskedArray; use crate::scalar::Scalar; diff --git a/vortex-array/src/arrays/primitive/compute/take/mod.rs b/vortex-array/src/arrays/primitive/compute/take/mod.rs index 9cc21a23e38..d7173c5bbac 100644 --- a/vortex-array/src/arrays/primitive/compute/take/mod.rs +++ b/vortex-array/src/arrays/primitive/compute/take/mod.rs @@ -14,8 +14,8 @@ use vortex_buffer::BufferMut; use vortex_error::VortexResult; use vortex_error::vortex_bail; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::PrimitiveVTable; use crate::arrays::TakeExecute; @@ -140,7 +140,7 @@ mod test { use vortex_buffer::buffer; use vortex_error::VortexExpect; - use crate::Array; + use crate::DynArray; use crate::IntoArray; use crate::arrays::BoolArray; use crate::arrays::PrimitiveArray; diff --git a/vortex-array/src/arrays/scalar_fn/array.rs b/vortex-array/src/arrays/scalar_fn/array.rs index b91592d3e84..1e3ef1d14ba 100644 --- a/vortex-array/src/arrays/scalar_fn/array.rs +++ b/vortex-array/src/arrays/scalar_fn/array.rs @@ -4,8 +4,8 @@ use vortex_error::VortexResult; use vortex_error::vortex_ensure; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::dtype::DType; use crate::scalar_fn::ScalarFnRef; use crate::stats::ArrayStats; diff --git a/vortex-array/src/arrays/scalar_fn/rules.rs b/vortex-array/src/arrays/scalar_fn/rules.rs index 61d2e17d1ee..c828ae9dc75 100644 --- a/vortex-array/src/arrays/scalar_fn/rules.rs +++ b/vortex-array/src/arrays/scalar_fn/rules.rs @@ -8,9 +8,9 @@ use itertools::Itertools; use vortex_error::VortexExpect; use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; use crate::Canonical; +use crate::DynArray; use crate::IntoArray; use crate::arrays::ConstantArray; use crate::arrays::ConstantVTable; diff --git a/vortex-array/src/arrays/scalar_fn/vtable/mod.rs b/vortex-array/src/arrays/scalar_fn/vtable/mod.rs index 974923a23a1..8e1debf9554 100644 --- a/vortex-array/src/arrays/scalar_fn/vtable/mod.rs +++ b/vortex-array/src/arrays/scalar_fn/vtable/mod.rs @@ -17,10 +17,10 @@ use vortex_error::vortex_ensure; use vortex_error::vortex_panic; use vortex_session::VortexSession; -use crate::Array; use crate::ArrayEq; use crate::ArrayHash; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::Precision; use crate::arrays::scalar_fn::array::ScalarFnArray; @@ -250,7 +250,7 @@ pub struct AnyScalarFn; impl Matcher for AnyScalarFn { type Match<'a> = &'a ScalarFnArray; - fn try_match(array: &dyn Array) -> Option> { + fn try_match(array: &dyn DynArray) -> Option> { array.as_opt::() } } @@ -262,7 +262,7 @@ pub struct ExactScalarFn(PhantomData); impl Matcher for ExactScalarFn { type Match<'a> = ScalarFnArrayView<'a, F>; - fn matches(array: &dyn Array) -> bool { + fn matches(array: &dyn DynArray) -> bool { if let Some(scalar_fn_array) = array.as_opt::() { scalar_fn_array.scalar_fn().is::() } else { @@ -270,7 +270,7 @@ impl Matcher for ExactScalarFn { } } - fn try_match(array: &dyn Array) -> Option> { + fn try_match(array: &dyn DynArray) -> Option> { let scalar_fn_array = array.as_opt::()?; let scalar_fn_vtable = scalar_fn_array .scalar_fn @@ -289,13 +289,13 @@ impl Matcher for ExactScalarFn { } pub struct ScalarFnArrayView<'a, F: scalar_fn::ScalarFnVTable> { - array: &'a dyn Array, + array: &'a dyn DynArray, pub vtable: &'a F, pub options: &'a F::Options, } impl Deref for ScalarFnArrayView<'_, F> { - type Target = dyn Array; + type Target = dyn DynArray; fn deref(&self) -> &Self::Target { self.array diff --git a/vortex-array/src/arrays/scalar_fn/vtable/operations.rs b/vortex-array/src/arrays/scalar_fn/vtable/operations.rs index a4e9aecf7fb..628c829a4c3 100644 --- a/vortex-array/src/arrays/scalar_fn/vtable/operations.rs +++ b/vortex-array/src/arrays/scalar_fn/vtable/operations.rs @@ -3,7 +3,7 @@ use vortex_error::VortexResult; -use crate::Array; +use crate::DynArray; use crate::IntoArray; use crate::LEGACY_SESSION; use crate::VortexSessionExecute; diff --git a/vortex-array/src/arrays/slice/vtable.rs b/vortex-array/src/arrays/slice/vtable.rs index daa445e8b89..f90392f0dbb 100644 --- a/vortex-array/src/arrays/slice/vtable.rs +++ b/vortex-array/src/arrays/slice/vtable.rs @@ -15,11 +15,11 @@ use vortex_error::vortex_panic; use vortex_session::VortexSession; use crate::AnyCanonical; -use crate::Array; use crate::ArrayEq; use crate::ArrayHash; use crate::ArrayRef; use crate::Canonical; +use crate::DynArray; use crate::Precision; use crate::arrays::slice::array::SliceArray; use crate::arrays::slice::rules::PARENT_RULES; @@ -203,7 +203,7 @@ impl Debug for SliceMetadata { mod tests { use vortex_error::VortexResult; - use crate::Array; + use crate::DynArray; use crate::IntoArray; use crate::arrays::PrimitiveArray; use crate::arrays::SliceArray; diff --git a/vortex-array/src/arrays/struct_/array.rs b/vortex-array/src/arrays/struct_/array.rs index b7a1a83b405..a351cc84a5d 100644 --- a/vortex-array/src/arrays/struct_/array.rs +++ b/vortex-array/src/arrays/struct_/array.rs @@ -10,8 +10,8 @@ use vortex_error::VortexResult; use vortex_error::vortex_bail; use vortex_error::vortex_err; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::dtype::DType; use crate::dtype::FieldName; diff --git a/vortex-array/src/arrays/struct_/compute/cast.rs b/vortex-array/src/arrays/struct_/compute/cast.rs index 9e6cf78fba1..9f072d4578b 100644 --- a/vortex-array/src/arrays/struct_/compute/cast.rs +++ b/vortex-array/src/arrays/struct_/compute/cast.rs @@ -94,7 +94,7 @@ mod tests { use rstest::rstest; use vortex_buffer::buffer; - use crate::Array; + use crate::DynArray; use crate::IntoArray; use crate::ToCanonical; use crate::arrays::PrimitiveArray; diff --git a/vortex-array/src/arrays/struct_/compute/mod.rs b/vortex-array/src/arrays/struct_/compute/mod.rs index 06d51c5a993..70cd96c33c4 100644 --- a/vortex-array/src/arrays/struct_/compute/mod.rs +++ b/vortex-array/src/arrays/struct_/compute/mod.rs @@ -19,8 +19,8 @@ mod tests { use vortex_buffer::buffer; use vortex_error::VortexExpect; - use crate::Array; use crate::Canonical; + use crate::DynArray; use crate::IntoArray as _; use crate::LEGACY_SESSION; use crate::VortexSessionExecute; diff --git a/vortex-array/src/arrays/struct_/compute/take.rs b/vortex-array/src/arrays/struct_/compute/take.rs index 9a3113f22b7..d41c93fd2d4 100644 --- a/vortex-array/src/arrays/struct_/compute/take.rs +++ b/vortex-array/src/arrays/struct_/compute/take.rs @@ -3,8 +3,8 @@ use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::StructArray; use crate::arrays::StructVTable; diff --git a/vortex-array/src/arrays/struct_/vtable/operations.rs b/vortex-array/src/arrays/struct_/vtable/operations.rs index dba7a594ed1..d7b48be345f 100644 --- a/vortex-array/src/arrays/struct_/vtable/operations.rs +++ b/vortex-array/src/arrays/struct_/vtable/operations.rs @@ -3,7 +3,7 @@ use vortex_error::VortexResult; -use crate::Array; +use crate::DynArray; use crate::arrays::struct_::StructArray; use crate::arrays::struct_::StructVTable; use crate::scalar::Scalar; diff --git a/vortex-array/src/arrays/varbin/array.rs b/vortex-array/src/arrays/varbin/array.rs index aeb875b0efb..9c72e80487d 100644 --- a/vortex-array/src/arrays/varbin/array.rs +++ b/vortex-array/src/arrays/varbin/array.rs @@ -8,8 +8,8 @@ use vortex_error::VortexResult; use vortex_error::vortex_ensure; use vortex_error::vortex_err; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ToCanonical; use crate::arrays::varbin::builder::VarBinBuilder; use crate::buffer::BufferHandle; diff --git a/vortex-array/src/arrays/varbin/compute/compare.rs b/vortex-array/src/arrays/varbin/compute/compare.rs index 87d03277940..b05b97023f0 100644 --- a/vortex-array/src/arrays/varbin/compute/compare.rs +++ b/vortex-array/src/arrays/varbin/compute/compare.rs @@ -10,8 +10,8 @@ use vortex_error::VortexResult; use vortex_error::vortex_bail; use vortex_error::vortex_err; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::arrays::BoolArray; @@ -214,7 +214,7 @@ mod test { #[cfg(test)] mod tests { - use crate::Array; + use crate::DynArray; use crate::arrays::ConstantArray; use crate::arrays::VarBinArray; use crate::builtins::ArrayBuiltins; diff --git a/vortex-array/src/arrays/varbin/compute/take.rs b/vortex-array/src/arrays/varbin/compute/take.rs index e7e0cb5dd7a..851b4a4ce54 100644 --- a/vortex-array/src/arrays/varbin/compute/take.rs +++ b/vortex-array/src/arrays/varbin/compute/take.rs @@ -250,7 +250,7 @@ mod tests { use vortex_buffer::ByteBuffer; use vortex_buffer::buffer; - use crate::Array; + use crate::DynArray; use crate::IntoArray; use crate::arrays::PrimitiveArray; use crate::arrays::VarBinArray; diff --git a/vortex-array/src/arrays/varbin/tests.rs b/vortex-array/src/arrays/varbin/tests.rs index 36272a846be..951b2905c8e 100644 --- a/vortex-array/src/arrays/varbin/tests.rs +++ b/vortex-array/src/arrays/varbin/tests.rs @@ -6,8 +6,8 @@ use rstest::rstest; use vortex_buffer::Buffer; use vortex_buffer::buffer; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::VarBinViewArray; use crate::arrays::varbin::VarBinArray; diff --git a/vortex-array/src/arrays/varbinview/compute/mod.rs b/vortex-array/src/arrays/varbinview/compute/mod.rs index f4fa1f9fe15..98be54f7513 100644 --- a/vortex-array/src/arrays/varbinview/compute/mod.rs +++ b/vortex-array/src/arrays/varbinview/compute/mod.rs @@ -17,7 +17,7 @@ mod tests { use crate::IntoArray; use crate::accessor::ArrayAccessor; - use crate::array::Array; + use crate::array::DynArray; use crate::arrays::VarBinViewArray; use crate::canonical::ToCanonical; #[test] diff --git a/vortex-array/src/arrays/varbinview/compute/take.rs b/vortex-array/src/arrays/varbinview/compute/take.rs index caee8c144aa..e8c0540c797 100644 --- a/vortex-array/src/arrays/varbinview/compute/take.rs +++ b/vortex-array/src/arrays/varbinview/compute/take.rs @@ -89,7 +89,7 @@ mod tests { use crate::IntoArray; use crate::accessor::ArrayAccessor; - use crate::array::Array; + use crate::array::DynArray; use crate::arrays::PrimitiveArray; use crate::arrays::VarBinViewArray; use crate::canonical::ToCanonical; diff --git a/vortex-array/src/arrow/datum.rs b/vortex-array/src/arrow/datum.rs index 0371cc7fcf7..f0a72716975 100644 --- a/vortex-array/src/arrow/datum.rs +++ b/vortex-array/src/arrow/datum.rs @@ -9,8 +9,8 @@ use vortex_error::VortexExpect; use vortex_error::VortexResult; use vortex_error::vortex_panic; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::ConstantArray; use crate::arrays::ConstantVTable; @@ -40,7 +40,7 @@ impl Datum { } } - /// Create a new [`Datum`] from an [`Array`], which can then be passed to Arrow compute. + /// Create a new [`Datum`] from an [`DynArray`], which can then be passed to Arrow compute. /// This not try and convert the array to a scalar if it is constant. pub fn try_new_array(array: &ArrayRef) -> VortexResult { Ok(Self { diff --git a/vortex-array/src/arrow/executor/list.rs b/vortex-array/src/arrow/executor/list.rs index 4b18ba916b0..944ab4d3e19 100644 --- a/vortex-array/src/arrow/executor/list.rs +++ b/vortex-array/src/arrow/executor/list.rs @@ -13,9 +13,9 @@ use vortex_error::VortexExpect; use vortex_error::VortexResult; use vortex_error::vortex_ensure; -use crate::Array; use crate::ArrayRef; use crate::Canonical; +use crate::DynArray; use crate::ExecutionCtx; use crate::arrays::ListArray; use crate::arrays::ListVTable; diff --git a/vortex-array/src/arrow/executor/mod.rs b/vortex-array/src/arrow/executor/mod.rs index 1cb0f11f587..abb55efb97f 100644 --- a/vortex-array/src/arrow/executor/mod.rs +++ b/vortex-array/src/arrow/executor/mod.rs @@ -29,8 +29,8 @@ use vortex_error::VortexResult; use vortex_error::vortex_bail; use vortex_error::vortex_ensure; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::arrays::ListVTable; use crate::arrays::VarBinVTable; use crate::arrow::executor::bool::to_arrow_bool; diff --git a/vortex-array/src/arrow/executor/run_end.rs b/vortex-array/src/arrow/executor/run_end.rs index 560c75c0dce..2cc853b475f 100644 --- a/vortex-array/src/arrow/executor/run_end.rs +++ b/vortex-array/src/arrow/executor/run_end.rs @@ -18,8 +18,8 @@ use vortex_error::vortex_bail; use vortex_error::vortex_ensure; use vortex_error::vortex_err; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::array::ArrayVisitor; diff --git a/vortex-array/src/arrow/executor/struct_.rs b/vortex-array/src/arrow/executor/struct_.rs index c2b6232c31d..42daadabd4a 100644 --- a/vortex-array/src/arrow/executor/struct_.rs +++ b/vortex-array/src/arrow/executor/struct_.rs @@ -12,8 +12,8 @@ use itertools::Itertools; use vortex_error::VortexResult; use vortex_error::vortex_ensure; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::arrays::ChunkedVTable; diff --git a/vortex-array/src/arrow/executor/temporal.rs b/vortex-array/src/arrow/executor/temporal.rs index 64fe4eb1466..6e5a6c71a90 100644 --- a/vortex-array/src/arrow/executor/temporal.rs +++ b/vortex-array/src/arrow/executor/temporal.rs @@ -25,8 +25,8 @@ use vortex_error::vortex_bail; use vortex_error::vortex_ensure; use vortex_error::vortex_err; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ExecutionCtx; use crate::arrays::ExtensionArray; use crate::arrays::PrimitiveArray as VortexPrimitiveArray; diff --git a/vortex-array/src/arrow/record_batch.rs b/vortex-array/src/arrow/record_batch.rs index 3ccf65920a9..0b2d0af547d 100644 --- a/vortex-array/src/arrow/record_batch.rs +++ b/vortex-array/src/arrow/record_batch.rs @@ -10,18 +10,18 @@ use vortex_error::VortexResult; use vortex_error::vortex_bail; use vortex_error::vortex_ensure; -use crate::Array; use crate::Canonical; +use crate::DynArray; use crate::LEGACY_SESSION; use crate::VortexSessionExecute; use crate::array::IntoArray; use crate::arrays::StructArray; use crate::arrow::ArrowArrayExecutor; -impl TryFrom<&dyn Array> for RecordBatch { +impl TryFrom<&dyn DynArray> for RecordBatch { type Error = VortexError; - fn try_from(value: &dyn Array) -> VortexResult { + fn try_from(value: &dyn DynArray) -> VortexResult { let Canonical::Struct(struct_array) = value.to_canonical()? else { vortex_bail!("RecordBatch can only be constructed from ") }; diff --git a/vortex-array/src/builders/bool.rs b/vortex-array/src/builders/bool.rs index 215ee1628af..1657e8e0dde 100644 --- a/vortex-array/src/builders/bool.rs +++ b/vortex-array/src/builders/bool.rs @@ -152,7 +152,7 @@ mod tests { use crate::IntoArray; use crate::LEGACY_SESSION; use crate::VortexSessionExecute; - use crate::array::Array; + use crate::array::DynArray; use crate::arrays::BoolArray; use crate::arrays::ChunkedArray; use crate::assert_arrays_eq; diff --git a/vortex-array/src/builders/dict/bytes.rs b/vortex-array/src/builders/dict/bytes.rs index 7aa7fde0981..20c5ca822b8 100644 --- a/vortex-array/src/builders/dict/bytes.rs +++ b/vortex-array/src/builders/dict/bytes.rs @@ -17,8 +17,8 @@ use vortex_utils::aliases::hash_map::RandomState; use super::DictConstraints; use super::DictEncoder; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::accessor::ArrayAccessor; use crate::arrays::BinaryView; diff --git a/vortex-array/src/builders/dict/mod.rs b/vortex-array/src/builders/dict/mod.rs index d246be42607..63c7211b110 100644 --- a/vortex-array/src/builders/dict/mod.rs +++ b/vortex-array/src/builders/dict/mod.rs @@ -7,8 +7,8 @@ use vortex_error::VortexResult; use vortex_error::vortex_bail; use vortex_error::vortex_panic; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::ToCanonical; use crate::arrays::DictArray; diff --git a/vortex-array/src/builders/dict/primitive.rs b/vortex-array/src/builders/dict/primitive.rs index 5619cdba1f8..385bd7612f6 100644 --- a/vortex-array/src/builders/dict/primitive.rs +++ b/vortex-array/src/builders/dict/primitive.rs @@ -13,8 +13,8 @@ use vortex_utils::aliases::hash_map::HashMap; use super::DictConstraints; use super::DictEncoder; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::ToCanonical; use crate::accessor::ArrayAccessor; @@ -158,7 +158,7 @@ mod test { use itertools::Itertools; use vortex_buffer::buffer; - use crate::Array; + use crate::DynArray; use crate::IntoArray as _; use crate::arrays::PrimitiveArray; use crate::assert_arrays_eq; diff --git a/vortex-array/src/builders/fixed_size_list.rs b/vortex-array/src/builders/fixed_size_list.rs index cdff84dd1ed..3ce90ad339e 100644 --- a/vortex-array/src/builders/fixed_size_list.rs +++ b/vortex-array/src/builders/fixed_size_list.rs @@ -11,8 +11,8 @@ use vortex_error::vortex_ensure; use vortex_error::vortex_panic; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::FixedSizeListArray; use crate::builders::ArrayBuilder; @@ -277,7 +277,7 @@ mod tests { use super::FixedSizeListBuilder; use crate::IntoArray as _; use crate::ToCanonical; - use crate::array::Array; + use crate::array::DynArray; use crate::arrays::FixedSizeListArray; use crate::arrays::PrimitiveArray; use crate::builders::ArrayBuilder; diff --git a/vortex-array/src/builders/list.rs b/vortex-array/src/builders/list.rs index a2039b423e0..643402b6555 100644 --- a/vortex-array/src/builders/list.rs +++ b/vortex-array/src/builders/list.rs @@ -11,8 +11,8 @@ use vortex_error::vortex_ensure; use vortex_error::vortex_panic; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::ListArray; use crate::builders::ArrayBuilder; @@ -310,7 +310,7 @@ mod tests { use crate::IntoArray; use crate::ToCanonical; - use crate::array::Array; + use crate::array::DynArray; use crate::arrays::ChunkedArray; use crate::arrays::ListArray; use crate::arrays::PrimitiveArray; diff --git a/vortex-array/src/builders/listview.rs b/vortex-array/src/builders/listview.rs index e97fc9f042f..dc3509c55d9 100644 --- a/vortex-array/src/builders/listview.rs +++ b/vortex-array/src/builders/listview.rs @@ -20,8 +20,8 @@ use vortex_mask::Mask; use crate::Canonical; use crate::ToCanonical; -use crate::array::Array; use crate::array::ArrayRef; +use crate::array::DynArray; use crate::array::IntoArray; use crate::arrays::ListViewArray; use crate::arrays::ListViewRebuildMode; @@ -431,7 +431,7 @@ mod tests { use super::ListViewBuilder; use crate::IntoArray; - use crate::array::Array; + use crate::array::DynArray; use crate::arrays::ListArray; use crate::arrays::PrimitiveArray; use crate::assert_arrays_eq; diff --git a/vortex-array/src/builders/null.rs b/vortex-array/src/builders/null.rs index 84e4ae73220..0fbe5c6b001 100644 --- a/vortex-array/src/builders/null.rs +++ b/vortex-array/src/builders/null.rs @@ -7,8 +7,8 @@ use vortex_error::VortexResult; use vortex_error::vortex_ensure; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::NullArray; use crate::builders::ArrayBuilder; diff --git a/vortex-array/src/builtins.rs b/vortex-array/src/builtins.rs index 0a6aef9a405..3baaf0ec696 100644 --- a/vortex-array/src/builtins.rs +++ b/vortex-array/src/builtins.rs @@ -12,8 +12,8 @@ use vortex_error::VortexResult; use vortex_session::VortexSession; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::arrays::ConstantArray; diff --git a/vortex-array/src/canonical.rs b/vortex-array/src/canonical.rs index bd90965cf43..169891f9748 100644 --- a/vortex-array/src/canonical.rs +++ b/vortex-array/src/canonical.rs @@ -12,9 +12,9 @@ use vortex_error::VortexResult; use vortex_error::vortex_ensure; use vortex_error::vortex_panic; -use crate::Array; use crate::ArrayRef; use crate::Columnar; +use crate::DynArray; use crate::Executable; use crate::ExecutionCtx; use crate::IntoArray; @@ -51,7 +51,7 @@ use crate::matcher::Matcher; /// An enum capturing the default uncompressed encodings for each [Vortex type](DType). /// -/// Any array can be decoded into canonical form via the [`to_canonical`](Array::to_canonical) +/// Any array can be decoded into canonical form via the [`to_canonical`](DynArray::to_canonical) /// trait method. This is the simplest encoding for a type, and will not be compressed but may /// contain compressed child arrays. /// @@ -325,8 +325,8 @@ impl Canonical { } } -impl AsRef for Canonical { - fn as_ref(&self) -> &(dyn Array + 'static) { +impl AsRef for Canonical { + fn as_ref(&self) -> &(dyn DynArray + 'static) { match_each_canonical!(self, |arr| arr.as_ref()) } } @@ -377,7 +377,7 @@ pub trait ToCanonical { } // Blanket impl for all Array encodings. -impl ToCanonical for A { +impl ToCanonical for A { fn to_null(&self) -> NullArray { self.to_canonical() .vortex_expect("to_canonical failed") @@ -868,8 +868,8 @@ impl From> for Canonical { } } -impl AsRef for CanonicalView<'_> { - fn as_ref(&self) -> &dyn Array { +impl AsRef for CanonicalView<'_> { + fn as_ref(&self) -> &dyn DynArray { match self { CanonicalView::Null(a) => a.as_ref(), CanonicalView::Bool(a) => a.as_ref(), @@ -889,7 +889,7 @@ pub struct AnyCanonical; impl Matcher for AnyCanonical { type Match<'a> = CanonicalView<'a>; - fn matches(array: &dyn Array) -> bool { + fn matches(array: &dyn DynArray) -> bool { array.is::() || array.is::() || array.is::() @@ -901,7 +901,7 @@ impl Matcher for AnyCanonical { || array.is::() } - fn try_match<'a>(array: &'a dyn Array) -> Option> { + fn try_match<'a>(array: &'a dyn DynArray) -> Option> { if let Some(a) = array.as_opt::() { Some(CanonicalView::Null(a)) } else if let Some(a) = array.as_opt::() { diff --git a/vortex-array/src/columnar.rs b/vortex-array/src/columnar.rs index 09746a67032..ebfa8fe9c93 100644 --- a/vortex-array/src/columnar.rs +++ b/vortex-array/src/columnar.rs @@ -9,10 +9,10 @@ use vortex_error::vortex_bail; use vortex_error::vortex_panic; use crate::AnyCanonical; -use crate::Array; use crate::ArrayRef; use crate::Canonical; use crate::CanonicalView; +use crate::DynArray; use crate::Executable; use crate::ExecutionCtx; use crate::IntoArray; @@ -115,8 +115,8 @@ pub enum ColumnarView<'a> { Constant(&'a ConstantArray), } -impl<'a> AsRef for ColumnarView<'a> { - fn as_ref(&self) -> &dyn Array { +impl<'a> AsRef for ColumnarView<'a> { + fn as_ref(&self) -> &dyn DynArray { match self { ColumnarView::Canonical(canonical) => canonical.as_ref(), ColumnarView::Constant(constant) => constant.as_ref(), @@ -128,7 +128,7 @@ pub struct AnyColumnar; impl Matcher for AnyColumnar { type Match<'a> = ColumnarView<'a>; - fn try_match<'a>(array: &'a dyn Array) -> Option> { + fn try_match<'a>(array: &'a dyn DynArray) -> Option> { if let Some(constant) = array.as_opt::() { Some(ColumnarView::Constant(constant)) } else { diff --git a/vortex-array/src/compute/boolean.rs b/vortex-array/src/compute/boolean.rs index 41d7d9bcaf2..c5d9342918f 100644 --- a/vortex-array/src/compute/boolean.rs +++ b/vortex-array/src/compute/boolean.rs @@ -3,8 +3,8 @@ use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::builtins::ArrayBuiltins; use crate::scalar_fn::fns::operators::Operator; diff --git a/vortex-array/src/compute/cast.rs b/vortex-array/src/compute/cast.rs index 54966fb1c9f..2c35dac76d4 100644 --- a/vortex-array/src/compute/cast.rs +++ b/vortex-array/src/compute/cast.rs @@ -10,7 +10,7 @@ use crate::dtype::DType; /// /// Use [`crate::builtins::ArrayBuiltins::cast`] instead. #[deprecated(note = "Use `array.cast(dtype)` via `ArrayBuiltins` trait instead")] -pub fn cast(array: &dyn super::Array, dtype: &DType) -> VortexResult { +pub fn cast(array: &dyn super::DynArray, dtype: &DType) -> VortexResult { use crate::builtins::ArrayBuiltins as _; array.to_array().cast(dtype.clone()) } diff --git a/vortex-array/src/compute/conformance/binary_numeric.rs b/vortex-array/src/compute/conformance/binary_numeric.rs index fd78d3f78e8..1f4061f5cd9 100644 --- a/vortex-array/src/compute/conformance/binary_numeric.rs +++ b/vortex-array/src/compute/conformance/binary_numeric.rs @@ -27,8 +27,8 @@ use vortex_error::VortexExpect; use vortex_error::vortex_err; use vortex_error::vortex_panic; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::LEGACY_SESSION; use crate::RecursiveCanonical; diff --git a/vortex-array/src/compute/conformance/cast.rs b/vortex-array/src/compute/conformance/cast.rs index 1b5d099f23d..cf0ebbbce48 100644 --- a/vortex-array/src/compute/conformance/cast.rs +++ b/vortex-array/src/compute/conformance/cast.rs @@ -5,8 +5,8 @@ use vortex_error::VortexExpect; use vortex_error::VortexResult; use vortex_error::vortex_panic; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::builtins::ArrayBuiltins; use crate::compute::MinMaxResult; diff --git a/vortex-array/src/compute/conformance/consistency.rs b/vortex-array/src/compute/conformance/consistency.rs index c3ade3eedea..80fa13d4677 100644 --- a/vortex-array/src/compute/conformance/consistency.rs +++ b/vortex-array/src/compute/conformance/consistency.rs @@ -24,8 +24,8 @@ use vortex_error::VortexExpect; use vortex_error::vortex_panic; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::BoolArray; use crate::arrays::PrimitiveArray; diff --git a/vortex-array/src/compute/conformance/filter.rs b/vortex-array/src/compute/conformance/filter.rs index 8becace2345..f0df98c32d4 100644 --- a/vortex-array/src/compute/conformance/filter.rs +++ b/vortex-array/src/compute/conformance/filter.rs @@ -4,8 +4,8 @@ use vortex_error::VortexExpect; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::assert_arrays_eq; use crate::dtype::DType; diff --git a/vortex-array/src/compute/conformance/mask.rs b/vortex-array/src/compute/conformance/mask.rs index 8f7b0d579db..07689079568 100644 --- a/vortex-array/src/compute/conformance/mask.rs +++ b/vortex-array/src/compute/conformance/mask.rs @@ -4,8 +4,8 @@ use vortex_error::VortexExpect; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::arrays::BoolArray; use crate::compute::mask; diff --git a/vortex-array/src/compute/conformance/take.rs b/vortex-array/src/compute/conformance/take.rs index 0958d3dd405..917a33c7b78 100644 --- a/vortex-array/src/compute/conformance/take.rs +++ b/vortex-array/src/compute/conformance/take.rs @@ -4,9 +4,9 @@ use vortex_buffer::buffer; use vortex_error::VortexExpect; -use crate::Array; use crate::ArrayRef; use crate::Canonical; +use crate::DynArray; use crate::IntoArray as _; use crate::arrays::PrimitiveArray; use crate::dtype::Nullability; diff --git a/vortex-array/src/compute/fill_null.rs b/vortex-array/src/compute/fill_null.rs index 1ae187a357f..aeaf3154175 100644 --- a/vortex-array/src/compute/fill_null.rs +++ b/vortex-array/src/compute/fill_null.rs @@ -4,8 +4,8 @@ use vortex_error::VortexResult; use vortex_error::vortex_ensure; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::builtins::ArrayBuiltins; use crate::scalar::Scalar; diff --git a/vortex-array/src/compute/filter.rs b/vortex-array/src/compute/filter.rs index b3b7f56737a..e291b05fa08 100644 --- a/vortex-array/src/compute/filter.rs +++ b/vortex-array/src/compute/filter.rs @@ -8,8 +8,8 @@ use vortex_error::VortexResult; use vortex_error::vortex_bail; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::ToCanonical; use crate::arrow::FromArrowArray; @@ -23,7 +23,7 @@ use crate::scalar::Scalar; /// # Examples /// /// ``` -/// use vortex_array::{Array, IntoArray}; +/// use vortex_array::{DynArray, IntoArray}; /// use vortex_array::arrays::{BoolArray, PrimitiveArray}; /// use vortex_array::compute::{ filter, mask}; /// use vortex_error::VortexResult; @@ -53,7 +53,7 @@ pub fn filter(array: &ArrayRef, mask: &Mask) -> VortexResult { Ok(array.filter(mask.clone())?.to_canonical()?.into_array()) } -impl dyn Array + '_ { +impl dyn DynArray + '_ { /// Converts from a possible nullable boolean array. Null values are treated as false. pub fn try_to_mask_fill_null_false(&self) -> VortexResult { if !matches!(self.dtype(), DType::Bool(_)) { diff --git a/vortex-array/src/compute/invert.rs b/vortex-array/src/compute/invert.rs index 5a493480f86..8e83af05a71 100644 --- a/vortex-array/src/compute/invert.rs +++ b/vortex-array/src/compute/invert.rs @@ -3,8 +3,8 @@ use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::builtins::ArrayBuiltins; /// Logically invert a boolean array, preserving its validity. diff --git a/vortex-array/src/compute/is_constant.rs b/vortex-array/src/compute/is_constant.rs index 48dce8a573e..4c327b2f1aa 100644 --- a/vortex-array/src/compute/is_constant.rs +++ b/vortex-array/src/compute/is_constant.rs @@ -10,8 +10,8 @@ use vortex_error::VortexResult; use vortex_error::vortex_bail; use vortex_error::vortex_err; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray as _; use crate::arrays::ConstantVTable; use crate::arrays::NullVTable; @@ -238,7 +238,7 @@ impl Kernel for IsConstantKernelAdapter { } struct IsConstantArgs<'a> { - array: &'a dyn Array, + array: &'a dyn DynArray, options: &'a IsConstantOpts, } diff --git a/vortex-array/src/compute/is_sorted.rs b/vortex-array/src/compute/is_sorted.rs index 47ef5f10b77..41db1531efe 100644 --- a/vortex-array/src/compute/is_sorted.rs +++ b/vortex-array/src/compute/is_sorted.rs @@ -10,8 +10,8 @@ use vortex_error::VortexResult; use vortex_error::vortex_bail; use vortex_error::vortex_err; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray as _; use crate::arrays::ConstantVTable; use crate::arrays::NullVTable; @@ -139,7 +139,7 @@ impl ComputeFnVTable for IsSorted { } struct IsSortedArgs<'a> { - array: &'a dyn Array, + array: &'a dyn DynArray, strict: bool, } diff --git a/vortex-array/src/compute/list_contains.rs b/vortex-array/src/compute/list_contains.rs index 8817a485f8f..c9730f93288 100644 --- a/vortex-array/src/compute/list_contains.rs +++ b/vortex-array/src/compute/list_contains.rs @@ -3,8 +3,8 @@ use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::builtins::ArrayBuiltins; /// Compute a `Bool`-typed array the same length as `array` where elements is `true` if the list diff --git a/vortex-array/src/compute/mask.rs b/vortex-array/src/compute/mask.rs index 4fa615d1b69..5ff3278bed3 100644 --- a/vortex-array/src/compute/mask.rs +++ b/vortex-array/src/compute/mask.rs @@ -6,8 +6,8 @@ use std::ops::Not; use vortex_error::VortexResult; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::ConstantArray; use crate::builtins::ArrayBuiltins; diff --git a/vortex-array/src/compute/min_max.rs b/vortex-array/src/compute/min_max.rs index 0c8b51bf866..d789834707c 100644 --- a/vortex-array/src/compute/min_max.rs +++ b/vortex-array/src/compute/min_max.rs @@ -8,8 +8,8 @@ use vortex_error::VortexExpect; use vortex_error::VortexResult; use vortex_error::vortex_bail; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray as _; use crate::arrays::ConstantVTable; use crate::compute::ComputeFn; diff --git a/vortex-array/src/compute/mod.rs b/vortex-array/src/compute/mod.rs index 03632041519..a1c81d20fce 100644 --- a/vortex-array/src/compute/mod.rs +++ b/vortex-array/src/compute/mod.rs @@ -41,8 +41,8 @@ use vortex_error::vortex_err; use vortex_mask::Mask; pub use zip::*; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::builders::ArrayBuilder; use crate::dtype::DType; use crate::scalar::Scalar; @@ -216,7 +216,7 @@ pub struct InvocationArgs<'a> { /// For unary compute functions, it's useful to just have this short-cut. pub struct UnaryArgs<'a, O: Options> { - pub array: &'a dyn Array, + pub array: &'a dyn DynArray, pub options: &'a O, } @@ -240,8 +240,8 @@ impl<'a, O: Options> TryFrom<&InvocationArgs<'a>> for UnaryArgs<'a, O> { /// For binary compute functions, it's useful to just have this short-cut. pub struct BinaryArgs<'a, O: Options> { - pub lhs: &'a dyn Array, - pub rhs: &'a dyn Array, + pub lhs: &'a dyn DynArray, + pub rhs: &'a dyn DynArray, pub options: &'a O, } @@ -269,7 +269,7 @@ impl<'a, O: Options> TryFrom<&InvocationArgs<'a>> for BinaryArgs<'a, O> { /// Input to a compute function. pub enum Input<'a> { Scalar(&'a Scalar), - Array(&'a dyn Array), + Array(&'a dyn DynArray), Mask(&'a Mask), Builder(&'a mut dyn ArrayBuilder), DType(&'a DType), @@ -289,8 +289,8 @@ impl Debug for Input<'_> { } } -impl<'a> From<&'a dyn Array> for Input<'a> { - fn from(value: &'a dyn Array) -> Self { +impl<'a> From<&'a dyn DynArray> for Input<'a> { + fn from(value: &'a dyn DynArray) -> Self { Input::Array(value) } } @@ -328,7 +328,7 @@ impl<'a> Input<'a> { } } - pub fn array(&self) -> Option<&'a dyn Array> { + pub fn array(&self) -> Option<&'a dyn DynArray> { if let Input::Array(array) = self { Some(*array) } else { diff --git a/vortex-array/src/compute/nan_count.rs b/vortex-array/src/compute/nan_count.rs index cdae9393218..20d430a4b9d 100644 --- a/vortex-array/src/compute/nan_count.rs +++ b/vortex-array/src/compute/nan_count.rs @@ -9,8 +9,8 @@ use vortex_error::VortexResult; use vortex_error::vortex_bail; use vortex_error::vortex_err; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray as _; use crate::compute::ComputeFn; use crate::compute::ComputeFnVTable; diff --git a/vortex-array/src/compute/sum.rs b/vortex-array/src/compute/sum.rs index dce0958ac0d..b74b336d4de 100644 --- a/vortex-array/src/compute/sum.rs +++ b/vortex-array/src/compute/sum.rs @@ -13,8 +13,8 @@ use vortex_error::vortex_ensure; use vortex_error::vortex_err; use vortex_error::vortex_panic; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray as _; use crate::compute::ComputeFn; use crate::compute::ComputeFnVTable; @@ -71,7 +71,7 @@ pub fn sum(array: &ArrayRef) -> VortexResult { /// For unary compute functions, it's useful to just have this short-cut. pub struct SumArgs<'a> { - pub array: &'a dyn Array, + pub array: &'a dyn DynArray, pub accumulator: &'a Scalar, } diff --git a/vortex-array/src/compute/zip.rs b/vortex-array/src/compute/zip.rs index 49b84d99ec5..63d1b6a34ae 100644 --- a/vortex-array/src/compute/zip.rs +++ b/vortex-array/src/compute/zip.rs @@ -4,8 +4,8 @@ use vortex_error::VortexResult; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::builtins::ArrayBuiltins; diff --git a/vortex-array/src/display/mod.rs b/vortex-array/src/display/mod.rs index bb8ca816393..f47b3926585 100644 --- a/vortex-array/src/display/mod.rs +++ b/vortex-array/src/display/mod.rs @@ -8,7 +8,7 @@ use std::fmt::Display; use itertools::Itertools as _; use tree::TreeDisplayWrapper; -use crate::Array; +use crate::DynArray; /// Describe how to convert an array to a string. /// @@ -304,7 +304,7 @@ impl Default for DisplayOptions { /// See also: /// [Array::display_as](../trait.Array.html#method.display_as) /// and [DisplayOptions]. -pub struct DisplayArrayAs<'a>(pub &'a dyn Array, pub DisplayOptions); +pub struct DisplayArrayAs<'a>(pub &'a dyn DynArray, pub DisplayOptions); impl Display for DisplayArrayAs<'_> { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { @@ -324,13 +324,13 @@ impl Display for DisplayArrayAs<'_> { /// "vortex.primitive(i16, len=5)", /// ); /// ``` -impl Display for dyn Array + '_ { +impl Display for dyn DynArray + '_ { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { self.fmt_as(f, &DisplayOptions::MetadataOnly) } } -impl dyn Array + '_ { +impl dyn DynArray + '_ { /// Display logical values of the array /// /// For example, an `i16` typed array containing the first five non-negative integers is displayed diff --git a/vortex-array/src/display/tree.rs b/vortex-array/src/display/tree.rs index 3f9426a9fea..b2fd2c569da 100644 --- a/vortex-array/src/display/tree.rs +++ b/vortex-array/src/display/tree.rs @@ -8,16 +8,16 @@ use humansize::DECIMAL; use humansize::format_size; use vortex_error::VortexExpect as _; -use crate::Array; use crate::ArrayRef; use crate::ArrayVisitor; +use crate::DynArray; use crate::arrays::ChunkedVTable; use crate::display::DisplayOptions; use crate::expr::stats::Stat; use crate::expr::stats::StatsProvider; /// Display wrapper for array statistics in compact format. -struct StatsDisplay<'a>(&'a dyn Array); +struct StatsDisplay<'a>(&'a dyn DynArray); impl fmt::Display for StatsDisplay<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { diff --git a/vortex-array/src/executor.rs b/vortex-array/src/executor.rs index 58e128d253f..bcb2fc550c7 100644 --- a/vortex-array/src/executor.rs +++ b/vortex-array/src/executor.rs @@ -11,9 +11,9 @@ use vortex_error::VortexResult; use vortex_session::VortexSession; use crate::AnyCanonical; -use crate::Array; use crate::ArrayRef; use crate::Canonical; +use crate::DynArray; use crate::IntoArray; /// Marker trait for types that an [`ArrayRef`] can be executed into. @@ -27,7 +27,7 @@ pub trait Executable: Sized { fn execute(array: ArrayRef, ctx: &mut ExecutionCtx) -> VortexResult; } -impl dyn Array + '_ { +impl dyn DynArray + '_ { /// Execute this array to produce an instance of `E`. /// /// See the [`Executable`] implementation for details on how this execution is performed. diff --git a/vortex-array/src/expr/exprs.rs b/vortex-array/src/expr/exprs.rs index d439e75b704..01a94d8fe2a 100644 --- a/vortex-array/src/expr/exprs.rs +++ b/vortex-array/src/expr/exprs.rs @@ -117,7 +117,7 @@ pub fn get_item(field: impl Into, child: Expression) -> Expression { /// /// ``` /// # use vortex_array::arrays::{BoolArray, PrimitiveArray}; -/// # use vortex_array::{Array, IntoArray, ToCanonical}; +/// # use vortex_array::{DynArray, IntoArray, ToCanonical}; /// # use vortex_array::validity::Validity; /// # use vortex_buffer::buffer; /// # use vortex_array::expr::{eq, root, lit}; @@ -141,7 +141,7 @@ pub fn eq(lhs: Expression, rhs: Expression) -> Expression { /// /// ``` /// # use vortex_array::arrays::{BoolArray, PrimitiveArray}; -/// # use vortex_array::{Array, IntoArray, ToCanonical}; +/// # use vortex_array::{DynArray, IntoArray, ToCanonical}; /// # use vortex_array::validity::Validity; /// # use vortex_buffer::buffer; /// # use vortex_array::expr::{root, lit, not_eq}; @@ -165,7 +165,7 @@ pub fn not_eq(lhs: Expression, rhs: Expression) -> Expression { /// /// ``` /// # use vortex_array::arrays::{BoolArray, PrimitiveArray }; -/// # use vortex_array::{Array, IntoArray, ToCanonical}; +/// # use vortex_array::{DynArray, IntoArray, ToCanonical}; /// # use vortex_array::validity::Validity; /// # use vortex_buffer::buffer; /// # use vortex_array::expr::{gt_eq, root, lit}; @@ -189,7 +189,7 @@ pub fn gt_eq(lhs: Expression, rhs: Expression) -> Expression { /// /// ``` /// # use vortex_array::arrays::{BoolArray, PrimitiveArray }; -/// # use vortex_array::{Array, IntoArray, ToCanonical}; +/// # use vortex_array::{DynArray, IntoArray, ToCanonical}; /// # use vortex_array::validity::Validity; /// # use vortex_buffer::buffer; /// # use vortex_array::expr::{gt, root, lit}; @@ -213,7 +213,7 @@ pub fn gt(lhs: Expression, rhs: Expression) -> Expression { /// /// ``` /// # use vortex_array::arrays::{BoolArray, PrimitiveArray }; -/// # use vortex_array::{Array, IntoArray, ToCanonical}; +/// # use vortex_array::{DynArray, IntoArray, ToCanonical}; /// # use vortex_array::validity::Validity; /// # use vortex_buffer::buffer; /// # use vortex_array::expr::{root, lit, lt_eq}; @@ -237,7 +237,7 @@ pub fn lt_eq(lhs: Expression, rhs: Expression) -> Expression { /// /// ``` /// # use vortex_array::arrays::{BoolArray, PrimitiveArray }; -/// # use vortex_array::{Array, IntoArray, ToCanonical}; +/// # use vortex_array::{DynArray, IntoArray, ToCanonical}; /// # use vortex_array::validity::Validity; /// # use vortex_buffer::buffer; /// # use vortex_array::expr::{root, lit, lt}; @@ -261,7 +261,7 @@ pub fn lt(lhs: Expression, rhs: Expression) -> Expression { /// /// ``` /// # use vortex_array::arrays::BoolArray; -/// # use vortex_array::{Array, IntoArray, ToCanonical}; +/// # use vortex_array::{DynArray, IntoArray, ToCanonical}; /// # use vortex_array::expr::{root, lit, or}; /// let xs = BoolArray::from_iter(vec![true, false, true]); /// let result = xs.to_array().apply(&or(root(), lit(false))).unwrap(); @@ -296,7 +296,7 @@ where /// /// ``` /// # use vortex_array::arrays::BoolArray; -/// # use vortex_array::{Array, IntoArray, ToCanonical}; +/// # use vortex_array::{DynArray, IntoArray, ToCanonical}; /// # use vortex_array::expr::{and, root, lit}; /// let xs = BoolArray::from_iter(vec![true, false, true]); /// let result = xs.to_array().apply(&and(root(), lit(true))).unwrap(); @@ -330,7 +330,7 @@ where /// ## Example usage /// /// ``` -/// # use vortex_array::{Array, IntoArray}; +/// # use vortex_array::{DynArray, IntoArray}; /// # use vortex_array::arrow::IntoArrowArray as _; /// # use vortex_buffer::buffer; /// # use vortex_array::expr::{checked_add, lit, root}; diff --git a/vortex-array/src/expression.rs b/vortex-array/src/expression.rs index 93e15b5d9e2..3044b957048 100644 --- a/vortex-array/src/expression.rs +++ b/vortex-array/src/expression.rs @@ -4,8 +4,8 @@ use itertools::Itertools; use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::ConstantArray; use crate::arrays::ScalarFnArray; @@ -14,7 +14,7 @@ use crate::optimizer::ArrayOptimizer; use crate::scalar_fn::fns::literal::Literal; use crate::scalar_fn::fns::root::Root; -impl dyn Array + '_ { +impl dyn DynArray + '_ { /// Apply the expression to this array, producing a new array in constant time. pub fn apply(&self, expr: &Expression) -> VortexResult { // If the expression is a root, return self. diff --git a/vortex-array/src/hash.rs b/vortex-array/src/hash.rs index 5733bdcc54e..3c4aaa87e3d 100644 --- a/vortex-array/src/hash.rs +++ b/vortex-array/src/hash.rs @@ -9,8 +9,8 @@ use vortex_buffer::BitBuffer; use vortex_buffer::Buffer; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::patches::Patches; use crate::validity::Validity; @@ -86,15 +86,15 @@ mod private { impl SealedEq for T {} } -impl ArrayHash for dyn Array + '_ { +impl ArrayHash for dyn DynArray + '_ { fn array_hash(&self, state: &mut H, precision: Precision) { self.dyn_array_hash(state, precision); } } -impl ArrayEq for dyn Array + '_ { +impl ArrayEq for dyn DynArray + '_ { fn array_eq(&self, other: &Self, precision: Precision) -> bool { - self.dyn_array_eq(Array::as_any(other), precision) + self.dyn_array_eq(DynArray::as_any(other), precision) } } diff --git a/vortex-array/src/iter.rs b/vortex-array/src/iter.rs index 9bbcc1a4e3c..5bd9560c36c 100644 --- a/vortex-array/src/iter.rs +++ b/vortex-array/src/iter.rs @@ -8,8 +8,8 @@ use std::sync::Arc; use itertools::Itertools; use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::IntoArray; use crate::arrays::ChunkedArray; use crate::arrays::ChunkedVTable; @@ -92,7 +92,7 @@ pub trait ArrayIteratorExt: ArrayIterator { impl ArrayIteratorExt for I {} -impl dyn Array + '_ { +impl dyn DynArray + '_ { /// Create an [`ArrayIterator`] over the array. pub fn to_array_iterator(&self) -> impl ArrayIterator + 'static { let dtype = self.dtype().clone(); diff --git a/vortex-array/src/mask.rs b/vortex-array/src/mask.rs index e8256a13f80..ec3b73c9545 100644 --- a/vortex-array/src/mask.rs +++ b/vortex-array/src/mask.rs @@ -7,8 +7,8 @@ use vortex_error::VortexResult; use vortex_error::vortex_bail; use vortex_mask::Mask; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::Executable; use crate::ExecutionCtx; use crate::IntoArray; diff --git a/vortex-array/src/matcher.rs b/vortex-array/src/matcher.rs index b00afe00fb2..46c9d79198c 100644 --- a/vortex-array/src/matcher.rs +++ b/vortex-array/src/matcher.rs @@ -1,19 +1,19 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use crate::Array; +use crate::DynArray; /// Trait for matching array types. pub trait Matcher { type Match<'a>; /// Check if the given array matches this matcher type - fn matches(array: &dyn Array) -> bool { + fn matches(array: &dyn DynArray) -> bool { Self::try_match(array).is_some() } /// Try to match the given array, returning the matched view type if successful. - fn try_match<'a>(array: &'a dyn Array) -> Option>; + fn try_match<'a>(array: &'a dyn DynArray) -> Option>; } /// Matches any array type (wildcard matcher) @@ -21,15 +21,15 @@ pub trait Matcher { pub struct AnyArray; impl Matcher for AnyArray { - type Match<'a> = &'a dyn Array; + type Match<'a> = &'a dyn DynArray; #[inline(always)] - fn matches(_array: &dyn Array) -> bool { + fn matches(_array: &dyn DynArray) -> bool { true } #[inline(always)] - fn try_match(array: &dyn Array) -> Option> { + fn try_match(array: &dyn DynArray) -> Option> { Some(array) } } diff --git a/vortex-array/src/normalize.rs b/vortex-array/src/normalize.rs index c69919e9342..fdd0203d8d0 100644 --- a/vortex-array/src/normalize.rs +++ b/vortex-array/src/normalize.rs @@ -6,9 +6,9 @@ use vortex_error::VortexResult; use vortex_error::vortex_bail; use vortex_session::registry::Id; -use crate::Array; use crate::ArrayRef; use crate::ArrayVisitor; +use crate::DynArray; use crate::session::ArrayRegistry; /// Options for normalizing an array. @@ -26,7 +26,7 @@ pub enum Operation { // TODO(joe): add into canonical variant } -impl dyn Array + '_ { +impl dyn DynArray + '_ { /// Normalize the array according to given options. /// /// This operation performs a recursive traversal of the array. Any non-allowed encoding is diff --git a/vortex-array/src/optimizer/mod.rs b/vortex-array/src/optimizer/mod.rs index 71d5f1f0df2..774523a6ca7 100644 --- a/vortex-array/src/optimizer/mod.rs +++ b/vortex-array/src/optimizer/mod.rs @@ -4,7 +4,7 @@ use vortex_error::VortexResult; use vortex_error::vortex_bail; -use crate::Array; +use crate::DynArray; use crate::array::ArrayRef; pub mod rules; diff --git a/vortex-array/src/patches.rs b/vortex-array/src/patches.rs index 7c0b9a91795..cee0bad5b3b 100644 --- a/vortex-array/src/patches.rs +++ b/vortex-array/src/patches.rs @@ -21,9 +21,9 @@ use vortex_mask::Mask; use vortex_mask::MaskMut; use vortex_utils::aliases::hash_map::HashMap; -use crate::Array; use crate::ArrayRef; use crate::ArrayVisitor; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::ToCanonical; diff --git a/vortex-array/src/scalar_fn/fns/between/mod.rs b/vortex-array/src/scalar_fn/fns/between/mod.rs index f188d49d0de..40157841531 100644 --- a/vortex-array/src/scalar_fn/fns/between/mod.rs +++ b/vortex-array/src/scalar_fn/fns/between/mod.rs @@ -14,9 +14,9 @@ use vortex_error::vortex_bail; use vortex_proto::expr as pb; use vortex_session::VortexSession; -use crate::Array; use crate::ArrayRef; use crate::Canonical; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::arrays::ConstantArray; diff --git a/vortex-array/src/scalar_fn/fns/binary/boolean.rs b/vortex-array/src/scalar_fn/fns/binary/boolean.rs index 01ff50073ef..53df349d22d 100644 --- a/vortex-array/src/scalar_fn/fns/binary/boolean.rs +++ b/vortex-array/src/scalar_fn/fns/binary/boolean.rs @@ -6,8 +6,8 @@ use arrow_schema::DataType; use vortex_error::VortexResult; use vortex_error::vortex_err; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::arrays::ConstantArray; use crate::arrays::ConstantVTable; use crate::arrow::FromArrowArray; diff --git a/vortex-array/src/scalar_fn/fns/binary/numeric.rs b/vortex-array/src/scalar_fn/fns/binary/numeric.rs index deac10de6e0..05f0f88c756 100644 --- a/vortex-array/src/scalar_fn/fns/binary/numeric.rs +++ b/vortex-array/src/scalar_fn/fns/binary/numeric.rs @@ -78,8 +78,8 @@ mod test { use vortex_buffer::buffer; use vortex_error::VortexResult; - use crate::Array; use crate::ArrayRef; + use crate::DynArray; use crate::IntoArray; use crate::LEGACY_SESSION; use crate::RecursiveCanonical; diff --git a/vortex-array/src/scalar_fn/fns/dynamic.rs b/vortex-array/src/scalar_fn/fns/dynamic.rs index f05c691e442..c3e83f98d96 100644 --- a/vortex-array/src/scalar_fn/fns/dynamic.rs +++ b/vortex-array/src/scalar_fn/fns/dynamic.rs @@ -13,8 +13,8 @@ use vortex_error::VortexExpect; use vortex_error::VortexResult; use vortex_error::vortex_bail; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::arrays::ConstantArray; diff --git a/vortex-array/src/scalar_fn/fns/get_item.rs b/vortex-array/src/scalar_fn/fns/get_item.rs index 226201dbe77..4e310dfce25 100644 --- a/vortex-array/src/scalar_fn/fns/get_item.rs +++ b/vortex-array/src/scalar_fn/fns/get_item.rs @@ -218,7 +218,7 @@ impl ScalarFnVTable for GetItem { mod tests { use vortex_buffer::buffer; - use crate::Array; + use crate::DynArray; use crate::IntoArray; use crate::arrays::StructArray; use crate::dtype::DType; diff --git a/vortex-array/src/scalar_fn/fns/like/mod.rs b/vortex-array/src/scalar_fn/fns/like/mod.rs index eb8c69a4d00..4be6941d5d9 100644 --- a/vortex-array/src/scalar_fn/fns/like/mod.rs +++ b/vortex-array/src/scalar_fn/fns/like/mod.rs @@ -13,8 +13,8 @@ use vortex_error::vortex_bail; use vortex_proto::expr as pb; use vortex_session::VortexSession; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ExecutionCtx; use crate::arrow::Datum; use crate::arrow::from_arrow_array_with_len; diff --git a/vortex-array/src/scalar_fn/fns/list_contains/mod.rs b/vortex-array/src/scalar_fn/fns/list_contains/mod.rs index 5481c285973..973cfb3bb05 100644 --- a/vortex-array/src/scalar_fn/fns/list_contains/mod.rs +++ b/vortex-array/src/scalar_fn/fns/list_contains/mod.rs @@ -17,8 +17,8 @@ use vortex_error::vortex_err; use vortex_session::VortexSession; use vortex_utils::iter::ReduceBalancedIterExt; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::ToCanonical; @@ -441,8 +441,8 @@ mod tests { use vortex_utils::aliases::hash_map::HashMap; use vortex_utils::aliases::hash_set::HashSet; - use crate::Array; use crate::ArrayRef; + use crate::DynArray; use crate::IntoArray; use crate::arrays::BoolArray; use crate::arrays::ConstantArray; diff --git a/vortex-array/src/scalar_fn/fns/merge.rs b/vortex-array/src/scalar_fn/fns/merge.rs index c8b806561cb..11eecbdc100 100644 --- a/vortex-array/src/scalar_fn/fns/merge.rs +++ b/vortex-array/src/scalar_fn/fns/merge.rs @@ -288,8 +288,8 @@ mod tests { use vortex_error::VortexResult; use vortex_error::vortex_bail; - use crate::Array; use crate::ArrayRef; + use crate::DynArray; use crate::IntoArray; use crate::ToCanonical; use crate::arrays::PrimitiveArray; diff --git a/vortex-array/src/scalar_fn/fns/not/mod.rs b/vortex-array/src/scalar_fn/fns/not/mod.rs index 782891c876e..8b3e9a65c2e 100644 --- a/vortex-array/src/scalar_fn/fns/not/mod.rs +++ b/vortex-array/src/scalar_fn/fns/not/mod.rs @@ -10,8 +10,8 @@ use vortex_error::VortexResult; use vortex_error::vortex_bail; use vortex_session::VortexSession; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::arrays::BoolArray; diff --git a/vortex-array/src/scalar_fn/fns/pack.rs b/vortex-array/src/scalar_fn/fns/pack.rs index 3c590f22e34..3b24340e66c 100644 --- a/vortex-array/src/scalar_fn/fns/pack.rs +++ b/vortex-array/src/scalar_fn/fns/pack.rs @@ -165,8 +165,8 @@ mod tests { use super::Pack; use super::PackOptions; - use crate::Array; use crate::ArrayRef; + use crate::DynArray; use crate::IntoArray; use crate::ToCanonical; use crate::arrays::PrimitiveArray; diff --git a/vortex-array/src/scalar_fn/fns/zip/mod.rs b/vortex-array/src/scalar_fn/fns/zip/mod.rs index fc4675e2305..e458c9b721e 100644 --- a/vortex-array/src/scalar_fn/fns/zip/mod.rs +++ b/vortex-array/src/scalar_fn/fns/zip/mod.rs @@ -12,8 +12,8 @@ use vortex_mask::AllOr; use vortex_mask::Mask; use vortex_session::VortexSession; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::builders::ArrayBuilder; @@ -225,7 +225,7 @@ mod tests { use vortex_buffer::buffer; use vortex_mask::Mask; - use crate::Array; + use crate::DynArray; use crate::IntoArray; use crate::arrays::ConstantArray; use crate::arrays::PrimitiveArray; diff --git a/vortex-array/src/search_sorted.rs b/vortex-array/src/search_sorted.rs index 15f3c2843bb..f45df061aca 100644 --- a/vortex-array/src/search_sorted.rs +++ b/vortex-array/src/search_sorted.rs @@ -12,7 +12,7 @@ use std::hint; use vortex_error::VortexResult; -use crate::Array; +use crate::DynArray; use crate::scalar::Scalar; #[derive(Debug, Copy, Clone, Eq, PartialEq)] @@ -262,7 +262,7 @@ fn search_sorted_side_idx VortexResult>( } } -impl IndexOrd for dyn Array + '_ { +impl IndexOrd for dyn DynArray + '_ { fn index_cmp(&self, idx: usize, elem: &Scalar) -> VortexResult> { let scalar_a = self.scalar_at(idx)?; Ok(scalar_a.partial_cmp(elem)) diff --git a/vortex-array/src/serde.rs b/vortex-array/src/serde.rs index d360a7bc35c..5e46c7a6cbb 100644 --- a/vortex-array/src/serde.rs +++ b/vortex-array/src/serde.rs @@ -26,11 +26,11 @@ use vortex_flatbuffers::array::Compression; use vortex_session::VortexSession; use vortex_utils::aliases::hash_map::HashMap; -use crate::Array; use crate::ArrayContext; use crate::ArrayRef; use crate::ArrayVisitor; use crate::ArrayVisitorExt; +use crate::DynArray; use crate::buffer::BufferHandle; use crate::dtype::DType; use crate::dtype::TryFromBytes; @@ -47,7 +47,7 @@ pub struct SerializeOptions { pub include_padding: bool, } -impl dyn Array + '_ { +impl dyn DynArray + '_ { /// Serialize the array into a sequence of byte buffers that should be written contiguously. /// This function returns a vec to avoid copying data buffers. /// @@ -159,12 +159,12 @@ impl dyn Array + '_ { /// A utility struct for creating an [`fba::ArrayNode`] flatbuffer. pub struct ArrayNodeFlatBuffer<'a> { ctx: &'a ArrayContext, - array: &'a dyn Array, + array: &'a dyn DynArray, buffer_idx: u16, } impl<'a> ArrayNodeFlatBuffer<'a> { - pub fn try_new(ctx: &'a ArrayContext, array: &'a dyn Array) -> VortexResult { + pub fn try_new(ctx: &'a ArrayContext, array: &'a dyn DynArray) -> VortexResult { // Depth-first traversal of the array to ensure it supports serialization. for child in array.depth_first_traversal() { if child.metadata()?.is_none() { @@ -283,7 +283,7 @@ impl ArrayChildren for &[ArrayRef] { } } -/// [`ArrayParts`] represents a parsed but not-yet-decoded deserialized [`Array`]. +/// [`ArrayParts`] represents a parsed but not-yet-decoded deserialized [`DynArray`]. /// It contains all the information from the serialized form, without anything extra. i.e. /// it is missing a [`DType`] and `len`, and the `encoding_id` is not yet resolved to a concrete /// vtable. diff --git a/vortex-array/src/stats/array.rs b/vortex-array/src/stats/array.rs index 8026ff49d94..8220a5a2deb 100644 --- a/vortex-array/src/stats/array.rs +++ b/vortex-array/src/stats/array.rs @@ -14,7 +14,7 @@ use super::MutTypedStatsSetRef; use super::StatsSet; use super::StatsSetIntoIter; use super::TypedStatsSetRef; -use crate::Array; +use crate::DynArray; use crate::builders::builder_with_capacity; use crate::compute::MinMaxResult; use crate::compute::is_constant; @@ -41,12 +41,12 @@ pub struct ArrayStats { /// Constructed by calling [`ArrayStats::to_ref`]. pub struct StatsSetRef<'a> { // We need to reference back to the array - dyn_array_ref: &'a dyn Array, + dyn_array_ref: &'a dyn DynArray, array_stats: &'a ArrayStats, } impl ArrayStats { - pub fn to_ref<'a>(&'a self, array: &'a dyn Array) -> StatsSetRef<'a> { + pub fn to_ref<'a>(&'a self, array: &'a dyn DynArray) -> StatsSetRef<'a> { StatsSetRef { dyn_array_ref: array, array_stats: self, diff --git a/vortex-array/src/stream/mod.rs b/vortex-array/src/stream/mod.rs index 92f7affa5ab..f2346cffcc3 100644 --- a/vortex-array/src/stream/mod.rs +++ b/vortex-array/src/stream/mod.rs @@ -9,8 +9,8 @@ use futures::Stream; use futures::stream; use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::dtype::DType; mod adapter; @@ -32,7 +32,7 @@ impl ArrayStream for SendableArrayStream { } } -impl dyn Array + '_ { +impl dyn DynArray + '_ { /// Create an [`ArrayStream`] over the array. pub fn to_array_stream(&self) -> impl ArrayStream + 'static { ArrayStreamAdapter::new(self.dtype().clone(), stream::iter(self.to_array_iterator())) diff --git a/vortex-array/src/validity.rs b/vortex-array/src/validity.rs index 67d8152dc7f..b77671e78d7 100644 --- a/vortex-array/src/validity.rs +++ b/vortex-array/src/validity.rs @@ -16,9 +16,9 @@ use vortex_mask::AllOr; use vortex_mask::Mask; use vortex_mask::MaskValues; -use crate::Array; use crate::ArrayRef; use crate::Canonical; +use crate::DynArray; use crate::ExecutionCtx; use crate::IntoArray; use crate::ToCanonical; diff --git a/vortex-array/src/variants.rs b/vortex-array/src/variants.rs index 62accf8717c..0f6708f4634 100644 --- a/vortex-array/src/variants.rs +++ b/vortex-array/src/variants.rs @@ -8,7 +8,7 @@ use vortex_error::VortexExpect; use vortex_error::VortexResult; use vortex_error::vortex_panic; -use crate::Array; +use crate::DynArray; use crate::compute::sum; use crate::dtype::DType; use crate::dtype::FieldNames; @@ -17,7 +17,7 @@ use crate::dtype::extension::ExtDTypeRef; use crate::scalar::PValue; use crate::search_sorted::IndexOrd; -impl dyn Array + '_ { +impl dyn DynArray + '_ { /// Downcasts the array for null-specific behavior. pub fn as_null_typed(&self) -> NullTyped<'_> { matches!(self.dtype(), DType::Null) @@ -83,9 +83,9 @@ impl dyn Array + '_ { } #[expect(dead_code)] -pub struct NullTyped<'a>(&'a dyn Array); +pub struct NullTyped<'a>(&'a dyn DynArray); -pub struct BoolTyped<'a>(&'a dyn Array); +pub struct BoolTyped<'a>(&'a dyn DynArray); impl BoolTyped<'_> { pub fn true_count(&self) -> VortexResult { @@ -97,7 +97,7 @@ impl BoolTyped<'_> { } } -pub struct PrimitiveTyped<'a>(&'a dyn Array); +pub struct PrimitiveTyped<'a>(&'a dyn DynArray); impl PrimitiveTyped<'_> { pub fn ptype(&self) -> PType { @@ -151,15 +151,15 @@ impl IndexOrd for PrimitiveTyped<'_> { } #[expect(dead_code)] -pub struct Utf8Typed<'a>(&'a dyn Array); +pub struct Utf8Typed<'a>(&'a dyn DynArray); #[expect(dead_code)] -pub struct BinaryTyped<'a>(&'a dyn Array); +pub struct BinaryTyped<'a>(&'a dyn DynArray); #[expect(dead_code)] -pub struct DecimalTyped<'a>(&'a dyn Array); +pub struct DecimalTyped<'a>(&'a dyn DynArray); -pub struct StructTyped<'a>(&'a dyn Array); +pub struct StructTyped<'a>(&'a dyn DynArray); impl StructTyped<'_> { pub fn names(&self) -> &FieldNames { @@ -182,9 +182,9 @@ impl StructTyped<'_> { } #[expect(dead_code)] -pub struct ListTyped<'a>(&'a dyn Array); +pub struct ListTyped<'a>(&'a dyn DynArray); -pub struct ExtensionTyped<'a>(&'a dyn Array); +pub struct ExtensionTyped<'a>(&'a dyn DynArray); impl ExtensionTyped<'_> { /// Returns the extension logical [`DType`]. diff --git a/vortex-array/src/vtable/dyn_.rs b/vortex-array/src/vtable/dyn_.rs index 242bce3d532..0f467694ef1 100644 --- a/vortex-array/src/vtable/dyn_.rs +++ b/vortex-array/src/vtable/dyn_.rs @@ -13,9 +13,9 @@ use vortex_error::VortexResult; use vortex_error::vortex_ensure; use vortex_session::VortexSession; -use crate::Array; use crate::ArrayAdapter; use crate::ArrayRef; +use crate::DynArray; use crate::buffer::BufferHandle; use crate::dtype::DType; use crate::executor::ExecutionCtx; @@ -32,7 +32,7 @@ pub type ArrayId = ArcRef; /// this object-safe form. /// /// This trait contains the implementation API for Vortex arrays, allowing us to keep the public -/// [`Array`] trait API to a minimum. +/// [`DynArray`] trait API to a minimum. pub trait DynVTable: 'static + private::Sealed + Send + Sync + Debug { #[allow(clippy::too_many_arguments)] fn build( diff --git a/vortex-array/src/vtable/mod.rs b/vortex-array/src/vtable/mod.rs index 08d6868bb4e..236c64c9995 100644 --- a/vortex-array/src/vtable/mod.rs +++ b/vortex-array/src/vtable/mod.rs @@ -19,9 +19,9 @@ use vortex_error::VortexResult; use vortex_error::vortex_panic; use vortex_session::VortexSession; -use crate::Array; use crate::ArrayRef; use crate::Canonical; +use crate::DynArray; use crate::IntoArray; use crate::Precision; use crate::arrays::ConstantArray; @@ -39,16 +39,16 @@ use crate::validity::Validity; /// The logic is split across several "VTable" traits to enable easier code organization than /// simply lumping everything into a single trait. /// -/// From this [`VTable`] trait, we derive implementations for the sealed [`Array`] and [`DynVTable`] +/// From this [`VTable`] trait, we derive implementations for the sealed [`DynArray`] and [`DynVTable`] /// traits. /// /// The functions defined in these vtable traits will typically document their pre- and -/// post-conditions. The pre-conditions are validated inside the [`Array`] and [`DynVTable`] +/// post-conditions. The pre-conditions are validated inside the [`DynArray`] and [`DynVTable`] /// implementations so do not need to be checked in the vtable implementations (for example, index /// out of bounds). Post-conditions are validated after invocation of the vtable function and will /// panic if violated. pub trait VTable: 'static + Sized + Send + Sync + Debug { - type Array: 'static + Send + Sync + Clone + Debug + Deref + IntoArray; + type Array: 'static + Send + Sync + Clone + Debug + Deref + IntoArray; type Metadata: Debug; type OperationsVTable: OperationsVTable; @@ -310,15 +310,15 @@ pub fn patches_child_name(idx: usize) -> &'static str { macro_rules! vtable { ($V:ident) => { $crate::aliases::paste::paste! { - impl AsRef for [<$V Array>] { - fn as_ref(&self) -> &dyn $crate::Array { + impl AsRef for [<$V Array>] { + fn as_ref(&self) -> &dyn $crate::DynArray { // We can unsafe cast ourselves to an ArrayAdapter. unsafe { &*(self as *const [<$V Array>] as *const $crate::ArrayAdapter<[<$V VTable>]>) } } } impl std::ops::Deref for [<$V Array>] { - type Target = dyn $crate::Array; + type Target = dyn $crate::DynArray; fn deref(&self) -> &Self::Target { // We can unsafe cast ourselves to an ArrayAdapter. diff --git a/vortex-array/src/vtable/validity.rs b/vortex-array/src/vtable/validity.rs index 6281445293b..ed2929e958e 100644 --- a/vortex-array/src/vtable/validity.rs +++ b/vortex-array/src/vtable/validity.rs @@ -3,8 +3,8 @@ use vortex_error::VortexResult; -use crate::Array; use crate::ArrayRef; +use crate::DynArray; use crate::validity::Validity; use crate::vtable::VTable; diff --git a/vortex-bench/src/datasets/tpch_l_comment.rs b/vortex-bench/src/datasets/tpch_l_comment.rs index dfe46673cde..44411c7e7f8 100644 --- a/vortex-bench/src/datasets/tpch_l_comment.rs +++ b/vortex-bench/src/datasets/tpch_l_comment.rs @@ -7,8 +7,8 @@ use anyhow::Result; use async_trait::async_trait; use futures::TryStreamExt; use glob::glob; -use vortex::array::Array; use vortex::array::ArrayRef; +use vortex::array::DynArray; use vortex::array::IntoArray; use vortex::array::ToCanonical; use vortex::array::arrays::ChunkedArray; diff --git a/vortex-bench/src/random_access/take.rs b/vortex-bench/src/random_access/take.rs index df48cd075c0..674aa6349aa 100644 --- a/vortex-bench/src/random_access/take.rs +++ b/vortex-bench/src/random_access/take.rs @@ -16,8 +16,8 @@ use parquet::arrow::arrow_reader::ArrowReaderMetadata; use parquet::arrow::arrow_reader::ArrowReaderOptions; use stream::StreamExt; use tokio::fs::File; -use vortex::array::Array; use vortex::array::Canonical; +use vortex::array::DynArray; use vortex::array::IntoArray; use vortex::array::VortexSessionExecute; use vortex::array::stream::ArrayStreamExt; diff --git a/vortex-btrblocks/src/canonical_compressor.rs b/vortex-btrblocks/src/canonical_compressor.rs index 1af8d637b22..984078b4b80 100644 --- a/vortex-btrblocks/src/canonical_compressor.rs +++ b/vortex-btrblocks/src/canonical_compressor.rs @@ -3,9 +3,9 @@ //! Canonical array compression implementation. -use vortex_array::Array; use vortex_array::ArrayRef; use vortex_array::Canonical; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::ToCanonical; use vortex_array::arrays::ConstantArray; @@ -318,7 +318,7 @@ impl CanonicalCompressor for BtrBlocksCompressor { #[cfg(test)] mod tests { use rstest::rstest; - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::ListVTable; use vortex_array::arrays::ListViewArray; diff --git a/vortex-btrblocks/src/compressor/float/dictionary.rs b/vortex-btrblocks/src/compressor/float/dictionary.rs index 40888b045f9..33c024af4b3 100644 --- a/vortex-btrblocks/src/compressor/float/dictionary.rs +++ b/vortex-btrblocks/src/compressor/float/dictionary.rs @@ -98,7 +98,7 @@ impl_encode!(f64, u64); #[cfg(test)] mod tests { - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::BoolArray; use vortex_array::arrays::PrimitiveArray; diff --git a/vortex-btrblocks/src/compressor/float/mod.rs b/vortex-btrblocks/src/compressor/float/mod.rs index 159fbc8124f..8796a93358b 100644 --- a/vortex-btrblocks/src/compressor/float/mod.rs +++ b/vortex-btrblocks/src/compressor/float/mod.rs @@ -559,7 +559,7 @@ mod tests { use std::iter; - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::ToCanonical; use vortex_array::arrays::PrimitiveArray; diff --git a/vortex-btrblocks/src/compressor/integer/dictionary.rs b/vortex-btrblocks/src/compressor/integer/dictionary.rs index 9cf2ac7fe3a..70a29aaeedd 100644 --- a/vortex-btrblocks/src/compressor/integer/dictionary.rs +++ b/vortex-btrblocks/src/compressor/integer/dictionary.rs @@ -114,7 +114,7 @@ impl_encode!(i64); #[cfg(test)] mod tests { - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::BoolArray; use vortex_array::arrays::PrimitiveArray; diff --git a/vortex-btrblocks/src/compressor/integer/mod.rs b/vortex-btrblocks/src/compressor/integer/mod.rs index 58906b2ecf9..15f48676bcb 100644 --- a/vortex-btrblocks/src/compressor/integer/mod.rs +++ b/vortex-btrblocks/src/compressor/integer/mod.rs @@ -889,7 +889,7 @@ mod tests { use rand::RngCore; use rand::SeedableRng; use rand::rngs::StdRng; - use vortex_array::Array; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::ToCanonical; use vortex_array::arrays::DictVTable; diff --git a/vortex-btrblocks/src/compressor/patches.rs b/vortex-btrblocks/src/compressor/patches.rs index 9890ab7bd07..46cff3a16bf 100644 --- a/vortex-btrblocks/src/compressor/patches.rs +++ b/vortex-btrblocks/src/compressor/patches.rs @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use vortex_array::Array; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::ToCanonical; use vortex_array::arrays::ConstantArray; diff --git a/vortex-btrblocks/src/lib.rs b/vortex-btrblocks/src/lib.rs index 6d542352024..19130b47e32 100644 --- a/vortex-btrblocks/src/lib.rs +++ b/vortex-btrblocks/src/lib.rs @@ -22,7 +22,7 @@ //! //! ```rust //! use vortex_btrblocks::{BtrBlocksCompressor, BtrBlocksCompressorBuilder, IntCode}; -//! use vortex_array::Array; +//! use vortex_array::DynArray; //! //! // Default compressor with all schemes enabled //! let compressor = BtrBlocksCompressor::default(); diff --git a/vortex-btrblocks/src/sample.rs b/vortex-btrblocks/src/sample.rs index 4bb64350cb0..11a0e1b1512 100644 --- a/vortex-btrblocks/src/sample.rs +++ b/vortex-btrblocks/src/sample.rs @@ -4,8 +4,8 @@ use rand::Rng; use rand::SeedableRng; use rand::prelude::StdRng; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::ChunkedArray; use vortex_error::VortexExpect; diff --git a/vortex-cuda/src/arrow/mod.rs b/vortex-cuda/src/arrow/mod.rs index 1fd35298ce5..9a57c411e07 100644 --- a/vortex-cuda/src/arrow/mod.rs +++ b/vortex-cuda/src/arrow/mod.rs @@ -22,8 +22,8 @@ use cudarc::driver::CudaEvent; use cudarc::driver::CudaStream; use cudarc::driver::sys; use cudarc::runtime::sys::cudaEvent_t; -use vortex::array::Array; use vortex::array::ArrayRef; +use vortex::array::DynArray; use vortex::array::buffer::BufferHandle; use vortex::array::validity::Validity; use vortex::error::VortexResult; @@ -182,7 +182,7 @@ impl PrivateData { } #[async_trait] -pub trait DeviceArrayExt: Array { +pub trait DeviceArrayExt: DynArray { async fn export_device_array( self, ctx: &mut CudaExecutionCtx, diff --git a/vortex-cuda/src/canonical.rs b/vortex-cuda/src/canonical.rs index 3d82770b039..7f8a2ebe459 100644 --- a/vortex-cuda/src/canonical.rs +++ b/vortex-cuda/src/canonical.rs @@ -5,8 +5,8 @@ use std::sync::Arc; use async_trait::async_trait; use futures::future::try_join_all; -use vortex::array::Array; use vortex::array::Canonical; +use vortex::array::DynArray; use vortex::array::IntoArray; use vortex::array::arrays::BinaryView; use vortex::array::arrays::BoolArray; diff --git a/vortex-cuda/src/dynamic_dispatch/plan_builder.rs b/vortex-cuda/src/dynamic_dispatch/plan_builder.rs index f63e0edc569..fb922d4da50 100644 --- a/vortex-cuda/src/dynamic_dispatch/plan_builder.rs +++ b/vortex-cuda/src/dynamic_dispatch/plan_builder.rs @@ -8,8 +8,8 @@ //! dynamic dispatch kernel can execute in a single launch. use futures::executor::block_on; -use vortex::array::Array; use vortex::array::ArrayRef; +use vortex::array::DynArray; use vortex::array::arrays::DictVTable; use vortex::array::arrays::PrimitiveArrayParts; use vortex::array::arrays::PrimitiveVTable; diff --git a/vortex-cuda/src/executor.rs b/vortex-cuda/src/executor.rs index 14c9c9ce6b6..9e2bb497a2f 100644 --- a/vortex-cuda/src/executor.rs +++ b/vortex-cuda/src/executor.rs @@ -15,9 +15,9 @@ use cudarc::driver::LaunchConfig; use futures::future::BoxFuture; use tracing::debug; use tracing::trace; -use vortex::array::Array; use vortex::array::ArrayRef; use vortex::array::Canonical; +use vortex::array::DynArray; use vortex::array::ExecutionCtx; use vortex::array::IntoArray; use vortex::array::arrays::StructArray; @@ -310,7 +310,7 @@ pub trait CudaExecute: 'static + Send + Sync + Debug { /// Extension trait for executing arrays on CUDA. #[async_trait] -pub trait CudaArrayExt: Array { +pub trait CudaArrayExt: DynArray { /// Recursively walks the encoding tree, dispatching each layer to its /// registered [`CudaExecute`] implementation and returning a canonical array /// on the device. diff --git a/vortex-cuda/src/kernel/encodings/alp.rs b/vortex-cuda/src/kernel/encodings/alp.rs index e15c5d0f4ad..9aabdea8658 100644 --- a/vortex-cuda/src/kernel/encodings/alp.rs +++ b/vortex-cuda/src/kernel/encodings/alp.rs @@ -8,9 +8,9 @@ use async_trait::async_trait; use cudarc::driver::DeviceRepr; use cudarc::driver::PushKernelArg; use tracing::instrument; -use vortex::array::Array; use vortex::array::ArrayRef; use vortex::array::Canonical; +use vortex::array::DynArray; use vortex::array::arrays::PrimitiveArray; use vortex::array::arrays::PrimitiveArrayParts; use vortex::array::buffer::BufferHandle; diff --git a/vortex-cuda/src/kernel/encodings/for_.rs b/vortex-cuda/src/kernel/encodings/for_.rs index b203a60ffd3..aef5202e2ab 100644 --- a/vortex-cuda/src/kernel/encodings/for_.rs +++ b/vortex-cuda/src/kernel/encodings/for_.rs @@ -7,9 +7,9 @@ use async_trait::async_trait; use cudarc::driver::DeviceRepr; use cudarc::driver::PushKernelArg; use tracing::instrument; -use vortex::array::Array; use vortex::array::ArrayRef; use vortex::array::Canonical; +use vortex::array::DynArray; use vortex::array::arrays::PrimitiveArray; use vortex::array::arrays::PrimitiveArrayParts; use vortex::array::arrays::SliceVTable; diff --git a/vortex-cuda/src/kernel/slice/mod.rs b/vortex-cuda/src/kernel/slice/mod.rs index f541ffcdd5a..ed327760c87 100644 --- a/vortex-cuda/src/kernel/slice/mod.rs +++ b/vortex-cuda/src/kernel/slice/mod.rs @@ -3,9 +3,9 @@ use async_trait::async_trait; use tracing::instrument; -use vortex::array::Array; use vortex::array::ArrayRef; use vortex::array::Canonical; +use vortex::array::DynArray; use vortex::array::arrays::SliceArrayParts; use vortex::array::arrays::SliceVTable; use vortex::error::VortexResult; diff --git a/vortex-cuda/src/layout.rs b/vortex-cuda/src/layout.rs index 1891a29b7f9..1fa4e86e885 100644 --- a/vortex-cuda/src/layout.rs +++ b/vortex-cuda/src/layout.rs @@ -13,12 +13,12 @@ use async_trait::async_trait; use futures::FutureExt; use futures::StreamExt; use futures::future::BoxFuture; -use vortex::array::Array; use vortex::array::ArrayContext; use vortex::array::ArrayRef; use vortex::array::ArrayVisitor; use vortex::array::ArrayVisitorExt; use vortex::array::DeserializeMetadata; +use vortex::array::DynArray; use vortex::array::MaskFuture; use vortex::array::ProstMetadata; use vortex::array::VortexSessionExecute; diff --git a/vortex-duckdb/src/exporter/dict.rs b/vortex-duckdb/src/exporter/dict.rs index e9d0ff60886..797b0d6bc70 100644 --- a/vortex-duckdb/src/exporter/dict.rs +++ b/vortex-duckdb/src/exporter/dict.rs @@ -7,8 +7,8 @@ use std::sync::Arc; use bitvec::macros::internal::funty::Fundamental; use num_traits::AsPrimitive; use parking_lot::Mutex; -use vortex::array::Array; use vortex::array::Canonical; +use vortex::array::DynArray; use vortex::array::ExecutionCtx; use vortex::array::IntoArray; use vortex::array::ToCanonical; diff --git a/vortex-duckdb/src/exporter/list.rs b/vortex-duckdb/src/exporter/list.rs index e9b635901ae..0876542f6ad 100644 --- a/vortex-duckdb/src/exporter/list.rs +++ b/vortex-duckdb/src/exporter/list.rs @@ -5,7 +5,7 @@ use std::marker::PhantomData; use std::sync::Arc; use parking_lot::Mutex; -use vortex::array::Array; +use vortex::array::DynArray; use vortex::array::ExecutionCtx; use vortex::array::arrays::ListArray; use vortex::array::arrays::ListArrayParts; diff --git a/vortex-duckdb/src/exporter/list_view.rs b/vortex-duckdb/src/exporter/list_view.rs index 247a9262645..9873c8208a5 100644 --- a/vortex-duckdb/src/exporter/list_view.rs +++ b/vortex-duckdb/src/exporter/list_view.rs @@ -5,7 +5,7 @@ use std::marker::PhantomData; use std::sync::Arc; use parking_lot::Mutex; -use vortex::array::Array; +use vortex::array::DynArray; use vortex::array::ExecutionCtx; use vortex::array::arrays::ListViewArray; use vortex::array::arrays::ListViewArrayParts; diff --git a/vortex-ffi/examples/hello_vortex.rs b/vortex-ffi/examples/hello_vortex.rs index c6ca24d9b8f..fa458ce483a 100644 --- a/vortex-ffi/examples/hello_vortex.rs +++ b/vortex-ffi/examples/hello_vortex.rs @@ -18,8 +18,8 @@ use std::process::Command; use std::sync::LazyLock; use vortex::VortexSessionDefault; -use vortex::array::Array; use vortex::array::ArrayRef; +use vortex::array::DynArray; use vortex::array::IntoArray; use vortex::array::arrays::ChunkedArray; use vortex::array::arrays::StructArray; diff --git a/vortex-ffi/src/array.rs b/vortex-ffi/src/array.rs index 54d794f52a5..c42ba0e8454 100644 --- a/vortex-ffi/src/array.rs +++ b/vortex-ffi/src/array.rs @@ -5,7 +5,7 @@ use std::ptr; use std::sync::Arc; -use vortex::array::Array; +use vortex::array::DynArray; use vortex::array::ToCanonical; use vortex::dtype::half::f16; use vortex::error::VortexExpect; @@ -28,7 +28,7 @@ arc_dyn_wrapper!( /// auto primitive_array = vx_array_primitive_new(...); /// vx_array_len((*vx_array) primitive_array)); /// ``` - dyn Array, + dyn DynArray, vx_array ); diff --git a/vortex-file/src/tests.rs b/vortex-file/src/tests.rs index 533d199122d..22edc7007b5 100644 --- a/vortex-file/src/tests.rs +++ b/vortex-file/src/tests.rs @@ -10,8 +10,8 @@ use bytes::Bytes; use futures::StreamExt; use futures::TryStreamExt; use futures::pin_mut; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::ToCanonical; use vortex_array::accessor::ArrayAccessor; diff --git a/vortex-ipc/public-api.lock b/vortex-ipc/public-api.lock index 553d4fb6b17..94762154cae 100644 --- a/vortex-ipc/public-api.lock +++ b/vortex-ipc/public-api.lock @@ -22,7 +22,7 @@ pub fn vortex_ipc::iterator::SyncIPCReader::try_new(read: R, session: &vortex impl core::iter::traits::iterator::Iterator for vortex_ipc::iterator::SyncIPCReader -pub type vortex_ipc::iterator::SyncIPCReader::Item = core::result::Result, vortex_error::VortexError> +pub type vortex_ipc::iterator::SyncIPCReader::Item = core::result::Result, vortex_error::VortexError> pub fn vortex_ipc::iterator::SyncIPCReader::next(&mut self) -> core::option::Option @@ -58,7 +58,7 @@ pub fn vortex_ipc::messages::DecoderMessage::fmt(&self, f: &mut core::fmt::Forma pub enum vortex_ipc::messages::EncoderMessage<'a> -pub vortex_ipc::messages::EncoderMessage::Array(&'a dyn vortex_array::array::Array) +pub vortex_ipc::messages::EncoderMessage::Array(&'a dyn vortex_array::array::DynArray) pub vortex_ipc::messages::EncoderMessage::Buffer(&'a vortex_buffer::ByteBuffer) @@ -176,7 +176,7 @@ impl<'__pin, R> core::marker::Unpin for vortex_ipc::stream::AsyncIPCReader wh impl futures_core::stream::Stream for vortex_ipc::stream::AsyncIPCReader -pub type vortex_ipc::stream::AsyncIPCReader::Item = core::result::Result, vortex_error::VortexError> +pub type vortex_ipc::stream::AsyncIPCReader::Item = core::result::Result, vortex_error::VortexError> pub fn vortex_ipc::stream::AsyncIPCReader::poll_next(self: core::pin::Pin<&mut Self>, cx: &mut core::task::wake::Context<'_>) -> core::task::poll::Poll> diff --git a/vortex-ipc/src/messages/decoder.rs b/vortex-ipc/src/messages/decoder.rs index f8a9130ed7e..c61b546506d 100644 --- a/vortex-ipc/src/messages/decoder.rs +++ b/vortex-ipc/src/messages/decoder.rs @@ -167,8 +167,8 @@ impl MessageDecoder { #[cfg(test)] mod test { use bytes::BytesMut; - use vortex_array::Array; use vortex_array::ArrayRef; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::ConstantArray; use vortex_buffer::buffer; diff --git a/vortex-ipc/src/messages/encoder.rs b/vortex-ipc/src/messages/encoder.rs index ce615498c93..c55b47243b6 100644 --- a/vortex-ipc/src/messages/encoder.rs +++ b/vortex-ipc/src/messages/encoder.rs @@ -4,8 +4,8 @@ use bytes::Bytes; use bytes::BytesMut; use flatbuffers::FlatBufferBuilder; -use vortex_array::Array; use vortex_array::ArrayContext; +use vortex_array::DynArray; use vortex_array::dtype::DType; use vortex_array::serde::SerializeOptions; use vortex_buffer::ByteBuffer; @@ -17,7 +17,7 @@ use vortex_flatbuffers::message as fb; /// An IPC message ready to be passed to the encoder. pub enum EncoderMessage<'a> { - Array(&'a dyn Array), + Array(&'a dyn DynArray), Buffer(&'a ByteBuffer), DType(&'a DType), } diff --git a/vortex-jni/src/array.rs b/vortex-jni/src/array.rs index c1a3abf91be..3d41ad1e220 100644 --- a/vortex-jni/src/array.rs +++ b/vortex-jni/src/array.rs @@ -24,8 +24,8 @@ use jni::sys::jlong; use jni::sys::jobject; use jni::sys::jshort; use jni::sys::jstring; -use vortex::array::Array; use vortex::array::ArrayRef; +use vortex::array::DynArray; use vortex::array::ToCanonical; use vortex::array::arrays::VarBinArray; use vortex::array::arrays::VarBinViewArray; diff --git a/vortex-jni/src/writer.rs b/vortex-jni/src/writer.rs index 4b341426c1f..6b2e1778bea 100644 --- a/vortex-jni/src/writer.rs +++ b/vortex-jni/src/writer.rs @@ -18,8 +18,8 @@ use jni::sys::jboolean; use jni::sys::jlong; use object_store::path::Path; use url::Url; -use vortex::array::Array; use vortex::array::ArrayRef; +use vortex::array::DynArray; use vortex::array::arrow::FromArrowArray; use vortex::array::stream::ArrayStreamAdapter; use vortex::dtype::DType; diff --git a/vortex-layout/public-api.lock b/vortex-layout/public-api.lock index 8525862e88f..bf69112d7dd 100644 --- a/vortex-layout/public-api.lock +++ b/vortex-layout/public-api.lock @@ -1186,7 +1186,7 @@ impl<'__pin, S> core::marker::Unpin for vortex_layout::sequence::SequentialStrea impl futures_core::stream::Stream for vortex_layout::sequence::SequentialStreamAdapter where S: futures_core::stream::Stream> -pub type vortex_layout::sequence::SequentialStreamAdapter::Item = core::result::Result<(vortex_layout::sequence::SequenceId, alloc::sync::Arc), vortex_error::VortexError> +pub type vortex_layout::sequence::SequentialStreamAdapter::Item = core::result::Result<(vortex_layout::sequence::SequenceId, alloc::sync::Arc), vortex_error::VortexError> pub fn vortex_layout::sequence::SequentialStreamAdapter::poll_next(self: core::pin::Pin<&mut Self>, cx: &mut core::task::wake::Context<'_>) -> core::task::poll::Poll> diff --git a/vortex-layout/src/layouts/compressed.rs b/vortex-layout/src/layouts/compressed.rs index 342955919be..58ba381d415 100644 --- a/vortex-layout/src/layouts/compressed.rs +++ b/vortex-layout/src/layouts/compressed.rs @@ -5,9 +5,9 @@ use std::sync::Arc; use async_trait::async_trait; use futures::StreamExt as _; -use vortex_array::Array; use vortex_array::ArrayContext; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::expr::stats::Stat; use vortex_btrblocks::BtrBlocksCompressor; use vortex_btrblocks::BtrBlocksCompressorBuilder; diff --git a/vortex-layout/src/layouts/dict/reader.rs b/vortex-layout/src/layouts/dict/reader.rs index 0d795a294db..f1398904391 100644 --- a/vortex-layout/src/layouts/dict/reader.rs +++ b/vortex-layout/src/layouts/dict/reader.rs @@ -11,8 +11,8 @@ use futures::FutureExt; use futures::TryFutureExt; use futures::future::BoxFuture; use futures::try_join; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::MaskFuture; use vortex_array::VortexSessionExecute; diff --git a/vortex-layout/src/layouts/dict/writer.rs b/vortex-layout/src/layouts/dict/writer.rs index 02924463329..c07c4f0bfd0 100644 --- a/vortex-layout/src/layouts/dict/writer.rs +++ b/vortex-layout/src/layouts/dict/writer.rs @@ -18,9 +18,9 @@ use futures::pin_mut; use futures::stream::BoxStream; use futures::stream::once; use futures::try_join; -use vortex_array::Array; use vortex_array::ArrayContext; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::arrays::DictVTable; use vortex_array::builders::dict::DictConstraints; use vortex_array::builders::dict::DictEncoder; diff --git a/vortex-layout/src/layouts/flat/reader.rs b/vortex-layout/src/layouts/flat/reader.rs index 6380803197b..494b2bd02b9 100644 --- a/vortex-layout/src/layouts/flat/reader.rs +++ b/vortex-layout/src/layouts/flat/reader.rs @@ -8,8 +8,8 @@ use std::sync::Arc; use futures::FutureExt; use futures::future::BoxFuture; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::MaskFuture; use vortex_array::VortexSessionExecute; use vortex_array::dtype::DType; diff --git a/vortex-layout/src/layouts/flat/writer.rs b/vortex-layout/src/layouts/flat/writer.rs index 729d140160d..f58b4729346 100644 --- a/vortex-layout/src/layouts/flat/writer.rs +++ b/vortex-layout/src/layouts/flat/writer.rs @@ -3,8 +3,8 @@ use async_trait::async_trait; use futures::StreamExt; -use vortex_array::Array; use vortex_array::ArrayContext; +use vortex_array::DynArray; use vortex_array::dtype::DType; use vortex_array::expr::stats::Precision; use vortex_array::expr::stats::Stat; @@ -194,9 +194,9 @@ impl LayoutStrategy for FlatLayoutStrategy { mod tests { use std::sync::Arc; - use vortex_array::Array; use vortex_array::ArrayContext; use vortex_array::ArrayRef; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::MaskFuture; use vortex_array::ToCanonical; diff --git a/vortex-layout/src/layouts/repartition.rs b/vortex-layout/src/layouts/repartition.rs index 492a01d5015..a022abd27cb 100644 --- a/vortex-layout/src/layouts/repartition.rs +++ b/vortex-layout/src/layouts/repartition.rs @@ -8,9 +8,9 @@ use async_stream::try_stream; use async_trait::async_trait; use futures::StreamExt as _; use futures::pin_mut; -use vortex_array::Array; use vortex_array::ArrayContext; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::ChunkedArray; use vortex_array::dtype::DType; @@ -266,8 +266,8 @@ impl ChunksBuffer { mod tests { use std::sync::Arc; - use vortex_array::Array; use vortex_array::ArrayContext; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::ConstantArray; use vortex_array::arrays::FixedSizeListArray; diff --git a/vortex-layout/src/layouts/struct_/reader.rs b/vortex-layout/src/layouts/struct_/reader.rs index bd6f7354ca6..fc665731bdd 100644 --- a/vortex-layout/src/layouts/struct_/reader.rs +++ b/vortex-layout/src/layouts/struct_/reader.rs @@ -378,8 +378,8 @@ mod tests { use rstest::fixture; use rstest::rstest; - use vortex_array::Array; use vortex_array::ArrayContext; + use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::MaskFuture; use vortex_array::ToCanonical; diff --git a/vortex-layout/src/layouts/struct_/writer.rs b/vortex-layout/src/layouts/struct_/writer.rs index de2bd019278..06320a10844 100644 --- a/vortex-layout/src/layouts/struct_/writer.rs +++ b/vortex-layout/src/layouts/struct_/writer.rs @@ -11,9 +11,9 @@ use futures::TryStreamExt; use futures::future::try_join_all; use futures::pin_mut; use itertools::Itertools; -use vortex_array::Array; use vortex_array::ArrayContext; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::ToCanonical; use vortex_array::dtype::DType; diff --git a/vortex-layout/src/layouts/zoned/builder.rs b/vortex-layout/src/layouts/zoned/builder.rs index de2d4b575e3..044c3270dde 100644 --- a/vortex-layout/src/layouts/zoned/builder.rs +++ b/vortex-layout/src/layouts/zoned/builder.rs @@ -3,8 +3,8 @@ use std::marker::PhantomData; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::IntoArray; use vortex_array::arrays::ConstantArray; use vortex_array::builders::ArrayBuilder; diff --git a/vortex-layout/src/layouts/zoned/zone_map.rs b/vortex-layout/src/layouts/zoned/zone_map.rs index 81dbe1d6b3a..9422fd25862 100644 --- a/vortex-layout/src/layouts/zoned/zone_map.rs +++ b/vortex-layout/src/layouts/zoned/zone_map.rs @@ -4,8 +4,8 @@ use std::sync::Arc; use itertools::Itertools; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::VortexSessionExecute; use vortex_array::arrays::StructArray; use vortex_array::compute::sum; diff --git a/vortex-layout/src/sequence.rs b/vortex-layout/src/sequence.rs index 1b6854031c7..5aa6353674f 100644 --- a/vortex-layout/src/sequence.rs +++ b/vortex-layout/src/sequence.rs @@ -16,8 +16,8 @@ use futures::Stream; use futures::StreamExt; use parking_lot::Mutex; use pin_project_lite::pin_project; -use vortex_array::Array; use vortex_array::ArrayRef; +use vortex_array::DynArray; use vortex_array::dtype::DType; use vortex_array::stream::ArrayStream; use vortex_error::VortexExpect; diff --git a/vortex-python/src/arrays/mod.rs b/vortex-python/src/arrays/mod.rs index 5df8471db2c..1980e7aa742 100644 --- a/vortex-python/src/arrays/mod.rs +++ b/vortex-python/src/arrays/mod.rs @@ -21,8 +21,8 @@ use pyo3::types::PyList; use pyo3::types::PyRange; use pyo3::types::PyRangeMethods; use pyo3_bytes::PyBytes; -use vortex::array::Array; use vortex::array::ArrayRef; +use vortex::array::DynArray; use vortex::array::ToCanonical; use vortex::array::arrays::ChunkedVTable; use vortex::array::arrow::IntoArrowArray; diff --git a/vortex-python/src/arrays/native.rs b/vortex-python/src/arrays/native.rs index 34e038f36b5..f3a4fb429b3 100644 --- a/vortex-python/src/arrays/native.rs +++ b/vortex-python/src/arrays/native.rs @@ -5,9 +5,9 @@ use std::ops::Deref; use pyo3::PyClass; use pyo3::prelude::*; -use vortex::array::Array; use vortex::array::ArrayAdapter; use vortex::array::ArrayRef; +use vortex::array::DynArray; use vortex::array::arrays::BoolVTable; use vortex::array::arrays::ChunkedVTable; use vortex::array::arrays::ConstantVTable; diff --git a/vortex-python/src/iter/python.rs b/vortex-python/src/iter/python.rs index 1b5aafc98ab..6d0fa591970 100644 --- a/vortex-python/src/iter/python.rs +++ b/vortex-python/src/iter/python.rs @@ -4,8 +4,8 @@ use pyo3::exceptions::PyTypeError; use pyo3::prelude::*; use pyo3::types::PyIterator; -use vortex::array::Array; use vortex::array::ArrayRef; +use vortex::array::DynArray; use vortex::array::iter::ArrayIterator; use vortex::dtype::DType; use vortex::error::VortexResult; diff --git a/vortex-python/src/scan.rs b/vortex-python/src/scan.rs index a3bb84f74c1..bcdf4a8a790 100644 --- a/vortex-python/src/scan.rs +++ b/vortex-python/src/scan.rs @@ -3,8 +3,8 @@ use pyo3::exceptions::PyIndexError; use pyo3::prelude::*; -use vortex::array::Array; use vortex::array::ArrayRef; +use vortex::array::DynArray; use vortex::scan::RepeatedScan; use crate::RUNTIME; diff --git a/vortex-tui/src/browse/ui/layouts.rs b/vortex-tui/src/browse/ui/layouts.rs index 7545f432e61..ba05ed95859 100644 --- a/vortex-tui/src/browse/ui/layouts.rs +++ b/vortex-tui/src/browse/ui/layouts.rs @@ -28,8 +28,8 @@ use ratatui::widgets::Widget; use ratatui::widgets::Wrap; use tokio::runtime::Handle; use tokio::task::block_in_place; -use vortex::array::Array; use vortex::array::ArrayRef; +use vortex::array::DynArray; use vortex::array::MaskFuture; use vortex::array::ToCanonical; use vortex::error::VortexExpect; diff --git a/vortex/benches/common_encoding_tree_throughput.rs b/vortex/benches/common_encoding_tree_throughput.rs index ee047c82653..2c2c1ca112d 100644 --- a/vortex/benches/common_encoding_tree_throughput.rs +++ b/vortex/benches/common_encoding_tree_throughput.rs @@ -13,8 +13,8 @@ use divan::counter::BytesCount; use mimalloc::MiMalloc; use rand::Rng; use rand::SeedableRng; -use vortex::array::Array; use vortex::array::ArrayRef; +use vortex::array::DynArray; use vortex::array::IntoArray; use vortex::array::ToCanonical; use vortex::array::arrays::DictArray; diff --git a/vortex/examples/compression_showcase.rs b/vortex/examples/compression_showcase.rs index 512e1110500..2ca42368a76 100644 --- a/vortex/examples/compression_showcase.rs +++ b/vortex/examples/compression_showcase.rs @@ -8,8 +8,8 @@ //! //! Run with: cargo run --example compression_showcase -use vortex::array::Array; use vortex::array::ArrayRef; +use vortex::array::DynArray; use vortex::array::IntoArray; use vortex::array::arrays::PrimitiveArray; use vortex::array::arrays::StructArray; diff --git a/vortex/src/lib.rs b/vortex/src/lib.rs index 8f9312b9397..81624fa6435 100644 --- a/vortex/src/lib.rs +++ b/vortex/src/lib.rs @@ -211,7 +211,7 @@ mod test { use arrow_array::RecordBatchReader; use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder; - use vortex::array::Array; + use vortex::array::DynArray; use vortex::array::arrays::ChunkedArray; use vortex::dtype::DType; use vortex::dtype::arrow::FromArrowType; diff --git a/wasm-test/src/main.rs b/wasm-test/src/main.rs index 8be0ac82570..16dc6d05edc 100644 --- a/wasm-test/src/main.rs +++ b/wasm-test/src/main.rs @@ -3,7 +3,7 @@ use vortex::array::arrays::PrimitiveArray; use vortex::array::validity::Validity; -use vortex::array::Array; +use vortex::array::DynArray; use vortex::buffer::buffer; use vortex::compressor::BtrBlocksCompressor;