Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions encodings/dict/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ vortex-fsst = { workspace = true, optional = true }
vortex-mask = { workspace = true }
vortex-scalar = { workspace = true }
vortex-utils = { workspace = true }
vortex-vector = { workspace = true }

[lints]
workspace = true
Expand Down
2 changes: 1 addition & 1 deletion encodings/dict/src/builders/bytes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ use std::mem;
use std::sync::Arc;

use vortex_array::accessor::ArrayAccessor;
use vortex_array::arrays::binary_view::BinaryView;
use vortex_array::arrays::{PrimitiveArray, VarBinVTable, VarBinViewArray, VarBinViewVTable};
use vortex_array::validity::Validity;
use vortex_array::{Array, ArrayRef, IntoArray};
use vortex_buffer::{BitBufferMut, BufferMut, ByteBufferMut};
use vortex_dtype::{DType, UnsignedPType};
use vortex_error::{VortexExpect, VortexResult, VortexUnwrap, vortex_bail, vortex_panic};
use vortex_utils::aliases::hash_map::{DefaultHashBuilder, HashTable, HashTableEntry, RandomState};
use vortex_vector::binaryview::BinaryView;

use super::DictConstraints;
use crate::builders::DictEncoder;
Expand Down
1 change: 1 addition & 0 deletions encodings/fsst/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ vortex-dtype = { workspace = true }
vortex-error = { workspace = true }
vortex-mask = { workspace = true }
vortex-scalar = { workspace = true }
vortex-vector = { workspace = true }

[dev-dependencies]
divan = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion encodings/fsst/src/canonical.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
use std::sync::Arc;

use vortex_array::arrays::VarBinViewArray;
use vortex_array::arrays::binary_view::BinaryView;
use vortex_array::builders::{ArrayBuilder, VarBinViewBuilder};
use vortex_array::vtable::{CanonicalVTable, ValidityHelper};
use vortex_array::{Canonical, IntoArray, ToCanonical};
use vortex_buffer::{Buffer, BufferMut, ByteBuffer, ByteBufferMut};
use vortex_dtype::match_each_integer_ptype;
use vortex_vector::binaryview::BinaryView;

use crate::{FSSTArray, FSSTVTable};

Expand Down
1 change: 1 addition & 0 deletions encodings/sparse/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ vortex-dtype = { workspace = true }
vortex-error = { workspace = true }
vortex-mask = { workspace = true }
vortex-scalar = { workspace = true }
vortex-vector = { workspace = true }

[dev-dependencies]
itertools = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion encodings/sparse/src/canonical.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use std::sync::Arc;

use itertools::Itertools;
use num_traits::NumCast;
use vortex_array::arrays::binary_view::BinaryView;
use vortex_array::arrays::{
BoolArray, ConstantArray, FixedSizeListArray, ListViewArray, NullArray, PrimitiveArray,
StructArray, VarBinViewArray,
Expand All @@ -24,6 +23,7 @@ use vortex_dtype::{
};
use vortex_error::{VortexError, VortexExpect, vortex_panic};
use vortex_scalar::{DecimalScalar, ListScalar, Scalar, StructScalar};
use vortex_vector::binaryview::BinaryView;

use crate::{SparseArray, SparseVTable};

Expand Down
1 change: 1 addition & 0 deletions encodings/zstd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ vortex-error = { workspace = true }
vortex-mask = { workspace = true }
vortex-scalar = { workspace = true }
vortex-sparse = { workspace = true }
vortex-vector = { workspace = true }
zstd = { workspace = true }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion encodings/zstd/src/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use std::sync::Arc;

use itertools::Itertools as _;
use vortex_array::accessor::ArrayAccessor;
use vortex_array::arrays::binary_view::BinaryView;
use vortex_array::arrays::{ConstantArray, PrimitiveArray, VarBinViewArray};
use vortex_array::compute::filter;
use vortex_array::stats::{ArrayStats, StatsSetRef};
Expand All @@ -26,6 +25,7 @@ use vortex_dtype::DType;
use vortex_error::{VortexError, VortexExpect, VortexResult, vortex_err, vortex_panic};
use vortex_mask::AllOr;
use vortex_scalar::Scalar;
use vortex_vector::binaryview::BinaryView;

use crate::serde::{ZstdFrameMetadata, ZstdMetadata};

Expand Down
4 changes: 2 additions & 2 deletions vortex-array/src/arrays/constant/vtable/canonical.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ use vortex_error::VortexExpect;
use vortex_scalar::{
BinaryScalar, BoolScalar, DecimalValue, ExtScalar, ListScalar, Scalar, StructScalar, Utf8Scalar,
};
use vortex_vector::binaryview::BinaryView;

use crate::arrays::binary_view::BinaryView;
use crate::arrays::constant::ConstantArray;
use crate::arrays::primitive::PrimitiveArray;
use crate::arrays::{
Expand Down Expand Up @@ -172,7 +172,7 @@ fn constant_canonical_byte_view(
) -> VarBinViewArray {
match scalar_bytes {
None => {
let views = buffer![BinaryView::from(0_u128); len];
let views = buffer![BinaryView::empty_view(); len];

// SAFETY: for all-null the views and buffers are just zeroed, never accessed.
unsafe {
Expand Down
5 changes: 1 addition & 4 deletions vortex-array/src/arrays/validation_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ mod tests {

use vortex_buffer::{Buffer, ByteBuffer, buffer};
use vortex_dtype::{DType, Nullability, PType};
use vortex_vector::binaryview::BinaryView;

use crate::IntoArray;
use crate::arrays::*;
Expand Down Expand Up @@ -152,8 +153,6 @@ mod tests {
#[test]
fn test_varbinview_array_validation_success() {
// Valid case: simple inline strings.
use crate::arrays::binary_view::BinaryView;

// Create inline views (length <= 12).
let view1 = BinaryView::new_inlined(b"foo");
let view2 = BinaryView::new_inlined(b"bar");
Expand All @@ -171,8 +170,6 @@ mod tests {
#[test]
fn test_varbinview_array_validation_failure_buffer_index_out_of_bounds() {
// Invalid case: view references non-existent buffer.
use crate::arrays::binary_view::BinaryView;

// Create a view that references buffer 1, but we only have 1 buffer (index 0).
let data = b"this is a long string that needs a buffer";
let view = BinaryView::make_view(data, 1, 0); // Buffer index 1.
Expand Down
3 changes: 2 additions & 1 deletion vortex-array/src/arrays/varbin/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use crate::{EncodingId, EncodingRef, vtable};
mod array;
mod canonical;
mod operations;
mod operator;
mod serde;
mod validity;
mod visitor;
Expand All @@ -24,7 +25,7 @@ impl VTable for VarBinVTable {
type VisitorVTable = Self;
type ComputeVTable = NotSupported;
type EncodeVTable = NotSupported;
type OperatorVTable = NotSupported;
type OperatorVTable = Self;
type SerdeVTable = Self;

fn id(_encoding: &Self::Encoding) -> EncodingId {
Expand Down
Loading
Loading