merge

spiraldb · Mar 4, 2024 · 9d6695c · 9d6695c
1 parent 41f53d1
commit 9d6695c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/vortex-alp/src/compress.rs b/vortex-alp/src/compress.rs
@@ -61,10 +61,8 @@ fn alp_compressor(array: &dyn Array, like: Option<&dyn Array>, ctx: CompressCtx)
             .compress(encoded.as_ref(), like_alp.map(|a| a.encoded())),
         exponents,
         patches.map(|p| {
-            ctx.next_level().compress(
-                p.as_ref(),
-                like_alp.and_then(|a| a.patches()).map(|p| p.as_ref()),
-            )
+            ctx.next_level()
+                .compress(p.as_ref(), like_alp.and_then(|a| a.patches()))
         }),
     )
     .boxed()

diff --git a/vortex-ffor/src/compress.rs b/vortex-ffor/src/compress.rs
@@ -74,10 +74,8 @@ fn ffor_compressor(array: &dyn Array, like: Option<&dyn Array>, ctx: CompressCtx
         encoded,
         parray.validity().clone_optional(),
         patches.map(|p| {
-            ctx.next_level().compress(
-                p.as_ref(),
-                like_ffor.and_then(|lf| lf.patches()).map(|p| p.as_ref()),
-            )
+            ctx.next_level()
+                .compress(p.as_ref(), like_ffor.and_then(|lf| lf.patches()))
         }),
         min_val,
         num_bits,

diff --git a/vortex/src/array/varbin/compress.rs b/vortex/src/array/varbin/compress.rs
@@ -45,14 +45,9 @@ fn varbin_compressor(array: &dyn Array, like: Option<&dyn Array>, ctx: CompressC
             varbin_like.map(|typed_arr| typed_arr.bytes()),
         ),
         array.dtype().clone(),
-        varbin_array.validity().map(|v| {
-            ctx.compress(
-                v.as_ref(),
-                varbin_like
-                    .and_then(|vblike| vblike.validity())
-                    .map(|v| v.as_ref()),
-            )
-        }),
+        varbin_array
+            .validity()
+            .map(|v| ctx.compress(v.as_ref(), varbin_like.and_then(|vblike| vblike.validity()))),
     )
     .boxed()
 }
diff --git a/vortex/src/array/varbinview/compress.rs b/vortex/src/array/varbinview/compress.rs
@@ -63,9 +63,7 @@ fn varbinview_compressor(
         varbinview_array.validity().map(|v| {
             ctx.compress(
                 v.as_ref(),
-                varbinview_like
-                    .and_then(|vbvlike| vbvlike.validity())
-                    .map(|v| v.as_ref()),
+                varbinview_like.and_then(|vbvlike| vbvlike.validity()),
             )
         }),
     )