move ALP into separate module in same crate

spiraldb · Oct 1, 2024 · c97b284 · c97b284
1 parent c51ecc4
commit c97b284
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/encodings/alp/src/array.rs → encodings/alp/src/alp/array.rs b/encodings/alp/src/array.rs → encodings/alp/src/alp/array.rs
@@ -15,8 +15,7 @@ use vortex::{
 use vortex_dtype::{DType, PType};
 use vortex_error::{vortex_bail, vortex_panic, VortexExpect as _, VortexResult};
 
-use crate::alp::Exponents;
-use crate::compress::{alp_encode, decompress};
+use crate::alp::{alp_encode, decompress, Exponents};
 use crate::ALPFloat;
 
 impl_encoding!("vortex.alp", ids::ALP, ALP);

diff --git a/encodings/alp/src/compress.rs → encodings/alp/src/alp/compress.rs b/encodings/alp/src/compress.rs → encodings/alp/src/alp/compress.rs
@@ -5,8 +5,7 @@ use vortex_dtype::{NativePType, PType};
 use vortex_error::{vortex_bail, VortexExpect as _, VortexResult};
 use vortex_scalar::Scalar;
 
-use crate::alp::ALPFloat;
-use crate::array::ALPArray;
+use crate::alp::{ALPArray, ALPFloat};
 use crate::Exponents;
 
 #[macro_export]

diff --git a/encodings/alp/src/compute.rs → encodings/alp/src/alp/compute.rs b/encodings/alp/src/compute.rs → encodings/alp/src/alp/compute.rs
diff --git a/encodings/alp/src/alp.rs → encodings/alp/src/alp/mod.rs b/encodings/alp/src/alp.rs → encodings/alp/src/alp/mod.rs
@@ -5,6 +5,13 @@ use itertools::Itertools;
 use num_traits::{CheckedSub, Float, PrimInt, ToPrimitive};
 use serde::{Deserialize, Serialize};
 
+mod array;
+mod compress;
+mod compute;
+
+pub use array::*;
+pub use compress::*;
+
 const SAMPLE_SIZE: usize = 32;
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -19,7 +26,14 @@ impl Display for Exponents {
     }
 }
 
-pub trait ALPFloat: Float + Display + 'static {
+mod private {
+    pub trait Sealed {}
+
+    impl Sealed for f32 {}
+    impl Sealed for f64 {}
+}
+
+pub trait ALPFloat: private::Sealed + Float + Display + 'static {
     type ALPInt: PrimInt + Display + ToPrimitive;
 
     const FRACTIONAL_BITS: u8;

diff --git a/encodings/alp/src/lib.rs b/encodings/alp/src/lib.rs
@@ -2,11 +2,6 @@
 
 pub use alp::*;
 pub use alp_rd::*;
-pub use array::*;
-pub use compress::*;
 
 mod alp;
 mod alp_rd;
-mod array;
-mod compress;
-mod compute;