Skip to content

Commit 6a34208

Browse files
gatesngatesn
authored
Public array modules (#6834)
We were running into naming conflicts by using `pub use primitive::*` etc for all arrays. This PR instead exports the modules as pub, and to minimize the user-facing break continues to explicitly re-export the FooArray and FooVTable for each array. --------- Signed-off-by: Nicholas Gates <nick@nickgates.com>
1 parent edec459 commit 6a34208

289 files changed

Lines changed: 5416 additions & 2104 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎benchmarks/compress-bench/src/lib.rs‎

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

66
use ::vortex::array::arrays::ChunkedArray;
7-
use ::vortex::array::arrays::recursive_list_from_list_view;
7+
use ::vortex::array::arrays::listview::recursive_list_from_list_view;
88
use arrow_array::RecordBatch;
99
use arrow_schema::Schema;
1010
#[cfg(feature = "lance")]

‎encodings/alp/src/alp/compute/filter.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use vortex_array::ArrayRef;
55
use vortex_array::ExecutionCtx;
66
use vortex_array::IntoArray;
7-
use vortex_array::arrays::FilterKernel;
7+
use vortex_array::arrays::filter::FilterKernel;
88
use vortex_error::VortexResult;
99
use vortex_mask::Mask;
1010

‎encodings/alp/src/alp/compute/slice.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::ops::Range;
66
use vortex_array::ArrayRef;
77
use vortex_array::ExecutionCtx;
88
use vortex_array::IntoArray;
9-
use vortex_array::arrays::SliceKernel;
9+
use vortex_array::arrays::slice::SliceKernel;
1010
use vortex_error::VortexResult;
1111

1212
use crate::ALPArray;

‎encodings/alp/src/alp/compute/take.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use vortex_array::ArrayRef;
55
use vortex_array::DynArray;
66
use vortex_array::ExecutionCtx;
77
use vortex_array::IntoArray;
8-
use vortex_array::arrays::TakeExecute;
8+
use vortex_array::arrays::dict::TakeExecute;
99
use vortex_error::VortexResult;
1010

1111
use crate::ALPArray;

‎encodings/alp/src/alp/decompress.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use std::mem::transmute;
66
use vortex_array::ExecutionCtx;
77
use vortex_array::ToCanonical;
88
use vortex_array::arrays::PrimitiveArray;
9-
use vortex_array::arrays::chunk_range;
10-
use vortex_array::arrays::patch_chunk;
9+
use vortex_array::arrays::primitive::chunk_range;
10+
use vortex_array::arrays::primitive::patch_chunk;
1111
use vortex_array::dtype::DType;
1212
use vortex_array::match_each_unsigned_integer_ptype;
1313
use vortex_array::patches::Patches;

‎encodings/alp/src/alp/rules.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// SPDX-FileCopyrightText: Copyright the Vortex contributors
33

4-
use vortex_array::arrays::FilterExecuteAdaptor;
5-
use vortex_array::arrays::SliceExecuteAdaptor;
6-
use vortex_array::arrays::TakeExecuteAdaptor;
4+
use vortex_array::arrays::dict::TakeExecuteAdaptor;
5+
use vortex_array::arrays::filter::FilterExecuteAdaptor;
6+
use vortex_array::arrays::slice::SliceExecuteAdaptor;
77
use vortex_array::kernel::ParentKernelSet;
88
use vortex_array::optimizer::rules::ParentRuleSet;
99
use vortex_array::scalar_fn::fns::between::BetweenReduceAdaptor;

‎encodings/alp/src/alp_rd/compute/filter.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use vortex_array::ArrayRef;
55
use vortex_array::ExecutionCtx;
66
use vortex_array::IntoArray;
7-
use vortex_array::arrays::FilterKernel;
7+
use vortex_array::arrays::filter::FilterKernel;
88
use vortex_error::VortexResult;
99
use vortex_mask::Mask;
1010

‎encodings/alp/src/alp_rd/compute/mask.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
use vortex_array::ArrayRef;
55
use vortex_array::IntoArray;
6-
use vortex_array::arrays::ScalarFnArrayExt;
6+
use vortex_array::arrays::scalar_fn::ScalarFnArrayExt;
77
use vortex_array::scalar_fn::EmptyOptions;
88
use vortex_array::scalar_fn::fns::mask::Mask as MaskExpr;
99
use vortex_array::scalar_fn::fns::mask::MaskReduce;

‎encodings/alp/src/alp_rd/compute/take.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use vortex_array::ArrayRef;
55
use vortex_array::DynArray;
66
use vortex_array::ExecutionCtx;
77
use vortex_array::IntoArray;
8-
use vortex_array::arrays::TakeExecute;
8+
use vortex_array::arrays::dict::TakeExecute;
99
use vortex_array::builtins::ArrayBuiltins;
1010
use vortex_array::scalar::Scalar;
1111
use vortex_error::VortexResult;

‎encodings/alp/src/alp_rd/kernel.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// SPDX-FileCopyrightText: Copyright the Vortex contributors
33

4-
use vortex_array::arrays::FilterExecuteAdaptor;
5-
use vortex_array::arrays::SliceExecuteAdaptor;
6-
use vortex_array::arrays::TakeExecuteAdaptor;
4+
use vortex_array::arrays::dict::TakeExecuteAdaptor;
5+
use vortex_array::arrays::filter::FilterExecuteAdaptor;
6+
use vortex_array::arrays::slice::SliceExecuteAdaptor;
77
use vortex_array::kernel::ParentKernelSet;
88

99
use crate::alp_rd::ALPRDVTable;

0 commit comments

Comments
 (0)