Skip to content

Commit 491c176

Browse files
authored
Namespace encodings inside vortex (#1803)
1 parent 4eda890 commit 491c176

File tree

5 files changed

+28
-24
lines changed

5 files changed

+28
-24
lines changed

bench-vortex/benches/compressor_throughput.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ use vortex::aliases::hash_set::HashSet;
77
use vortex::array::{ConstantArray, VarBinViewArray};
88
use vortex::buffer::Buffer;
99
use vortex::compute::{compare, try_cast, Operator};
10-
use vortex::dict::{dict_encode_varbinview, DictArray};
1110
use vortex::dtype::PType;
12-
use vortex::fsst::{fsst_compress, fsst_train_compressor};
11+
use vortex::encodings::dict::{dict_encode_varbinview, DictArray};
12+
use vortex::encodings::fsst::{fsst_compress, fsst_train_compressor};
1313
use vortex::sampling_compressor::compressors::alp::ALPCompressor;
1414
use vortex::sampling_compressor::compressors::alp_rd::ALPRDCompressor;
1515
use vortex::sampling_compressor::compressors::bitpacked::{

bench-vortex/benches/datafusion.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ use datafusion::prelude::{col, DataFrame, SessionContext};
1313
use datafusion_common::Result as DFResult;
1414
use vortex::aliases::hash_set::HashSet;
1515
use vortex::compress::CompressionStrategy;
16-
use vortex::dict::DictEncoding;
1716
use vortex::encoding::EncodingRef;
18-
use vortex::fastlanes::{BitPackedEncoding, DeltaEncoding, FoREncoding};
17+
use vortex::encodings::dict::DictEncoding;
18+
use vortex::encodings::fastlanes::{BitPackedEncoding, DeltaEncoding, FoREncoding};
1919
use vortex::sampling_compressor::compressors::bitpacked::BITPACK_WITH_PATCHES;
2020
use vortex::sampling_compressor::compressors::delta::DeltaCompressor;
2121
use vortex::sampling_compressor::compressors::dict::DictCompressor;

bench-vortex/src/bin/notimplemented.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ use std::process::ExitCode;
44
use std::sync::Arc;
55

66
use prettytable::{Cell, Row, Table};
7-
use vortex::alp::{ALPArray, Exponents, RDEncoder};
87
use vortex::array::builder::VarBinBuilder;
98
use vortex::array::{
109
BoolArray, ChunkedArray, ConstantArray, NullArray, PrimitiveArray, SparseArray, StructArray,
1110
VarBinViewArray,
1211
};
1312
use vortex::buffer::buffer;
14-
use vortex::bytebool::ByteBoolArray;
1513
use vortex::datetime_dtype::{TemporalMetadata, TimeUnit, TIME_ID};
16-
use vortex::datetime_parts::DateTimePartsArray;
17-
use vortex::dict::DictArray;
1814
use vortex::dtype::{DType, ExtDType, Nullability, PType};
19-
use vortex::fastlanes::{BitPackedArray, DeltaArray, FoRArray};
20-
use vortex::fsst::{fsst_compress, fsst_train_compressor};
21-
use vortex::roaring::{Bitmap, RoaringBoolArray, RoaringIntArray};
22-
use vortex::runend::RunEndArray;
23-
use vortex::runend_bool::RunEndBoolArray;
15+
use vortex::encodings::alp::{ALPArray, Exponents, RDEncoder};
16+
use vortex::encodings::bytebool::ByteBoolArray;
17+
use vortex::encodings::datetime_parts::DateTimePartsArray;
18+
use vortex::encodings::dict::DictArray;
19+
use vortex::encodings::fastlanes::{BitPackedArray, DeltaArray, FoRArray};
20+
use vortex::encodings::fsst::{fsst_compress, fsst_train_compressor};
21+
use vortex::encodings::roaring::{Bitmap, RoaringBoolArray, RoaringIntArray};
22+
use vortex::encodings::runend::RunEndArray;
23+
use vortex::encodings::runend_bool::RunEndBoolArray;
24+
use vortex::encodings::zigzag::ZigZagArray;
2425
use vortex::scalar::Scalar;
2526
use vortex::validity::Validity;
26-
use vortex::zigzag::ZigZagArray;
2727
use vortex::{ArrayData, IntoArrayData};
2828

2929
fn fsst_array() -> ArrayData {

bench-vortex/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use vortex::array::ChunkedArray;
2323
use vortex::arrow::FromArrowType;
2424
use vortex::compress::CompressionStrategy;
2525
use vortex::dtype::DType;
26-
use vortex::fastlanes::DeltaEncoding;
26+
use vortex::encodings::fastlanes::DeltaEncoding;
2727
use vortex::sampling_compressor::SamplingCompressor;
2828
use vortex::{ArrayData, Context, ContextRef, IntoArrayData};
2929

vortex/src/lib.rs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
pub use vortex_array::*;
2-
#[cfg(not(target_arch = "wasm32"))]
3-
pub use vortex_roaring as roaring;
42
pub use {
5-
vortex_alp as alp, vortex_buffer as buffer, vortex_bytebool as bytebool,
6-
vortex_datetime_dtype as datetime_dtype, vortex_datetime_parts as datetime_parts,
7-
vortex_dict as dict, vortex_dtype as dtype, vortex_error as error, vortex_expr as expr,
8-
vortex_fastlanes as fastlanes, vortex_file as file, vortex_flatbuffers as flatbuffers,
9-
vortex_fsst as fsst, vortex_io as io, vortex_ipc as ipc, vortex_proto as proto,
10-
vortex_runend as runend, vortex_runend_bool as runend_bool,
3+
vortex_buffer as buffer, vortex_datetime_dtype as datetime_dtype, vortex_dtype as dtype,
4+
vortex_error as error, vortex_expr as expr, vortex_file as file,
5+
vortex_flatbuffers as flatbuffers, vortex_io as io, vortex_ipc as ipc, vortex_proto as proto,
116
vortex_sampling_compressor as sampling_compressor, vortex_scalar as scalar,
12-
vortex_zigzag as zigzag,
137
};
8+
9+
pub mod encodings {
10+
#[cfg(not(target_arch = "wasm32"))]
11+
pub use vortex_roaring as roaring;
12+
pub use {
13+
vortex_alp as alp, vortex_bytebool as bytebool, vortex_datetime_parts as datetime_parts,
14+
vortex_dict as dict, vortex_fastlanes as fastlanes, vortex_fsst as fsst,
15+
vortex_runend as runend, vortex_runend_bool as runend_bool, vortex_zigzag as zigzag,
16+
};
17+
}

0 commit comments

Comments
 (0)