Skip to content

Commit a817fdb

Browse files
committed
cleanups, use vortex-vector BinaryView
Signed-off-by: Andrew Duffy <[email protected]>
1 parent 48a2569 commit a817fdb

File tree

28 files changed

+71
-318
lines changed

28 files changed

+71
-318
lines changed

Cargo.lock

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

encodings/dict/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ vortex-fsst = { workspace = true, optional = true }
3434
vortex-mask = { workspace = true }
3535
vortex-scalar = { workspace = true }
3636
vortex-utils = { workspace = true }
37+
vortex-vector = { workspace = true }
3738

3839
[lints]
3940
workspace = true

encodings/dict/src/builders/bytes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ use std::mem;
66
use std::sync::Arc;
77

88
use vortex_array::accessor::ArrayAccessor;
9-
use vortex_array::arrays::binary_view::BinaryView;
109
use vortex_array::arrays::{PrimitiveArray, VarBinVTable, VarBinViewArray, VarBinViewVTable};
1110
use vortex_array::validity::Validity;
1211
use vortex_array::{Array, ArrayRef, IntoArray};
1312
use vortex_buffer::{BitBufferMut, BufferMut, ByteBufferMut};
1413
use vortex_dtype::{DType, UnsignedPType};
1514
use vortex_error::{VortexExpect, VortexResult, VortexUnwrap, vortex_bail, vortex_panic};
1615
use vortex_utils::aliases::hash_map::{DefaultHashBuilder, HashTable, HashTableEntry, RandomState};
16+
use vortex_vector::binaryview::BinaryView;
1717

1818
use super::DictConstraints;
1919
use crate::builders::DictEncoder;

encodings/fsst/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ vortex-dtype = { workspace = true }
2626
vortex-error = { workspace = true }
2727
vortex-mask = { workspace = true }
2828
vortex-scalar = { workspace = true }
29+
vortex-vector = { workspace = true }
2930

3031
[dev-dependencies]
3132
divan = { workspace = true }

encodings/fsst/src/canonical.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
use std::sync::Arc;
55

66
use vortex_array::arrays::VarBinViewArray;
7-
use vortex_array::arrays::binary_view::BinaryView;
87
use vortex_array::builders::{ArrayBuilder, VarBinViewBuilder};
98
use vortex_array::vtable::{CanonicalVTable, ValidityHelper};
109
use vortex_array::{Canonical, IntoArray, ToCanonical};
1110
use vortex_buffer::{Buffer, BufferMut, ByteBuffer, ByteBufferMut};
1211
use vortex_dtype::match_each_integer_ptype;
12+
use vortex_vector::binaryview::BinaryView;
1313

1414
use crate::{FSSTArray, FSSTVTable};
1515

encodings/sparse/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ vortex-dtype = { workspace = true }
2626
vortex-error = { workspace = true }
2727
vortex-mask = { workspace = true }
2828
vortex-scalar = { workspace = true }
29+
vortex-vector = { workspace = true }
2930

3031
[dev-dependencies]
3132
itertools = { workspace = true }

encodings/sparse/src/canonical.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use std::sync::Arc;
55

66
use itertools::Itertools;
77
use num_traits::NumCast;
8-
use vortex_array::arrays::binary_view::BinaryView;
98
use vortex_array::arrays::{
109
BoolArray, ConstantArray, FixedSizeListArray, ListViewArray, NullArray, PrimitiveArray,
1110
StructArray, VarBinViewArray,
@@ -24,6 +23,7 @@ use vortex_dtype::{
2423
};
2524
use vortex_error::{VortexError, VortexExpect, vortex_panic};
2625
use vortex_scalar::{DecimalScalar, ListScalar, Scalar, StructScalar};
26+
use vortex_vector::binaryview::BinaryView;
2727

2828
use crate::{SparseArray, SparseVTable};
2929

encodings/zstd/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ vortex-error = { workspace = true }
2626
vortex-mask = { workspace = true }
2727
vortex-scalar = { workspace = true }
2828
vortex-sparse = { workspace = true }
29+
vortex-vector = { workspace = true }
2930
zstd = { workspace = true }
3031

3132
[dev-dependencies]

encodings/zstd/src/array.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use std::sync::Arc;
88

99
use itertools::Itertools as _;
1010
use vortex_array::accessor::ArrayAccessor;
11-
use vortex_array::arrays::binary_view::BinaryView;
1211
use vortex_array::arrays::{ConstantArray, PrimitiveArray, VarBinViewArray};
1312
use vortex_array::compute::filter;
1413
use vortex_array::stats::{ArrayStats, StatsSetRef};
@@ -26,6 +25,7 @@ use vortex_dtype::DType;
2625
use vortex_error::{VortexError, VortexExpect, VortexResult, vortex_err, vortex_panic};
2726
use vortex_mask::AllOr;
2827
use vortex_scalar::Scalar;
28+
use vortex_vector::binaryview::BinaryView;
2929

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

vortex-array/src/arrays/constant/vtable/canonical.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ use vortex_error::VortexExpect;
1212
use vortex_scalar::{
1313
BinaryScalar, BoolScalar, DecimalValue, ExtScalar, ListScalar, Scalar, StructScalar, Utf8Scalar,
1414
};
15+
use vortex_vector::binaryview::BinaryView;
1516

16-
use crate::arrays::binary_view::BinaryView;
1717
use crate::arrays::constant::ConstantArray;
1818
use crate::arrays::primitive::PrimitiveArray;
1919
use crate::arrays::{
@@ -172,7 +172,7 @@ fn constant_canonical_byte_view(
172172
) -> VarBinViewArray {
173173
match scalar_bytes {
174174
None => {
175-
let views = buffer![BinaryView::from(0_u128); len];
175+
let views = buffer![BinaryView::empty_view(); len];
176176

177177
// SAFETY: for all-null the views and buffers are just zeroed, never accessed.
178178
unsafe {

0 commit comments

Comments
 (0)