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
3 changes: 2 additions & 1 deletion encodings/sequence/src/operator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ use vortex_array::vtable::OperatorVTable;
use vortex_dtype::{NativePType, match_each_native_ptype};
use vortex_error::{VortexExpect, VortexResult};
use vortex_mask::AllOr;
use vortex_vector::{PVectorMut, Vector, VectorMutOps};
use vortex_vector::primitive::PVectorMut;
use vortex_vector::{Vector, VectorMutOps};

use crate::{SequenceArray, SequenceVTable};

Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/bool/vtable/operator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use vortex_compute::filter::Filter;
use vortex_error::VortexResult;
use vortex_vector::BoolVector;
use vortex_vector::bool::BoolVector;

use crate::arrays::{BoolArray, BoolVTable, MaskedVTable};
use crate::execution::{BatchKernelRef, BindCtx, kernel};
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/null/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use vortex_dtype::DType;
use vortex_error::VortexResult;
use vortex_mask::Mask;
use vortex_scalar::Scalar;
use vortex_vector::NullVector;
use vortex_vector::null::NullVector;

use crate::execution::{BatchKernelRef, BindCtx, kernel};
use crate::serde::ArrayChildren;
Expand Down
5 changes: 3 additions & 2 deletions vortex-array/src/arrays/primitive/array/conversion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
use vortex_buffer::{BitBufferMut, Buffer, BufferMut};
use vortex_dtype::{NativePType, Nullability};
use vortex_error::{VortexResult, vortex_ensure, vortex_panic};
use vortex_vector::{PrimitiveVector, VectorOps, match_each_pvector};
use vortex_vector::primitive::PrimitiveVector;
use vortex_vector::{VectorOps, match_each_pvector};

