diff --git a/Cargo.lock b/Cargo.lock index 78879a0243d..88578879a6c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8430,12 +8430,10 @@ name = "vortex-btrblocks" version = "0.1.0" dependencies = [ "codspeed-divan-compat", - "env_logger", "getrandom 0.3.4", "itertools 0.14.0", "num-traits", "rand 0.9.2", - "rstest", "rustc-hash", "tracing", "vortex-alp", @@ -8479,7 +8477,6 @@ dependencies = [ name = "vortex-bytebool" version = "0.1.0" dependencies = [ - "itertools 0.14.0", "num-traits", "rstest", "vortex-array", @@ -8500,7 +8497,6 @@ dependencies = [ "codspeed-divan-compat", "half", "itertools 0.14.0", - "log", "multiversion", "num-traits", "paste", @@ -8584,7 +8580,6 @@ dependencies = [ name = "vortex-decimal-byte-parts" version = "0.1.0" dependencies = [ - "itertools 0.14.0", "num-traits", "prost 0.14.1", "rstest", @@ -8683,7 +8678,6 @@ dependencies = [ "fastlanes", "itertools 0.14.0", "lending-iterator", - "mimalloc", "num-traits", "prost 0.14.1", "rand 0.9.2", @@ -8776,7 +8770,6 @@ version = "0.1.0" dependencies = [ "codspeed-divan-compat", "fsst-rs", - "itertools 0.14.0", "num-traits", "prost 0.14.1", "rand 0.9.2", @@ -8837,7 +8830,6 @@ dependencies = [ "tempfile", "tokio", "tracing", - "tracing-subscriber", "vortex-buffer", "vortex-error", "vortex-metrics", @@ -9069,13 +9061,10 @@ dependencies = [ "num-traits", "prost 0.14.1", "rstest", - "tokio", "vortex-array", "vortex-buffer", "vortex-dtype", "vortex-error", - "vortex-file", - "vortex-layout", "vortex-mask", "vortex-proto", "vortex-scalar", diff --git a/encodings/bytebool/Cargo.toml b/encodings/bytebool/Cargo.toml index 7e7117b687a..682b40235c7 100644 --- a/encodings/bytebool/Cargo.toml +++ b/encodings/bytebool/Cargo.toml @@ -26,6 +26,5 @@ vortex-mask = { workspace = true } vortex-scalar = { workspace = true } [dev-dependencies] -itertools = { workspace = true } rstest = { workspace = true } vortex-array = { workspace = true, features = ["test-harness"] } diff --git a/encodings/decimal-byte-parts/Cargo.toml b/encodings/decimal-byte-parts/Cargo.toml index 79d6f87711b..cb79a92ede9 100644 --- a/encodings/decimal-byte-parts/Cargo.toml +++ b/encodings/decimal-byte-parts/Cargo.toml @@ -27,6 +27,5 @@ vortex-mask = { workspace = true } vortex-scalar = { workspace = true } [dev-dependencies] -itertools = { workspace = true } rstest = { workspace = true } vortex-array = { path = "../../vortex-array", features = ["test-harness"] } diff --git a/encodings/fastlanes/Cargo.toml b/encodings/fastlanes/Cargo.toml index 81a2e00b8e8..7b0024db94b 100644 --- a/encodings/fastlanes/Cargo.toml +++ b/encodings/fastlanes/Cargo.toml @@ -37,7 +37,6 @@ vortex-vector = { workspace = true } [dev-dependencies] divan = { workspace = true } itertools = { workspace = true } -mimalloc = { workspace = true } rand = { workspace = true } rstest = { workspace = true } vortex-alp = { path = "../alp" } diff --git a/encodings/fsst/Cargo.toml b/encodings/fsst/Cargo.toml index 00b0e9d182b..cff277e89a2 100644 --- a/encodings/fsst/Cargo.toml +++ b/encodings/fsst/Cargo.toml @@ -34,7 +34,6 @@ test-harness = ["dep:rand", "vortex-array/test-harness"] [dev-dependencies] divan = { workspace = true } -itertools = { workspace = true } rand = { workspace = true } rstest = { workspace = true } vortex-array = { workspace = true, features = ["test-harness"] } diff --git a/encodings/sequence/Cargo.toml b/encodings/sequence/Cargo.toml index c3ebfeef598..143f5805ab8 100644 --- a/encodings/sequence/Cargo.toml +++ b/encodings/sequence/Cargo.toml @@ -28,10 +28,7 @@ vortex-vector = { workspace = true } [dev-dependencies] itertools = { workspace = true } rstest = { workspace = true } -tokio = { workspace = true, features = ["full"] } vortex-array = { path = "../../vortex-array", features = ["test-harness"] } -vortex-file = { path = "../../vortex-file", features = ["tokio"] } -vortex-layout = { path = "../../vortex-layout" } [lints] workspace = true diff --git a/vortex-btrblocks/Cargo.toml b/vortex-btrblocks/Cargo.toml index 7ad94f3c551..f1a3feb0af4 100644 --- a/vortex-btrblocks/Cargo.toml +++ b/vortex-btrblocks/Cargo.toml @@ -39,8 +39,6 @@ vortex-zigzag = { workspace = true } [dev-dependencies] divan = { workspace = true } -env_logger = "0.11" -rstest = { workspace = true } vortex-array = { workspace = true, features = ["test-harness"] } [features] diff --git a/vortex-buffer/Cargo.toml b/vortex-buffer/Cargo.toml index e4a65fc6c85..cf13a40c069 100644 --- a/vortex-buffer/Cargo.toml +++ b/vortex-buffer/Cargo.toml @@ -28,7 +28,6 @@ bitvec = { workspace = true } bytes = { workspace = true } itertools = { workspace = true } memmap2 = { workspace = true, optional = true } -num-traits = { workspace = true } serde = { workspace = true, optional = true } simdutf8 = { workspace = true } tracing = { workspace = true, optional = true } @@ -43,6 +42,7 @@ workspace = true [dev-dependencies] arrow-buffer = { workspace = true } divan = { workspace = true } +num-traits = { workspace = true } rstest = { workspace = true } [[bench]] diff --git a/vortex-compute/Cargo.toml b/vortex-compute/Cargo.toml index bad907c6aa9..dc70db6ee45 100644 --- a/vortex-compute/Cargo.toml +++ b/vortex-compute/Cargo.toml @@ -32,7 +32,6 @@ vortex-vector = { workspace = true } half = { workspace = true } itertools = { workspace = true } -log = { workspace = true } multiversion = { workspace = true } num-traits = { workspace = true } paste = { workspace = true } diff --git a/vortex-flatbuffers/src/generated/scalar.rs b/vortex-flatbuffers/src/generated/scalar.rs deleted file mode 100644 index 57658a85f49..00000000000 --- a/vortex-flatbuffers/src/generated/scalar.rs +++ /dev/null @@ -1,300 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// SPDX-FileCopyrightText: Copyright the Vortex contributors - -// automatically generated by the FlatBuffers compiler, do not modify - - -// @generated - -use crate::dtype::*; -use core::mem; -use core::cmp::Ordering; - -extern crate flatbuffers; -use self::flatbuffers::{EndianScalar, Follow}; - -pub enum ScalarOffset {} -#[derive(Copy, Clone, PartialEq)] - -pub struct Scalar<'a> { - pub _tab: flatbuffers::Table<'a>, -} - -impl<'a> flatbuffers::Follow<'a> for Scalar<'a> { - type Inner = Scalar<'a>; - #[inline] - unsafe fn follow(buf: &'a [u8], loc: usize) -> Self::Inner { - Self { _tab: flatbuffers::Table::new(buf, loc) } - } -} - -impl<'a> Scalar<'a> { - pub const VT_DTYPE: flatbuffers::VOffsetT = 4; - pub const VT_VALUE: flatbuffers::VOffsetT = 6; - - #[inline] - pub unsafe fn init_from_table(table: flatbuffers::Table<'a>) -> Self { - Scalar { _tab: table } - } - #[allow(unused_mut)] - pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr, A: flatbuffers::Allocator + 'bldr>( - _fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr, A>, - args: &'args ScalarArgs<'args> - ) -> flatbuffers::WIPOffset> { - let mut builder = ScalarBuilder::new(_fbb); - if let Some(x) = args.value { builder.add_value(x); } - if let Some(x) = args.dtype { builder.add_dtype(x); } - builder.finish() - } - - - #[inline] - pub fn dtype(&self) -> DType<'a> { - // Safety: - // Created from valid Table for this object - // which contains a valid value in this slot - unsafe { self._tab.get::>(Scalar::VT_DTYPE, None).unwrap()} - } - #[inline] - pub fn value(&self) -> ScalarValue<'a> { - // Safety: - // Created from valid Table for this object - // which contains a valid value in this slot - unsafe { self._tab.get::>(Scalar::VT_VALUE, None).unwrap()} - } -} - -impl flatbuffers::Verifiable for Scalar<'_> { - #[inline] - fn run_verifier( - v: &mut flatbuffers::Verifier, pos: usize - ) -> Result<(), flatbuffers::InvalidFlatbuffer> { - use self::flatbuffers::Verifiable; - v.visit_table(pos)? - .visit_field::>("dtype", Self::VT_DTYPE, true)? - .visit_field::>("value", Self::VT_VALUE, true)? - .finish(); - Ok(()) - } -} -pub struct ScalarArgs<'a> { - pub dtype: Option>>, - pub value: Option>>, -} -impl<'a> Default for ScalarArgs<'a> { - #[inline] - fn default() -> Self { - ScalarArgs { - dtype: None, // required field - value: None, // required field - } - } -} - -pub struct ScalarBuilder<'a: 'b, 'b, A: flatbuffers::Allocator + 'a> { - fbb_: &'b mut flatbuffers::FlatBufferBuilder<'a, A>, - start_: flatbuffers::WIPOffset, -} -impl<'a: 'b, 'b, A: flatbuffers::Allocator + 'a> ScalarBuilder<'a, 'b, A> { - #[inline] - pub fn add_dtype(&mut self, dtype: flatbuffers::WIPOffset>) { - self.fbb_.push_slot_always::>(Scalar::VT_DTYPE, dtype); - } - #[inline] - pub fn add_value(&mut self, value: flatbuffers::WIPOffset>) { - self.fbb_.push_slot_always::>(Scalar::VT_VALUE, value); - } - #[inline] - pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a, A>) -> ScalarBuilder<'a, 'b, A> { - let start = _fbb.start_table(); - ScalarBuilder { - fbb_: _fbb, - start_: start, - } - } - #[inline] - pub fn finish(self) -> flatbuffers::WIPOffset> { - let o = self.fbb_.end_table(self.start_); - self.fbb_.required(o, Scalar::VT_DTYPE,"dtype"); - self.fbb_.required(o, Scalar::VT_VALUE,"value"); - flatbuffers::WIPOffset::new(o.value()) - } -} - -impl core::fmt::Debug for Scalar<'_> { - fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { - let mut ds = f.debug_struct("Scalar"); - ds.field("dtype", &self.dtype()); - ds.field("value", &self.value()); - ds.finish() - } -} -pub enum ScalarValueOffset {} -#[derive(Copy, Clone, PartialEq)] - -pub struct ScalarValue<'a> { - pub _tab: flatbuffers::Table<'a>, -} - -impl<'a> flatbuffers::Follow<'a> for ScalarValue<'a> { - type Inner = ScalarValue<'a>; - #[inline] - unsafe fn follow(buf: &'a [u8], loc: usize) -> Self::Inner { - Self { _tab: flatbuffers::Table::new(buf, loc) } - } -} - -impl<'a> ScalarValue<'a> { - pub const VT_FLEX: flatbuffers::VOffsetT = 4; - - #[inline] - pub unsafe fn init_from_table(table: flatbuffers::Table<'a>) -> Self { - ScalarValue { _tab: table } - } - #[allow(unused_mut)] - pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr, A: flatbuffers::Allocator + 'bldr>( - _fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr, A>, - args: &'args ScalarValueArgs<'args> - ) -> flatbuffers::WIPOffset> { - let mut builder = ScalarValueBuilder::new(_fbb); - if let Some(x) = args.flex { builder.add_flex(x); } - builder.finish() - } - - - #[inline] - pub fn flex(&self) -> flatbuffers::Vector<'a, u8> { - // Safety: - // Created from valid Table for this object - // which contains a valid value in this slot - unsafe { self._tab.get::>>(ScalarValue::VT_FLEX, None).unwrap()} - } -} - -impl flatbuffers::Verifiable for ScalarValue<'_> { - #[inline] - fn run_verifier( - v: &mut flatbuffers::Verifier, pos: usize - ) -> Result<(), flatbuffers::InvalidFlatbuffer> { - use self::flatbuffers::Verifiable; - v.visit_table(pos)? - .visit_field::>>("flex", Self::VT_FLEX, true)? - .finish(); - Ok(()) - } -} -pub struct ScalarValueArgs<'a> { - pub flex: Option>>, -} -impl<'a> Default for ScalarValueArgs<'a> { - #[inline] - fn default() -> Self { - ScalarValueArgs { - flex: None, // required field - } - } -} - -pub struct ScalarValueBuilder<'a: 'b, 'b, A: flatbuffers::Allocator + 'a> { - fbb_: &'b mut flatbuffers::FlatBufferBuilder<'a, A>, - start_: flatbuffers::WIPOffset, -} -impl<'a: 'b, 'b, A: flatbuffers::Allocator + 'a> ScalarValueBuilder<'a, 'b, A> { - #[inline] - pub fn add_flex(&mut self, flex: flatbuffers::WIPOffset>) { - self.fbb_.push_slot_always::>(ScalarValue::VT_FLEX, flex); - } - #[inline] - pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a, A>) -> ScalarValueBuilder<'a, 'b, A> { - let start = _fbb.start_table(); - ScalarValueBuilder { - fbb_: _fbb, - start_: start, - } - } - #[inline] - pub fn finish(self) -> flatbuffers::WIPOffset> { - let o = self.fbb_.end_table(self.start_); - self.fbb_.required(o, ScalarValue::VT_FLEX,"flex"); - flatbuffers::WIPOffset::new(o.value()) - } -} - -impl core::fmt::Debug for ScalarValue<'_> { - fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { - let mut ds = f.debug_struct("ScalarValue"); - ds.field("flex", &self.flex()); - ds.finish() - } -} -#[inline] -/// Verifies that a buffer of bytes contains a `Scalar` -/// and returns it. -/// Note that verification is still experimental and may not -/// catch every error, or be maximally performant. For the -/// previous, unchecked, behavior use -/// `root_as_scalar_unchecked`. -pub fn root_as_scalar(buf: &[u8]) -> Result { - flatbuffers::root::(buf) -} -#[inline] -/// Verifies that a buffer of bytes contains a size prefixed -/// `Scalar` and returns it. -/// Note that verification is still experimental and may not -/// catch every error, or be maximally performant. For the -/// previous, unchecked, behavior use -/// `size_prefixed_root_as_scalar_unchecked`. -pub fn size_prefixed_root_as_scalar(buf: &[u8]) -> Result { - flatbuffers::size_prefixed_root::(buf) -} -#[inline] -/// Verifies, with the given options, that a buffer of bytes -/// contains a `Scalar` and returns it. -/// Note that verification is still experimental and may not -/// catch every error, or be maximally performant. For the -/// previous, unchecked, behavior use -/// `root_as_scalar_unchecked`. -pub fn root_as_scalar_with_opts<'b, 'o>( - opts: &'o flatbuffers::VerifierOptions, - buf: &'b [u8], -) -> Result, flatbuffers::InvalidFlatbuffer> { - flatbuffers::root_with_opts::>(opts, buf) -} -#[inline] -/// Verifies, with the given verifier options, that a buffer of -/// bytes contains a size prefixed `Scalar` and returns -/// it. Note that verification is still experimental and may not -/// catch every error, or be maximally performant. For the -/// previous, unchecked, behavior use -/// `root_as_scalar_unchecked`. -pub fn size_prefixed_root_as_scalar_with_opts<'b, 'o>( - opts: &'o flatbuffers::VerifierOptions, - buf: &'b [u8], -) -> Result, flatbuffers::InvalidFlatbuffer> { - flatbuffers::size_prefixed_root_with_opts::>(opts, buf) -} -#[inline] -/// Assumes, without verification, that a buffer of bytes contains a Scalar and returns it. -/// # Safety -/// Callers must trust the given bytes do indeed contain a valid `Scalar`. -pub unsafe fn root_as_scalar_unchecked(buf: &[u8]) -> Scalar { - flatbuffers::root_unchecked::(buf) -} -#[inline] -/// Assumes, without verification, that a buffer of bytes contains a size prefixed Scalar and returns it. -/// # Safety -/// Callers must trust the given bytes do indeed contain a valid size prefixed `Scalar`. -pub unsafe fn size_prefixed_root_as_scalar_unchecked(buf: &[u8]) -> Scalar { - flatbuffers::size_prefixed_root_unchecked::(buf) -} -#[inline] -pub fn finish_scalar_buffer<'a, 'b, A: flatbuffers::Allocator + 'a>( - fbb: &'b mut flatbuffers::FlatBufferBuilder<'a, A>, - root: flatbuffers::WIPOffset>) { - fbb.finish(root, None); -} - -#[inline] -pub fn finish_size_prefixed_scalar_buffer<'a, 'b, A: flatbuffers::Allocator + 'a>(fbb: &'b mut flatbuffers::FlatBufferBuilder<'a, A>, root: flatbuffers::WIPOffset>) { - fbb.finish_size_prefixed(root, None); -} diff --git a/vortex-io/Cargo.toml b/vortex-io/Cargo.toml index 4e0f57be89d..cef1c69e351 100644 --- a/vortex-io/Cargo.toml +++ b/vortex-io/Cargo.toml @@ -52,7 +52,6 @@ itertools = { workspace = true } rstest = { workspace = true } tempfile = { workspace = true } tokio = { workspace = true, features = ["full"] } -tracing-subscriber = { workspace = true } [features] object_store = ["dep:object_store", "vortex-error/object_store"] diff --git a/vortex/Cargo.toml b/vortex/Cargo.toml index f31bbda02e2..31f6daf0932 100644 --- a/vortex/Cargo.toml +++ b/vortex/Cargo.toml @@ -20,8 +20,6 @@ all-features = true workspace = true [dependencies] -fastlanes = { workspace = true } -rand = { workspace = true } vortex-alp = { workspace = true } vortex-array = { workspace = true } vortex-btrblocks = { workspace = true } @@ -58,9 +56,11 @@ vortex-zstd = { workspace = true, optional = true } anyhow = { workspace = true } arrow-array = { workspace = true } divan = { workspace = true } +fastlanes = { workspace = true } itertools = { workspace = true } mimalloc = { workspace = true } parquet = { workspace = true } +rand = { workspace = true } serde_json = { workspace = true } tokio = { workspace = true, features = ["full"] } tracing = { workspace = true }