small refactor

MaterializeInc · Jun 21, 2024 · 852cf34 · 852cf34
1 parent 1e3fb8f
commit 852cf34
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/src/persist-types/src/stats.rs b/src/persist-types/src/stats.rs
@@ -59,6 +59,14 @@ impl ColumnarStats {
     pub fn downcast<T: Data>(&self) -> Option<T::Stats> {
         T::Stats::downcast(self)
     }
+
+    /// Returns the inner [`ColumnStatKinds`] if `nulls` is [`None`].
+    pub fn non_null_values(&self) -> Option<&ColumnStatKinds> {
+        match self.nulls {
+            None => Some(&self.values),
+            Some(_) => None,
+        }
+    }
 }
 
 impl DynStats for ColumnarStats {
@@ -255,7 +263,7 @@ pub trait ColumnStats<T: Data>: DynStats {
     /// [`ColumnarStats`] contains `Self`.
     ///
     /// Note: This method is intended to help bridge the gap between [`Data`]
-    /// and [`crate::Schema2`].
+    /// and [`crate::columnar::Schema2`].
     fn downcast(stats: &ColumnarStats) -> Option<Self>
     where
         Self: Sized;
@@ -398,10 +406,7 @@ impl<T: Data> ColumnStats<T> for NoneStats {
     where
         Self: Sized,
     {
-        if stats.nulls.is_some() {
-            return None;
-        }
-        match &stats.values {
+        match stats.non_null_values()? {
             ColumnStatKinds::None => Some(NoneStats),
             _ => None,
         }

diff --git a/src/persist-types/src/stats/bytes.rs b/src/persist-types/src/stats/bytes.rs
@@ -109,10 +109,7 @@ impl ColumnStats<Vec<u8>> for BytesStats {
     where
         Self: Sized,
     {
-        if stats.nulls.is_some() {
-            return None;
-        }
-        match &stats.values {
+        match stats.non_null_values()? {
             ColumnStatKinds::Bytes(bytes) => Some(bytes.clone()),
             _ => None,
         }

diff --git a/src/persist-types/src/stats/primitive.rs b/src/persist-types/src/stats/primitive.rs
@@ -202,10 +202,7 @@ macro_rules! stats_primitive {
             where
                 Self: Sized,
             {
-                if stats.nulls.is_some() {
-                    return None;
-                }
-                match &stats.values {
+                match stats.non_null_values()? {
                     ColumnStatKinds::Primitive(PrimitiveStatsVariants::$variant(prim)) => {
                         Some(prim.clone())
                     }

diff --git a/src/persist-types/src/stats/structured.rs b/src/persist-types/src/stats/structured.rs
@@ -105,10 +105,7 @@ impl ColumnStats<DynStruct> for StructStats {
     where
         Self: Sized,
     {
-        if stats.nulls.is_some() {
-            return None;
-        }
-        match &stats.values {
+        match stats.non_null_values()? {
             ColumnStatKinds::Struct(inner) => Some(inner.clone()),
             _ => None,
         }