Skip to content

Move vortex-scalar into vortex-array #6523

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
connortsui20 merged 1 commit into from
Feb 17, 2026
Merged

Move vortex-scalar into vortex-array #6523

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,8 +667,8 @@ jobs:
strategy:
matrix:
include:
- { shard: 1, name: "Core foundation", packages: "vortex-buffer vortex-dtype vortex-error" }
- { shard: 2, name: "Array types", packages: "vortex-array vortex-scalar", features: "--features _test-harness" }
- { shard: 1, name: "Core foundation", packages: "vortex-buffer vortex-error" }
- { shard: 2, name: "Arrays", packages: "vortex-array vortex-dtype", features: "--features _test-harness" }
- { shard: 3, name: "Main library", packages: "vortex vortex-compute" }
- { shard: 4, name: "Encodings 1", packages: "vortex-alp vortex-bytebool vortex-datetime-parts" }
- { shard: 5, name: "Encodings 2", packages: "vortex-decimal-byte-parts vortex-fastlanes vortex-fsst", features: "--features _test-harness" }
Expand Down
41 changes: 1 addition & 40 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ members = [
"vortex-io",
"vortex-proto",
"vortex-dtype",
"vortex-scalar",
"vortex-compute",
"vortex-array",
"vortex-btrblocks",
Expand Down Expand Up @@ -271,7 +270,6 @@ vortex-metrics = { version = "0.1.0", path = "./vortex-metrics", default-feature
vortex-pco = { version = "0.1.0", path = "./encodings/pco", default-features = false }
vortex-proto = { version = "0.1.0", path = "./vortex-proto", default-features = false }
vortex-runend = { version = "0.1.0", path = "./encodings/runend", default-features = false }
vortex-scalar = { version = "0.1.0", path = "./vortex-scalar", default-features = false }
vortex-scan = { version = "0.1.0", path = "./vortex-scan", default-features = false }
vortex-sequence = { version = "0.1.0", path = "encodings/sequence", default-features = false }
vortex-session = { version = "0.1.0", path = "./vortex-session", default-features = false }
Expand Down
1 change: 0 additions & 1 deletion encodings/alp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ vortex-dtype = { workspace = true }
vortex-error = { workspace = true }
vortex-fastlanes = { workspace = true }
vortex-mask = { workspace = true }
vortex-scalar = { workspace = true }
vortex-session = { workspace = true }
vortex-utils = { workspace = true }

Expand Down
6 changes: 3 additions & 3 deletions encodings/alp/public-api.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ pub fn vortex_alp::ALPRDVTable::stats(array: &vortex_alp::ALPRDArray) -> vortex_

impl vortex_array::vtable::operations::OperationsVTable<vortex_alp::ALPRDVTable> for vortex_alp::ALPRDVTable

pub fn vortex_alp::ALPRDVTable::scalar_at(array: &vortex_alp::ALPRDArray, index: usize) -> vortex_error::VortexResult<vortex_scalar::scalar::Scalar>
pub fn vortex_alp::ALPRDVTable::scalar_at(array: &vortex_alp::ALPRDArray, index: usize) -> vortex_error::VortexResult<vortex_array::scalar::Scalar>

impl vortex_array::vtable::validity::ValidityChild<vortex_alp::ALPRDVTable> for vortex_alp::ALPRDVTable

Expand Down Expand Up @@ -322,7 +322,7 @@ pub fn vortex_alp::ALPVTable::stats(array: &vortex_alp::ALPArray) -> vortex_arra

impl vortex_array::vtable::operations::OperationsVTable<vortex_alp::ALPVTable> for vortex_alp::ALPVTable

pub fn vortex_alp::ALPVTable::scalar_at(array: &vortex_alp::ALPArray, index: usize) -> vortex_error::VortexResult<vortex_scalar::scalar::Scalar>
pub fn vortex_alp::ALPVTable::scalar_at(array: &vortex_alp::ALPArray, index: usize) -> vortex_error::VortexResult<vortex_array::scalar::Scalar>

impl vortex_array::vtable::validity::ValidityChild<vortex_alp::ALPVTable> for vortex_alp::ALPVTable

Expand Down Expand Up @@ -382,7 +382,7 @@ pub fn vortex_alp::RDEncoder::new<T>(sample: &[T]) -> Self where T: vortex_alp::

pub trait vortex_alp::ALPFloat: vortex_alp::alp::private::Sealed + num_traits::float::Float + core::fmt::Display + vortex_dtype::ptype::NativePType

pub type vortex_alp::ALPFloat::ALPInt: num_traits::int::PrimInt + core::fmt::Display + num_traits::cast::ToPrimitive + core::marker::Copy + vortex_dtype::ptype::NativePType + core::convert::Into<vortex_scalar::typed_view::primitive::pvalue::PValue>
pub type vortex_alp::ALPFloat::ALPInt: num_traits::int::PrimInt + core::fmt::Display + num_traits::cast::ToPrimitive + core::marker::Copy + vortex_dtype::ptype::NativePType + core::convert::Into<vortex_array::scalar::typed_view::primitive::pvalue::PValue>

pub const vortex_alp::ALPFloat::F10: &'static [Self]

Expand Down
2 changes: 1 addition & 1 deletion encodings/alp/src/alp/compute/between.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ use vortex_array::builtins::ArrayBuiltins;
use vortex_array::expr::BetweenOptions;
use vortex_array::expr::BetweenReduce;
use vortex_array::expr::StrictComparison;
use vortex_array::scalar::Scalar;
use vortex_dtype::NativeDType;
use vortex_dtype::NativePType;
use vortex_dtype::Nullability;
use vortex_error::VortexResult;
use vortex_scalar::Scalar;

use crate::ALPArray;
use crate::ALPFloat;
Expand Down
4 changes: 2 additions & 2 deletions encodings/alp/src/alp/compute/compare.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ use vortex_array::arrays::ConstantArray;
use vortex_array::compute::Operator;
use vortex_array::compute::compare;
use vortex_array::expr::CompareKernel;
use vortex_array::scalar::Scalar;
use vortex_dtype::NativePType;
use vortex_error::VortexResult;
use vortex_error::vortex_bail;
use vortex_error::vortex_err;
use vortex_scalar::Scalar;

use crate::ALPArray;
use crate::ALPFloat;
Expand Down Expand Up @@ -150,10 +150,10 @@ mod tests {
use vortex_array::assert_arrays_eq;
use vortex_array::compute::Operator;
use vortex_array::compute::compare;
use vortex_array::scalar::Scalar;
use vortex_dtype::DType;
use vortex_dtype::Nullability;
use vortex_dtype::PType;
use vortex_scalar::Scalar;

use super::*;
use crate::alp_encode;
Expand Down
2 changes: 1 addition & 1 deletion encodings/alp/src/alp/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ mod tests {
pub use array::*;
pub use compress::alp_encode;
pub use decompress::decompress_into_array;
use vortex_array::scalar::PValue;
use vortex_buffer::Buffer;
use vortex_buffer::BufferMut;
use vortex_dtype::NativePType;
use vortex_scalar::PValue;

const SAMPLE_SIZE: usize = 32;

Expand Down
2 changes: 1 addition & 1 deletion encodings/alp/src/alp/ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
// SPDX-FileCopyrightText: Copyright the Vortex contributors

use vortex_array::scalar::Scalar;
use vortex_array::vtable::OperationsVTable;
use vortex_error::VortexExpect;
use vortex_error::VortexResult;
use vortex_scalar::Scalar;

use crate::ALPArray;
use crate::ALPFloat;
Expand Down
2 changes: 1 addition & 1 deletion encodings/alp/src/alp_rd/compute/take.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use vortex_array::ExecutionCtx;
use vortex_array::IntoArray;
use vortex_array::arrays::TakeExecute;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::scalar::Scalar;
use vortex_error::VortexResult;
use vortex_scalar::Scalar;

use crate::ALPRDArray;
use crate::ALPRDVTable;
Expand Down
4 changes: 2 additions & 2 deletions encodings/alp/src/alp_rd/ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// SPDX-FileCopyrightText: Copyright the Vortex contributors

use vortex_array::Array;
use vortex_array::scalar::Scalar;
use vortex_array::vtable::OperationsVTable;
use vortex_error::VortexExpect;
use vortex_error::VortexResult;
use vortex_scalar::Scalar;

use crate::ALPRDArray;
use crate::ALPRDVTable;
Expand Down Expand Up @@ -62,7 +62,7 @@ mod test {
use rstest::rstest;
use vortex_array::arrays::PrimitiveArray;
use vortex_array::assert_arrays_eq;
use vortex_scalar::Scalar;
use vortex_array::scalar::Scalar;

use crate::ALPRDFloat;
use crate::RDEncoder;
Expand Down
1 change: 0 additions & 1 deletion encodings/bytebool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ vortex-buffer = { workspace = true }
vortex-dtype = { workspace = true }
vortex-error = { workspace = true }
vortex-mask = { workspace = true }
vortex-scalar = { workspace = true }
vortex-session = { workspace = true }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion encodings/bytebool/public-api.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ pub fn vortex_bytebool::ByteBoolVTable::stats(array: &vortex_bytebool::ByteBoolA

impl vortex_array::vtable::operations::OperationsVTable<vortex_bytebool::ByteBoolVTable> for vortex_bytebool::ByteBoolVTable

pub fn vortex_bytebool::ByteBoolVTable::scalar_at(array: &vortex_bytebool::ByteBoolArray, index: usize) -> vortex_error::VortexResult<vortex_scalar::scalar::Scalar>
pub fn vortex_bytebool::ByteBoolVTable::scalar_at(array: &vortex_bytebool::ByteBoolArray, index: usize) -> vortex_error::VortexResult<vortex_array::scalar::Scalar>

impl vortex_array::vtable::visitor::VisitorVTable<vortex_bytebool::ByteBoolVTable> for vortex_bytebool::ByteBoolVTable

Expand Down
2 changes: 1 addition & 1 deletion encodings/bytebool/src/array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use vortex_array::IntoArray;
use vortex_array::Precision;
use vortex_array::arrays::BoolArray;
use vortex_array::buffer::BufferHandle;
use vortex_array::scalar::Scalar;
use vortex_array::serde::ArrayChildren;
use vortex_array::stats::ArrayStats;
use vortex_array::stats::StatsSetRef;
Expand All @@ -36,7 +37,6 @@ use vortex_error::VortexResult;
use vortex_error::vortex_bail;
use vortex_error::vortex_ensure;
use vortex_error::vortex_panic;
use vortex_scalar::Scalar;
use vortex_session::VortexSession;

use crate::kernel::PARENT_KERNELS;
Expand Down
1 change: 0 additions & 1 deletion encodings/datetime-parts/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ vortex-buffer = { workspace = true }
vortex-dtype = { workspace = true }
vortex-error = { workspace = true }
vortex-mask = { workspace = true }
vortex-scalar = { workspace = true }
vortex-session = { workspace = true }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion encodings/datetime-parts/public-api.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ pub fn vortex_datetime_parts::DateTimePartsVTable::stats(array: &vortex_datetime

impl vortex_array::vtable::operations::OperationsVTable<vortex_datetime_parts::DateTimePartsVTable> for vortex_datetime_parts::DateTimePartsVTable

pub fn vortex_datetime_parts::DateTimePartsVTable::scalar_at(array: &vortex_datetime_parts::DateTimePartsArray, index: usize) -> vortex_error::VortexResult<vortex_scalar::scalar::Scalar>
pub fn vortex_datetime_parts::DateTimePartsVTable::scalar_at(array: &vortex_datetime_parts::DateTimePartsArray, index: usize) -> vortex_error::VortexResult<vortex_array::scalar::Scalar>

impl vortex_array::vtable::validity::ValidityChild<vortex_datetime_parts::DateTimePartsVTable> for vortex_datetime_parts::DateTimePartsVTable

Expand Down
Loading
Loading