format

Signed-off-by: Robert Kruszewski <github@robertk.io>

Author: robert3005

java/vortex-spark/src/main/java/dev/vortex/spark/read/VortexScan.java

@@ -3,11 +3,11 @@
 
 package dev.vortex.spark.read;
 
-import java.util.Arrays;
 import dev.vortex.api.DataSource;
 import dev.vortex.api.Session;
 import dev.vortex.jni.NativeFiles;
 import dev.vortex.spark.VortexSparkSession;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -16,8 +16,8 @@
 import java.util.stream.Stream;
 import org.apache.spark.sql.connector.catalog.CatalogV2Util;
 import org.apache.spark.sql.connector.catalog.Column;
-import org.apache.spark.sql.connector.expressions.filter.Predicate;
 import org.apache.spark.sql.connector.expressions.NamedReference;
+import org.apache.spark.sql.connector.expressions.filter.Predicate;
 import org.apache.spark.sql.connector.read.Batch;
 import org.apache.spark.sql.connector.read.Scan;
 import org.apache.spark.sql.connector.read.Statistics;
@@ -59,7 +59,7 @@ public VortexScan(
             List<String> paths,
             List<Column> tableColumns,
             List<Column> readColumns,
-                Predicate[] pushedPredicates,
+            Predicate[] pushedPredicates,
             Map<String, String> formatOptions) {
         this.paths = paths;
         this.tableColumns = tableColumns;

java/vortex-spark/src/main/java/dev/vortex/spark/read/VortexScanBuilder.java

@@ -119,7 +119,12 @@ public Scan build() {
         // Allow empty columns for operations like count() that don't need actual column data
         // If no columns are specified, we'll read the minimal schema needed
 
-        return new VortexScan(paths, List.copyOf(this.tableColumns), List.copyOf(this.readColumns), pushedPredicates, this.formatOptions);
+        return new VortexScan(
+                paths,
+                List.copyOf(this.tableColumns),
+                List.copyOf(this.readColumns),
+                pushedPredicates,
+                this.formatOptions);
     }
 
     /**

vortex-duckdb/src/table_function.rs

@@ -439,7 +439,7 @@ pub fn statistics(bind_data: &TableFunctionBind, column_index: usize) -> Option<
     if children.len() != 1 {
         return None;
     }
-    let MultiLayoutChild::Opened(reader) = &children[0] else {
+    let MultiLayoutChild::Opened { reader, .. } = &children[0] else {
         return None;
     };
     let stats_sets = match reader.as_any().downcast_ref::<FileStatsLayoutReader>() {

vortex-jni/src/data_source.rs

@@ -265,9 +265,9 @@ pub extern "system" fn Java_dev_vortex_jni_NativeDataSource_byteSize(
     try_or_throw(&mut env, |env| {
         let ds = unsafe { NativeDataSource::from_ptr(pointer) };
         let (bytes, precision) = match ds.inner.byte_size() {
-            Some(Precision::Exact(b)) => (b as jlong, 2),
-            Some(Precision::Inexact(b)) => (b as jlong, 1),
-            None => (0, 0),
+            Precision::Exact(b) => (b as jlong, 2),
+            Precision::Inexact(b) => (b as jlong, 1),
+            Precision::Absent => (0, 0),
         };
         out.set_region(env, 0, &[bytes, precision])?;
         Ok(())

vortex-layout/src/scan/multi.rs

@@ -249,10 +249,10 @@ impl DataSource for MultiLayoutDataSource {
         }
     }
 
-    fn byte_size(&self) -> Option<Precision<u64>> {
+    fn byte_size(&self) -> Precision<u64> {
         let total_count = self.children.len() as u64;
         if total_count == 0 {
-            return Some(Precision::exact(0u64));
+            return Precision::exact(0u64);
         }
 
         let mut sum: u64 = 0;
@@ -265,15 +265,15 @@ impl DataSource for MultiLayoutDataSource {
         }
 
         if known_count == 0 {
-            return None;
+            return Precision::Absent;
         }
 
         if known_count == total_count {
-            Some(Precision::exact(sum))
+            Precision::exact(sum)
         } else {
             let avg = sum / known_count;
             let extrapolated = avg.saturating_mul(total_count);
-            Some(Precision::inexact(extrapolated))
+            Precision::inexact(extrapolated)
         }
     }