CR

Signed-off-by: Adam Gutglick <adam@spiraldb.com>

Author: AdamGS

vortex-array/src/aggregate_fn/fns/uncompressed_size_in_bytes/bool.rs

@@ -4,15 +4,17 @@
 use vortex_error::VortexResult;
 use vortex_error::vortex_err;
 
+use super::packed_bit_buffer_size_in_bytes;
+use super::validity_uncompressed_size_in_bytes;
 use crate::ExecutionCtx;
 use crate::arrays::BoolArray;
 
 pub(super) fn bool_uncompressed_size_in_bytes(
     array: &BoolArray,
     ctx: &mut ExecutionCtx,
 ) -> VortexResult<u64> {
-    let value_size = super::packed_bit_buffer_size_in_bytes(array.len())?;
-    let validity_size = super::validity_uncompressed_size_in_bytes(
+    let value_size = packed_bit_buffer_size_in_bytes(array.len())?;
+    let validity_size = validity_uncompressed_size_in_bytes(
         array
             .as_ref()
             .validity()?

vortex-array/src/aggregate_fn/fns/uncompressed_size_in_bytes/decimal.rs

@@ -4,6 +4,7 @@
 use vortex_error::VortexResult;
 use vortex_error::vortex_err;
 
+use super::validity_uncompressed_size_in_bytes;
 use crate::ExecutionCtx;
 use crate::arrays::DecimalArray;
 use crate::arrays::decimal::DecimalArrayExt;
@@ -22,7 +23,7 @@ pub(super) fn decimal_uncompressed_size_in_bytes(
             .map_err(|e| vortex_err!("Failed to convert decimal byte width to u64: {e}"))?,
         )
         .ok_or_else(|| vortex_err!("uncompressed size in bytes overflowed u64"))?;
-    let validity_size = super::validity_uncompressed_size_in_bytes(
+    let validity_size = validity_uncompressed_size_in_bytes(
         array
             .as_ref()
             .validity()?

vortex-array/src/aggregate_fn/fns/uncompressed_size_in_bytes/extension.rs

@@ -3,6 +3,7 @@
 
 use vortex_error::VortexResult;
 
+use super::uncompressed_size_in_bytes_u64;
 use crate::ExecutionCtx;
 use crate::arrays::ExtensionArray;
 use crate::arrays::extension::ExtensionArrayExt;
@@ -11,5 +12,5 @@ pub(super) fn extension_uncompressed_size_in_bytes(
     array: &ExtensionArray,
     ctx: &mut ExecutionCtx,
 ) -> VortexResult<u64> {
-    super::uncompressed_size_in_bytes_u64(array.storage_array(), ctx)
+    uncompressed_size_in_bytes_u64(array.storage_array(), ctx)
 }

vortex-array/src/aggregate_fn/fns/uncompressed_size_in_bytes/fixed_size_list.rs

@@ -4,6 +4,8 @@
 use vortex_error::VortexResult;
 use vortex_error::vortex_err;
 
+use super::uncompressed_size_in_bytes_u64;
+use super::validity_uncompressed_size_in_bytes;
 use crate::ExecutionCtx;
 use crate::arrays::FixedSizeListArray;
 use crate::arrays::fixed_size_list::FixedSizeListArrayExt;
@@ -12,8 +14,8 @@ pub(super) fn fixed_size_list_uncompressed_size_in_bytes(
     array: &FixedSizeListArray,
     ctx: &mut ExecutionCtx,
 ) -> VortexResult<u64> {
-    let elements_size = super::uncompressed_size_in_bytes_u64(array.elements(), ctx)?;
-    let validity_size = super::validity_uncompressed_size_in_bytes(
+    let elements_size = uncompressed_size_in_bytes_u64(array.elements(), ctx)?;
+    let validity_size = validity_uncompressed_size_in_bytes(
         array
             .as_ref()
             .validity()?

…n/fns/uncompressed_size_in_bytes/list.rs …/uncompressed_size_in_bytes/list_view.rsvortex-array/src/aggregate_fn/fns/uncompressed_size_in_bytes/list.rs renamed to vortex-array/src/aggregate_fn/fns/uncompressed_size_in_bytes/list_view.rs vortex-array/src/aggregate_fn/fns/uncompressed_size_in_bytes/list.rs renamed to vortex-array/src/aggregate_fn/fns/uncompressed_size_in_bytes/list_view.rs

@@ -4,33 +4,36 @@
 use vortex_error::VortexResult;
 use vortex_error::vortex_err;
 
+use super::uncompressed_size_in_bytes_u64;
+use super::validity_uncompressed_size_in_bytes;
 use crate::ExecutionCtx;
 use crate::arrays::ListViewArray;
 use crate::arrays::listview::ListViewArrayExt;
 use crate::arrays::listview::ListViewRebuildMode;
 
-pub(super) fn list_uncompressed_size_in_bytes(
+pub(super) fn list_view_uncompressed_size_in_bytes(
     array: &ListViewArray,
     ctx: &mut ExecutionCtx,
 ) -> VortexResult<u64> {
     let mut size = if array.is_empty() {
         0
     } else {
         let rebuilt = array.rebuild(ListViewRebuildMode::MakeExact)?;
-        super::uncompressed_size_in_bytes_u64(rebuilt.elements(), ctx)?
+        uncompressed_size_in_bytes_u64(rebuilt.elements(), ctx)?
     };
 
     let view_buffer_size = u64::try_from(array.len())
         .map_err(|e| vortex_err!("Failed to convert list array length to u64: {e}"))?
         .checked_mul(8)
         .ok_or_else(|| vortex_err!("uncompressed size in bytes overflowed u64"))?;
 
+    // ListView stores both offsets and sizes as u64 view buffers.
     size = size
         .checked_add(view_buffer_size)
         .and_then(|size| size.checked_add(view_buffer_size))
         .ok_or_else(|| vortex_err!("uncompressed size in bytes overflowed u64"))?;
     size = size
-        .checked_add(super::validity_uncompressed_size_in_bytes(
+        .checked_add(validity_uncompressed_size_in_bytes(
             array
                 .as_ref()
                 .validity()?

vortex-array/src/aggregate_fn/fns/uncompressed_size_in_bytes/mod.rs

@@ -5,7 +5,7 @@ mod bool;
 mod decimal;
 mod extension;
 mod fixed_size_list;
-mod list;
+mod list_view;
 mod null;
 mod primitive;
 mod struct_;
@@ -15,7 +15,7 @@ use bool::bool_uncompressed_size_in_bytes;
 use decimal::decimal_uncompressed_size_in_bytes;
 use extension::extension_uncompressed_size_in_bytes;
 use fixed_size_list::fixed_size_list_uncompressed_size_in_bytes;
-use list::list_uncompressed_size_in_bytes;
+use list_view::list_view_uncompressed_size_in_bytes;
 use null::null_uncompressed_size_in_bytes;
 use primitive::primitive_uncompressed_size_in_bytes;
 use struct_::struct_uncompressed_size_in_bytes;
@@ -201,7 +201,7 @@ fn canonical_uncompressed_size_in_bytes(
         Canonical::Primitive(array) => primitive_uncompressed_size_in_bytes(array, ctx),
         Canonical::Decimal(array) => decimal_uncompressed_size_in_bytes(array, ctx),
         Canonical::VarBinView(array) => varbinview_uncompressed_size_in_bytes(array, ctx),
-        Canonical::List(array) => list_uncompressed_size_in_bytes(array, ctx),
+        Canonical::List(array) => list_view_uncompressed_size_in_bytes(array, ctx),
         Canonical::FixedSizeList(array) => fixed_size_list_uncompressed_size_in_bytes(array, ctx),
         Canonical::Struct(array) => struct_uncompressed_size_in_bytes(array, ctx),
         Canonical::Extension(array) => extension_uncompressed_size_in_bytes(array, ctx),

vortex-array/src/aggregate_fn/fns/uncompressed_size_in_bytes/primitive.rs

@@ -4,6 +4,7 @@
 use vortex_error::VortexResult;
 use vortex_error::vortex_err;
 
+use super::validity_uncompressed_size_in_bytes;
 use crate::ExecutionCtx;
 use crate::arrays::PrimitiveArray;
 use crate::arrays::primitive::PrimitiveArrayExt;
@@ -19,7 +20,7 @@ pub(super) fn primitive_uncompressed_size_in_bytes(
                 .map_err(|e| vortex_err!("Failed to convert primitive byte width to u64: {e}"))?,
         )
         .ok_or_else(|| vortex_err!("uncompressed size in bytes overflowed u64"))?;
-    let validity_size = super::validity_uncompressed_size_in_bytes(
+    let validity_size = validity_uncompressed_size_in_bytes(
         array
             .as_ref()
             .validity()?

vortex-array/src/aggregate_fn/fns/uncompressed_size_in_bytes/struct_.rs

@@ -4,6 +4,8 @@
 use vortex_error::VortexResult;
 use vortex_error::vortex_err;
 
+use super::uncompressed_size_in_bytes_u64;
+use super::validity_uncompressed_size_in_bytes;
 use crate::ExecutionCtx;
 use crate::arrays::StructArray;
 use crate::arrays::struct_::StructArrayExt;
@@ -16,12 +18,12 @@ pub(super) fn struct_uncompressed_size_in_bytes(
 
     for field in array.iter_unmasked_fields() {
         size = size
-            .checked_add(super::uncompressed_size_in_bytes_u64(field, ctx)?)
+            .checked_add(uncompressed_size_in_bytes_u64(field, ctx)?)
             .ok_or_else(|| vortex_err!("uncompressed size in bytes overflowed u64"))?;
     }
 
     size = size
-        .checked_add(super::validity_uncompressed_size_in_bytes(
+        .checked_add(validity_uncompressed_size_in_bytes(
             array
                 .as_ref()
                 .validity()?

vortex-array/src/aggregate_fn/fns/uncompressed_size_in_bytes/varbinview.rs

@@ -6,6 +6,7 @@ use std::mem::size_of;
 use vortex_error::VortexResult;
 use vortex_error::vortex_err;
 
+use super::validity_uncompressed_size_in_bytes;
 use crate::ExecutionCtx;
 use crate::arrays::VarBinViewArray;
 use crate::arrays::varbinview::BinaryView;
@@ -32,7 +33,7 @@ pub(super) fn varbinview_uncompressed_size_in_bytes(
     }
 
     size = size
-        .checked_add(super::validity_uncompressed_size_in_bytes(
+        .checked_add(validity_uncompressed_size_in_bytes(
             array
                 .as_ref()
                 .validity()?