Skip to content

Commit fcf9858

Browse files
gatesngatesn
committed
Fixes
2 parents d757fb6 + 583bd23 commit fcf9858

File tree

36 files changed

+50
-1258
lines changed

36 files changed

+50
-1258
lines changed

‎encodings/alp/src/alp/array.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use vortex_array::arrays::PrimitiveArray;
44
use vortex_array::patches::Patches;
55
use vortex_array::stats::{ArrayStats, StatsSetRef};
66
use vortex_array::variants::PrimitiveArrayTrait;
7-
use vortex_array::vtable::{EncodingVTable, StatisticsVTable, VTableRef};
7+
use vortex_array::vtable::{EncodingVTable, VTableRef};
88
use vortex_array::{
99
Array, ArrayCanonicalImpl, ArrayExt, ArrayImpl, ArrayRef, ArrayStatisticsImpl,
1010
ArrayValidityImpl, ArrayVariantsImpl, Canonical, Encoding, EncodingId, SerdeMetadata,
@@ -142,8 +142,6 @@ impl ArrayVariantsImpl for ALPArray {
142142

143143
impl PrimitiveArrayTrait for ALPArray {}
144144

145-
impl StatisticsVTable<&ALPArray> for ALPEncoding {}
146-
147145
#[cfg(test)]
148146
mod tests {
149147
use vortex_array::SerdeMetadata;

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use vortex_array::arrays::PrimitiveArray;
44
use vortex_array::patches::Patches;
55
use vortex_array::stats::{ArrayStats, StatsSetRef};
66
use vortex_array::validity::Validity;
7-
use vortex_array::vtable::{EncodingVTable, StatisticsVTable, VTableRef};
7+
use vortex_array::vtable::{EncodingVTable, VTableRef};
88
use vortex_array::{
99
Array, ArrayCanonicalImpl, ArrayImpl, ArrayRef, ArrayStatisticsImpl, ArrayValidityImpl,
1010
Canonical, Encoding, EncodingId, SerdeMetadata, ToCanonical,
@@ -218,8 +218,6 @@ impl ArrayValidityImpl for ALPRDArray {
218218
}
219219
}
220220

221-
impl StatisticsVTable<&ALPRDArray> for ALPRDEncoding {}
222-
223221
#[cfg(test)]
224222
mod test {
225223
use rstest::rstest;

‎encodings/bytebool/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ pub use array::*;
33
mod array;
44
mod compute;
55
mod serde;
6-
mod stats;

‎encodings/bytebool/src/stats.rs

-106
This file was deleted.

‎encodings/datetime-parts/src/compute/is_constant.rs

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
use vortex_array::ArrayStatistics;
2+
use vortex_array::compute::{IsConstantFn, IsConstantOpts};
3+
use vortex_error::VortexResult;
4+
5+
use crate::{DateTimePartsArray, DateTimePartsEncoding};
6+
7+
impl IsConstantFn<&DateTimePartsArray> for DateTimePartsEncoding {
8+
fn is_constant(
9+
&self,
10+
array: &DateTimePartsArray,
11+
_opts: &IsConstantOpts,
12+
) -> VortexResult<Option<bool>> {
13+
Ok(Some(
14+
array.days().is_constant()
15+
&& array.seconds().is_constant()
16+
&& array.subseconds().is_constant(),
17+
))
18+
}
19+
}

‎encodings/datetime-parts/src/compute/mod.rs

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
mod cast;
22
mod compare;
33
mod filter;
4+
mod is_constant;
45
mod take;
56

67
use vortex_array::compute::{
7-
CastFn, CompareFn, FilterKernelAdapter, KernelRef, ScalarAtFn, SliceFn, TakeFn, scalar_at,
8-
slice,
8+
CastFn, CompareFn, FilterKernelAdapter, IsConstantFn, KernelRef, ScalarAtFn, SliceFn, TakeFn,
9+
scalar_at, slice,
910
};
1011
use vortex_array::vtable::ComputeVTable;
1112
use vortex_array::{Array, ArrayComputeImpl, ArrayRef};
@@ -27,19 +28,23 @@ impl ComputeVTable for DateTimePartsEncoding {
2728
Some(self)
2829
}
2930

30-
fn scalar_at_fn(&self) -> Option<&dyn ScalarAtFn<&dyn Array>> {
31+
fn compare_fn(&self) -> Option<&dyn CompareFn<&dyn Array>> {
3132
Some(self)
3233
}
3334

34-
fn slice_fn(&self) -> Option<&dyn SliceFn<&dyn Array>> {
35+
fn is_constant_fn(&self) -> Option<&dyn IsConstantFn<&dyn Array>> {
3536
Some(self)
3637
}
3738

38-
fn take_fn(&self) -> Option<&dyn TakeFn<&dyn Array>> {
39+
fn scalar_at_fn(&self) -> Option<&dyn ScalarAtFn<&dyn Array>> {
3940
Some(self)
4041
}
4142

42-
fn compare_fn(&self) -> Option<&dyn CompareFn<&dyn Array>> {
43+
fn slice_fn(&self) -> Option<&dyn SliceFn<&dyn Array>> {
44+
Some(self)
45+
}
46+
47+
fn take_fn(&self) -> Option<&dyn TakeFn<&dyn Array>> {
4348
Some(self)
4449
}
4550

‎encodings/datetime-parts/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ mod canonical;
66
mod compress;
77
mod compute;
88
mod serde;
9-
mod stats;
109
mod timestamp;

‎encodings/datetime-parts/src/stats.rs

-27
This file was deleted.

‎encodings/dict/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ mod array;
88
pub mod builders;
99
mod compute;
1010
mod serde;
11-
mod stats;
1211
#[cfg(feature = "test-harness")]
1312
pub mod test;
1413
mod variants;

‎encodings/dict/src/stats.rs

-35
This file was deleted.

‎encodings/fastlanes/src/bitpacking/mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use vortex_array::patches::Patches;
88
use vortex_array::stats::{ArrayStats, StatsSetRef};
99
use vortex_array::validity::Validity;
1010
use vortex_array::variants::PrimitiveArrayTrait;
11-
use vortex_array::vtable::{EncodingVTable, StatisticsVTable, VTableRef};
11+
use vortex_array::vtable::{EncodingVTable, VTableRef};
1212
use vortex_array::{
1313
Array, ArrayCanonicalImpl, ArrayExt, ArrayImpl, ArrayStatisticsImpl, ArrayValidityImpl,
1414
ArrayVariantsImpl, Canonical, Encoding, EncodingId, RkyvMetadata, try_from_array_ref,
@@ -295,8 +295,6 @@ impl ArrayVariantsImpl for BitPackedArray {
295295
}
296296
}
297297

298-
impl StatisticsVTable<&BitPackedArray> for BitPackedEncoding {}
299-
300298
impl PrimitiveArrayTrait for BitPackedArray {}
301299

302300
#[cfg(test)]

‎encodings/fastlanes/src/delta/mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use vortex_array::arrays::PrimitiveArray;
55
use vortex_array::stats::{ArrayStats, StatsSetRef};
66
use vortex_array::validity::Validity;
77
use vortex_array::variants::PrimitiveArrayTrait;
8-
use vortex_array::vtable::{EncodingVTable, StatisticsVTable, VTableRef};
8+
use vortex_array::vtable::{EncodingVTable, VTableRef};
99
use vortex_array::{
1010
Array, ArrayCanonicalImpl, ArrayImpl, ArrayRef, ArrayStatisticsImpl, ArrayValidityImpl,
1111
ArrayVariantsImpl, Canonical, Encoding, EncodingId, RkyvMetadata,
@@ -267,5 +267,3 @@ impl ArrayVariantsImpl for DeltaArray {
267267
}
268268

269269
impl PrimitiveArrayTrait for DeltaArray {}
270-
271-
impl StatisticsVTable<&DeltaArray> for DeltaEncoding {}

‎encodings/fastlanes/src/for/mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::fmt::Debug;
33
pub use compress::*;
44
use vortex_array::stats::{ArrayStats, StatsSetRef};
55
use vortex_array::variants::PrimitiveArrayTrait;
6-
use vortex_array::vtable::{EncodingVTable, StatisticsVTable, VTableRef};
6+
use vortex_array::vtable::{EncodingVTable, VTableRef};
77
use vortex_array::{
88
Array, ArrayCanonicalImpl, ArrayImpl, ArrayRef, ArrayStatisticsImpl, ArrayValidityImpl,
99
ArrayVariantsImpl, Canonical, Encoding, EncodingId,
@@ -118,6 +118,4 @@ impl ArrayVariantsImpl for FoRArray {
118118
}
119119
}
120120

121-
impl StatisticsVTable<&FoRArray> for FoREncoding {}
122-
123121
impl PrimitiveArrayTrait for FoRArray {}

‎encodings/fsst/src/array.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use fsst::{Decompressor, Symbol};
22
use vortex_array::arrays::VarBinEncoding;
33
use vortex_array::stats::{ArrayStats, StatsSetRef};
44
use vortex_array::variants::{BinaryArrayTrait, Utf8ArrayTrait};
5-
use vortex_array::vtable::{EncodingVTable, StatisticsVTable, VTableRef};
5+
use vortex_array::vtable::{EncodingVTable, VTableRef};
66
use vortex_array::{
77
Array, ArrayImpl, ArrayRef, ArrayStatisticsImpl, ArrayValidityImpl, ArrayVariantsImpl,
88
Encoding, EncodingId, SerdeMetadata, ToCanonical,
@@ -211,5 +211,3 @@ impl ArrayVariantsImpl for FSSTArray {
211211
impl Utf8ArrayTrait for FSSTArray {}
212212

213213
impl BinaryArrayTrait for FSSTArray {}
214-
215-
impl StatisticsVTable<&FSSTArray> for FSSTEncoding {}

‎encodings/runend/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ pub mod compress;
55
mod compute;
66
mod iter;
77
mod serde;
8-
mod statistics;
98

109
#[doc(hidden)]
1110
pub mod _benchmarking {

0 commit comments

Comments
 (0)