Some fixes to BtrBlocks compressor (#2500)

* Downscaling of patch indices (todo: are there other patches than
bitpacking?)
* todo: Why does btrblocks incorrectly choose ALP vs dict?

Author: gatesn

Cargo.lock

@@ -37,7 +37,7 @@ Use :func:`~vortex.compress` to compress the Vortex array and check the relative
 
    >>> cvtx = vx.compress(vtx)
    >>> cvtx.nbytes
-   14415
+   15166
    >>> cvtx.nbytes / vtx.nbytes
    0.10...
 

docs/quickstart/python.rst

@@ -117,6 +117,11 @@ impl ALPRDArray {
         &self.right_parts
     }
 
+    #[inline]
+    pub fn right_bit_width(&self) -> u8 {
+        self.right_bit_width
+    }
+
     /// Patches of left-most bits.
     pub fn left_parts_patches(&self) -> Option<&Patches> {
         self.left_parts_patches.as_ref()
@@ -128,9 +133,8 @@ impl ALPRDArray {
         &self.left_parts_dictionary
     }
 
-    #[inline]
-    pub(crate) fn right_bit_width(&self) -> u8 {
-        self.right_bit_width
+    pub fn replace_left_parts_patches(&mut self, patches: Option<Patches>) {
+        self.left_parts_patches = patches;
     }
 }
 

encodings/alp/src/alp_rd/array.rs

@@ -181,6 +181,10 @@ impl BitPackedArray {
         self.patches.as_ref()
     }
 
+    pub fn replace_patches(&mut self, patches: Option<Patches>) {
+        self.patches = patches;
+    }
+
     #[inline]
     pub fn offset(&self) -> u16 {
         self.offset

encodings/fastlanes/src/bitpacking/mod.rs

@@ -15,7 +15,7 @@ packages = ["dummy"] # Required for workspace project
 
 [tool.uv]
 managed = true
-required-version = ">=0.5.0"
+required-version = ">=0.6.0"
 # Currently, all dev dependencies live in the root since uv doesn't have transitive dev dependencies.
 #  See: https://github.com/astral-sh/uv/issues/7541
 dev-dependencies = [

pyproject.toml

@@ -1,5 +1,5 @@
 use pyo3::prelude::*;
-use vortex::sampling_compressor::SamplingCompressor;
+use vortex::compressor::BtrBlocksCompressor;
 
 use crate::arrays::PyArray;
 use crate::install_module;
@@ -47,9 +47,6 @@ pub(crate) fn init(py: Python, parent: &Bound<PyModule>) -> PyResult<()> {
 ///    'vortex.alp(0x11)(f64?, len=1000)'
 #[pyfunction]
 pub fn compress<'py>(array: &'py Bound<'py, PyArray>) -> PyResult<Bound<'py, PyArray>> {
-    let compressor = SamplingCompressor::default();
-    let inner = compressor
-        .compress(array.borrow().as_ref(), None)?
-        .into_array();
-    PyArray::init(array.py(), inner)
+    let compressed = BtrBlocksCompressor.compress(array.borrow().as_ref())?;
+    PyArray::init(array.py(), compressed)
 }

pyvortex/src/compress.rs

@@ -14,6 +14,7 @@ use vortex_runend::compress::runend_encode;
 use self::stats::FloatStats;
 use crate::float::dictionary::dictionary_encode;
 use crate::integer::{IntCompressor, IntegerStats};
+use crate::patches::compress_patches;
 use crate::{
     Compressor, CompressorStats, GenerateStatsOptions, Scheme,
     estimate_compression_ratio_with_sampling, integer,
@@ -184,14 +185,6 @@ impl Scheme for ALPScheme {
             return Ok(0.0);
         }
 
-        // If Dict/RLE is feasible, we want to do that before ALP, and then only ALP encode
-        // the values.
-        if stats.average_run_length >= RUN_END_THRESHOLD
-            || stats.distinct_values_count < stats.value_count / 2
-        {
-            return Ok(0.0);
-        }
-
         estimate_compression_ratio_with_sampling(
             self,
             stats,
@@ -225,10 +218,9 @@ impl Scheme for ALPScheme {
         let compressed_alp_ints =
             IntCompressor::compress(&alp_ints, is_sample, allowed_cascading - 1, &int_excludes)?;
 
-        Ok(
-            ALPArray::try_new(compressed_alp_ints, alp.exponents(), alp.patches().cloned())?
-                .into_array(),
-        )
+        let patches = alp.patches().map(compress_patches).transpose()?;
+
+        Ok(ALPArray::try_new(compressed_alp_ints, alp.exponents(), patches)?.into_array())
     }
 }
 
@@ -273,7 +265,15 @@ impl Scheme for ALPRDScheme {
             ptype => vortex_panic!("cannot ALPRD compress ptype {ptype}"),
         };
 
-        Ok(encoder.encode(stats.source()).into_array())
+        let mut alp_rd = encoder.encode(stats.source());
+
+        let patches = alp_rd
+            .left_parts_patches()
+            .map(compress_patches)
+            .transpose()?;
+        alp_rd.replace_left_parts_patches(patches);
+
+        Ok(alp_rd.into_array())
     }
 }
 

uv.lock

@@ -26,6 +26,7 @@ use vortex_zigzag::{ZigZagArray, zigzag_encode};
 
 use crate::downscale::downscale_integer_array;
 use crate::integer::dictionary::dictionary_encode;
+use crate::patches::compress_patches;
 use crate::{
     Compressor, CompressorStats, GenerateStatsOptions, Scheme,
     estimate_compression_ratio_with_sampling,
@@ -406,7 +407,11 @@ impl Scheme for BitPackingScheme {
         if bw as usize == stats.source().ptype().bit_width() {
             return Ok(stats.source().clone().into_array());
         }
-        let packed = bitpack_encode(stats.source(), bw)?;
+        let mut packed = bitpack_encode(stats.source(), bw)?;
+
+        let patches = packed.patches().map(compress_patches).transpose()?;
+        packed.replace_patches(patches);
+
         Ok(packed.into_array())
     }
 }

vortex-btrblocks/src/float.rs

@@ -17,6 +17,7 @@ pub use crate::temporal::compress_temporal;
 mod downscale;
 mod float;
 pub mod integer;
+mod patches;
 mod sample;
 mod string;
 mod temporal;