use crate::arrays::PrimitiveArray;
use crate::validity::Validity;
Expand Down Expand Up @@ -142,7 +143,7 @@ mod tests {
use vortex_buffer::BufferMut;
use vortex_dtype::{Nullability, PType};
use vortex_mask::MaskMut;
use vortex_vector::PVector;
use vortex_vector::primitive::PVector;

use super::*;

Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/primitive/vtable/operator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use vortex_compute::filter::Filter;
use vortex_dtype::match_each_native_ptype;
use vortex_error::VortexResult;
use vortex_vector::PVector;
use vortex_vector::primitive::PVector;

use crate::arrays::{MaskedVTable, PrimitiveArray, PrimitiveVTable};
use crate::execution::{BatchKernelRef, BindCtx, kernel};
Expand Down
3 changes: 2 additions & 1 deletion vortex-array/src/arrays/struct_/vtable/operator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
use std::sync::Arc;

use vortex_error::VortexResult;
use vortex_vector::{StructVector, Vector};
use vortex_vector::Vector;
use vortex_vector::struct_::StructVector;

use crate::ArrayRef;
use crate::arrays::{StructArray, StructVTable};
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/compute/arrays/arithmetic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use vortex_compute::arithmetic::{
use vortex_dtype::{DType, NativePType, PTypeDowncastExt, match_each_native_ptype};
use vortex_error::{VortexExpect, VortexResult, vortex_err};
use vortex_scalar::{PValue, Scalar};
use vortex_vector::PVector;
use vortex_vector::primitive::PVector;

use crate::arrays::ConstantArray;
use crate::execution::{BatchKernelRef, BindCtx, kernel};
Expand Down
3 changes: 2 additions & 1 deletion vortex-array/src/compute/arrays/is_not_null.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ use vortex_dtype::DType;
use vortex_dtype::Nullability::NonNullable;
use vortex_error::VortexResult;
use vortex_mask::Mask;
use vortex_vector::{BoolVector, VectorOps};
use vortex_vector::VectorOps;
use vortex_vector::bool::BoolVector;

use crate::execution::{BatchKernelRef, BindCtx, kernel};
use crate::stats::{ArrayStats, StatsSetRef};
Expand Down
3 changes: 2 additions & 1 deletion vortex-array/src/compute/arrays/is_null.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ use vortex_dtype::DType;
use vortex_dtype::Nullability::NonNullable;
use vortex_error::VortexResult;
use vortex_mask::Mask;
use vortex_vector::{BoolVector, VectorOps};
use vortex_vector::VectorOps;
use vortex_vector::bool::BoolVector;

use crate::execution::{BatchKernelRef, BindCtx, kernel};
use crate::stats::{ArrayStats, StatsSetRef};
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/compute/arrays/logical.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use vortex_compute::logical::{
};
use vortex_dtype::DType;
use vortex_error::VortexResult;
use vortex_vector::BoolVector;
use vortex_vector::bool::BoolVector;

use crate::execution::{BatchKernelRef, BindCtx, kernel};
use crate::serde::ArrayChildren;
Expand Down
6 changes: 4 additions & 2 deletions vortex-compute/src/arithmetic/pvector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ use std::ops::BitAnd;

use vortex_buffer::{Buffer, BufferMut};
use vortex_dtype::NativePType;
use vortex_vector::{PVector, PVectorMut, VectorMutOps, VectorOps};
use vortex_vector::primitive::{PVector, PVectorMut};
use vortex_vector::{VectorMutOps, VectorOps};

use crate::arithmetic::{Arithmetic, Operator};

Expand Down Expand Up @@ -125,7 +126,8 @@ where
mod tests {
use vortex_buffer::buffer;
use vortex_mask::Mask;
use vortex_vector::{PVector, VectorOps};
use vortex_vector::VectorOps;
use vortex_vector::primitive::PVector;

use crate::arithmetic::{Arithmetic, WrappingAdd, WrappingMul, WrappingSub};

Expand Down
6 changes: 4 additions & 2 deletions vortex-compute/src/arithmetic/pvector_checked.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ use std::ops::BitAnd;

use vortex_buffer::{Buffer, BufferMut};
use vortex_dtype::NativePType;
use vortex_vector::{PVector, PVectorMut, VectorMutOps, VectorOps};
use vortex_vector::primitive::{PVector, PVectorMut};
use vortex_vector::{VectorMutOps, VectorOps};

use crate::arithmetic::CheckedArithmetic;

Expand Down Expand Up @@ -122,7 +123,8 @@ where
mod tests {
use vortex_buffer::buffer;
use vortex_mask::Mask;
use vortex_vector::{PVector, VectorOps};
use vortex_vector::VectorOps;
use vortex_vector::primitive::PVector;

use crate::arithmetic::{Add, CheckedArithmetic, Div, Mul, Sub};

Expand Down
2 changes: 1 addition & 1 deletion vortex-compute/src/arrow/binaryview.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::sync::Arc;
use arrow_array::{ArrayRef, GenericByteViewArray};
use vortex_buffer::Buffer;
use vortex_error::VortexResult;
use vortex_vector::{BinaryType, BinaryViewVector, StringType};
use vortex_vector::binaryview::{BinaryType, BinaryViewVector, StringType};

use crate::arrow::IntoArrow;

Expand Down
2 changes: 1 addition & 1 deletion vortex-compute/src/arrow/bool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::sync::Arc;

use arrow_array::{ArrayRef, BooleanArray};
use vortex_error::VortexResult;
use vortex_vector::BoolVector;
use vortex_vector::bool::BoolVector;

use crate::arrow::IntoArrow;

Expand Down
2 changes: 1 addition & 1 deletion vortex-compute/src/arrow/decimal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use arrow_array::{ArrayRef, PrimitiveArray};
use vortex_buffer::Buffer;
use vortex_dtype::i256;
use vortex_error::VortexResult;
use vortex_vector::{DVector, DecimalVector};
use vortex_vector::decimal::{DVector, DecimalVector};

use crate::arrow::IntoArrow;

Expand Down
2 changes: 1 addition & 1 deletion vortex-compute/src/arrow/fixed_size_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::sync::Arc;
use arrow_array::{ArrayRef, FixedSizeListArray};
use arrow_schema::Field;
use vortex_error::VortexResult;
use vortex_vector::FixedSizeListVector;
use vortex_vector::fixed_size_list::FixedSizeListVector;

use crate::arrow::IntoArrow;

Expand Down
3 changes: 2 additions & 1 deletion vortex-compute/src/arrow/null.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ use std::sync::Arc;

use arrow_array::{ArrayRef, NullArray};
use vortex_error::VortexResult;
use vortex_vector::{NullVector, VectorOps};
use vortex_vector::VectorOps;
use vortex_vector::null::NullVector;

use crate::arrow::IntoArrow;

Expand Down
3 changes: 2 additions & 1 deletion vortex-compute/src/arrow/primitive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ use arrow_array::types::{
use arrow_array::{ArrayRef, PrimitiveArray};
use vortex_dtype::half::f16;
use vortex_error::VortexResult;
use vortex_vector::{PVector, PrimitiveVector, match_each_pvector};
use vortex_vector::match_each_pvector;
use vortex_vector::primitive::{PVector, PrimitiveVector};

use crate::arrow::IntoArrow;

Expand Down
3 changes: 2 additions & 1 deletion vortex-compute/src/arrow/struct_.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ use std::sync::Arc;
use arrow_array::{ArrayRef, StructArray};
use arrow_schema::{Field, Fields};
use vortex_error::VortexResult;
use vortex_vector::{StructVector, VectorOps};
use vortex_vector::VectorOps;
use vortex_vector::struct_::StructVector;

use crate::arrow::IntoArrow;

Expand Down
3 changes: 2 additions & 1 deletion vortex-compute/src/comparison/bool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
use std::ops::BitAnd;

use vortex_buffer::{BitBuffer, BufferMut};
use vortex_vector::{BoolVector, VectorOps};
use vortex_vector::VectorOps;
use vortex_vector::bool::BoolVector;

use crate::comparison::{
Compare, Equal, GreaterThan, GreaterThanOrEqual, LessThan, LessThanOrEqual, NotEqual,
Expand Down
4 changes: 3 additions & 1 deletion vortex-compute/src/comparison/pvector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
use std::ops::BitAnd;

use vortex_dtype::NativePType;
use vortex_vector::{BoolVector, PVector, VectorOps};
use vortex_vector::VectorOps;
use vortex_vector::bool::BoolVector;
use vortex_vector::primitive::PVector;

use crate::comparison::collection::ComparableCollectionAdapter;
use crate::comparison::{Compare, ComparisonOperator};
Expand Down
3 changes: 2 additions & 1 deletion vortex-compute/src/filter/bool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
// SPDX-FileCopyrightText: Copyright the Vortex contributors

use vortex_mask::Mask;
use vortex_vector::{BoolVector, VectorOps};
use vortex_vector::VectorOps;
use vortex_vector::bool::BoolVector;

use crate::filter::Filter;

Expand Down
5 changes: 3 additions & 2 deletions vortex-compute/src/logical/and.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

use std::ops::BitAnd;

use vortex_vector::{BoolVector, VectorOps};
use vortex_vector::VectorOps;
use vortex_vector::bool::BoolVector;

use crate::logical::LogicalAnd;

Expand Down Expand Up @@ -31,7 +32,7 @@ impl LogicalAnd<&BoolVector> for BoolVector {
mod tests {
use vortex_buffer::bitbuffer;
use vortex_mask::Mask;
use vortex_vector::BoolVector;
use vortex_vector::bool::BoolVector;

use super::*;

Expand Down
5 changes: 3 additions & 2 deletions vortex-compute/src/logical/and_kleene.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ use std::ops::{BitAnd, BitOr, Not};

use vortex_buffer::BitBuffer;
use vortex_mask::Mask;
use vortex_vector::{BoolVector, VectorOps};
use vortex_vector::VectorOps;
use vortex_vector::bool::BoolVector;

use crate::logical::LogicalAndKleene;

Expand Down Expand Up @@ -106,7 +107,7 @@ impl LogicalAndKleene<&BoolVector> for BoolVector {
mod tests {
use vortex_buffer::bitbuffer;
use vortex_mask::Mask;
use vortex_vector::BoolVector;
use vortex_vector::bool::BoolVector;

use super::*;

Expand Down
5 changes: 3 additions & 2 deletions vortex-compute/src/logical/and_not.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

use std::ops::BitAnd;

use vortex_vector::{BoolVector, VectorOps};
use vortex_vector::VectorOps;
use vortex_vector::bool::BoolVector;

use crate::logical::LogicalAndNot;

Expand Down Expand Up @@ -31,7 +32,7 @@ impl LogicalAndNot<&BoolVector> for BoolVector {
mod tests {
use vortex_buffer::bitbuffer;
use vortex_mask::Mask;
use vortex_vector::BoolVector;
use vortex_vector::bool::BoolVector;

use super::*;

Expand Down
5 changes: 3 additions & 2 deletions vortex-compute/src/logical/not.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

use std::ops::Not;

use vortex_vector::{BoolVector, BoolVectorMut, VectorOps};
use vortex_vector::VectorOps;
use vortex_vector::bool::{BoolVector, BoolVectorMut};

use crate::logical::LogicalNot;

Expand Down Expand Up @@ -43,7 +44,7 @@ impl LogicalNot for BoolVectorMut {
mod tests {
use vortex_buffer::bitbuffer;
use vortex_mask::Mask;
use vortex_vector::BoolVector;
use vortex_vector::bool::BoolVector;

use super::*;

Expand Down
5 changes: 3 additions & 2 deletions vortex-compute/src/logical/or.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

use std::ops::{BitAnd, BitOr};

use vortex_vector::{BoolVector, VectorOps};
use vortex_vector::VectorOps;
use vortex_vector::bool::BoolVector;

use crate::logical::LogicalOr;

Expand Down Expand Up @@ -31,7 +32,7 @@ impl LogicalOr<&BoolVector> for BoolVector {
mod tests {
use vortex_buffer::bitbuffer;
use vortex_mask::Mask;
use vortex_vector::BoolVector;
use vortex_vector::bool::BoolVector;

use super::*;

Expand Down
5 changes: 3 additions & 2 deletions vortex-compute/src/logical/or_kleene.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ use std::ops::{BitAnd, BitOr, Not};

use vortex_buffer::BitBuffer;
use vortex_mask::Mask;
use vortex_vector::{BoolVector, VectorOps};
use vortex_vector::VectorOps;
use vortex_vector::bool::BoolVector;

use crate::logical::LogicalOrKleene;

Expand Down Expand Up @@ -106,7 +107,7 @@ impl LogicalOrKleene<&BoolVector> for BoolVector {
mod tests {
use vortex_buffer::bitbuffer;
use vortex_mask::Mask;
use vortex_vector::BoolVector;
use vortex_vector::bool::BoolVector;

use super::*;

Expand Down
13 changes: 8 additions & 5 deletions vortex-compute/src/mask/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ use std::ops::BitAnd;

use vortex_dtype::{NativeDecimalType, NativePType};
use vortex_mask::Mask;
use vortex_vector::{
BinaryViewType, BinaryViewVector, BoolVector, DVector, DecimalVector, FixedSizeListVector,
NullVector, PVector, PrimitiveVector, StructVector, Vector, match_each_dvector,
match_each_pvector, match_each_vector,
};
use vortex_vector::binaryview::{BinaryViewType, BinaryViewVector};
use vortex_vector::bool::BoolVector;
use vortex_vector::decimal::{DVector, DecimalVector};
use vortex_vector::fixed_size_list::FixedSizeListVector;
use vortex_vector::null::NullVector;
use vortex_vector::primitive::{PVector, PrimitiveVector};
use vortex_vector::struct_::StructVector;
use vortex_vector::{Vector, match_each_dvector, match_each_pvector, match_each_vector};

/// Trait for masking the validity of an array or vector.
pub trait MaskValidity {
Expand Down
3 changes: 2 additions & 1 deletion vortex-vector/src/binaryview/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

use std::fmt::Debug;

use crate::{BinaryViewVector, BinaryViewVectorMut, Vector, VectorMut};
use crate::binaryview::{BinaryViewVector, BinaryViewVectorMut};
use crate::{Vector, VectorMut};

impl<T: BinaryViewType> From<BinaryViewVector<T>> for Vector {
fn from(value: BinaryViewVector<T>) -> Self {
Expand Down
3 changes: 2 additions & 1 deletion vortex-vector/src/binaryview/vector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ impl<T: BinaryViewType> VectorOps for BinaryViewVector<T> {

#[cfg(test)]
mod tests {
use crate::{StringVectorMut, VectorMutOps, VectorOps};
use crate::binaryview::StringVectorMut;
use crate::{VectorMutOps, VectorOps};

#[test]
fn test_try_into_mut() {
Expand Down
Loading
Loading