fix

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

Author: AdamGS

encodings/sequence/src/array.rs

@@ -519,12 +519,12 @@ mod tests {
         let is_sorted = arr
             .statistics()
             .with_typed_stats_set(|s| s.get_as::<bool>(Stat::IsSorted));
-        assert_eq!(is_sorted, Some(StatPrecision::Exact(true)));
+        assert_eq!(is_sorted, StatPrecision::Exact(true));
 
         let is_strict_sorted = arr
             .statistics()
             .with_typed_stats_set(|s| s.get_as::<bool>(Stat::IsStrictSorted));
-        assert_eq!(is_strict_sorted, Some(StatPrecision::Exact(true)));
+        assert_eq!(is_strict_sorted, StatPrecision::Exact(true));
         Ok(())
     }
 
@@ -535,12 +535,12 @@ mod tests {
         let is_sorted = arr
             .statistics()
             .with_typed_stats_set(|s| s.get_as::<bool>(Stat::IsSorted));
-        assert_eq!(is_sorted, Some(StatPrecision::Exact(true)));
+        assert_eq!(is_sorted, StatPrecision::Exact(true));
 
         let is_strict_sorted = arr
             .statistics()
             .with_typed_stats_set(|s| s.get_as::<bool>(Stat::IsStrictSorted));
-        assert_eq!(is_strict_sorted, Some(StatPrecision::Exact(false)));
+        assert_eq!(is_strict_sorted, StatPrecision::Exact(false));
         Ok(())
     }
 
@@ -551,12 +551,12 @@ mod tests {
         let is_sorted = arr
             .statistics()
             .with_typed_stats_set(|s| s.get_as::<bool>(Stat::IsSorted));
-        assert_eq!(is_sorted, Some(StatPrecision::Exact(false)));
+        assert_eq!(is_sorted, StatPrecision::Exact(false));
 
         let is_strict_sorted = arr
             .statistics()
             .with_typed_stats_set(|s| s.get_as::<bool>(Stat::IsStrictSorted));
-        assert_eq!(is_strict_sorted, Some(StatPrecision::Exact(false)));
+        assert_eq!(is_strict_sorted, StatPrecision::Exact(false));
         Ok(())
     }
 
@@ -575,8 +575,8 @@ mod tests {
             .statistics()
             .with_typed_stats_set(|s| s.get_as::<bool>(Stat::IsStrictSorted));
 
-        assert_eq!(is_sorted, Some(StatPrecision::Exact(true)));
-        assert_eq!(is_strict_sorted, Some(StatPrecision::Exact(true)));
+        assert_eq!(is_sorted, StatPrecision::Exact(true));
+        assert_eq!(is_strict_sorted, StatPrecision::Exact(true));
 
         Ok(())
     }

encodings/zstd/src/zstd_buffers.rs

@@ -563,7 +563,7 @@ mod tests {
 
         let compressed = ZstdBuffers::compress(&input, 3, &LEGACY_SESSION)?;
 
-        assert!(compressed.statistics().get(Stat::Min).is_some());
+        assert!(!compressed.statistics().get(Stat::Min).is_absent());
         Ok(())
     }
 

vortex-btrblocks/src/schemes/integer.rs

@@ -1193,15 +1193,15 @@ mod scheme_selection_tests {
         assert!(compressed.is::<BitPacked>());
         assert_eq!(
             compressed.statistics().get_as::<u64>(Stat::NullCount),
-            Some(Precision::exact(0u64))
+            Precision::exact(0u64)
         );
         assert_eq!(
             compressed.statistics().get_as::<u32>(Stat::Min),
-            Some(Precision::exact(0u32))
+            Precision::exact(0u32)
         );
         assert_eq!(
             compressed.statistics().get_as::<u32>(Stat::Max),
-            Some(Precision::exact(15u32))
+            Precision::exact(15u32)
         );
         Ok(())
     }

vortex-duckdb/src/datasource.rs

@@ -230,16 +230,16 @@ pub struct ColumnStatisticsAggregate {
 impl ColumnStatisticsAggregate {
     pub fn new(stats: &StatsSet) -> Self {
         let min = match stats.get(Stat::Min) {
-            Some(Precision::Exact(min)) => Some(min),
+            Precision::Exact(min) => Some(min),
             _ => None,
         };
         let max = match stats.get(Stat::Max) {
-            Some(Precision::Exact(max)) => Some(max),
+            Precision::Exact(max) => Some(max),
             _ => None,
         };
 
         let max_string_length =
-            if let Some(Precision::Exact(value)) = stats.get(Stat::UncompressedSizeInBytes) {
+            if let Precision::Exact(value) = stats.get(Stat::UncompressedSizeInBytes) {
                 // DuckDB's string length is u32
                 #[allow(clippy::cast_possible_truncation)]
                 Some(value.as_primitive().as_u64().vortex_expect("not a u64") as u32)
@@ -248,9 +248,7 @@ impl ColumnStatisticsAggregate {
             };
 
         let has_null = match stats.get(Stat::NullCount) {
-            Some(Precision::Exact(cnt)) => {
-                cnt.as_primitive().as_u64().vortex_expect("not a u64") > 0
-            }
+            Precision::Exact(cnt) => cnt.as_primitive().as_u64().vortex_expect("not a u64") > 0,
             _ => true,
         };
 

vortex-layout/src/layouts/flat/writer.rs

@@ -273,7 +273,7 @@ mod tests {
 
             assert_eq!(
                 result.statistics().get_as::<bool>(Stat::IsSorted),
-                Some(Precision::Exact(true))
+                Precision::Exact(true)
             );
         })
     }
@@ -325,16 +325,16 @@ mod tests {
             assert_eq!(
                 result.statistics().get_as::<String>(Stat::Min),
                 // The typo is correct, we need this to be truncated.
-                Some(Precision::Inexact(
+                Precision::Inexact(
                     // spellchecker:ignore-next-line
                     "Another string that's meant to be smaller than the previous valu".to_string()
-                ))
+                )
             );
             assert_eq!(
                 result.statistics().get_as::<String>(Stat::Max),
-                Some(Precision::Inexact(
+                Precision::Inexact(
                     "Long value to test that the statistics are actually truncated, j".to_string()
-                ))
+                )
             );
         })
     }