Minimize line change count

delta-io · Sep 17, 2024 · 13628a5 · 13628a5
1 parent e4c3c39
commit 13628a5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/kernel/src/scan/mod.rs b/kernel/src/scan/mod.rs
@@ -238,7 +238,6 @@ impl Scan {
         &'a self,
         engine: &'a dyn Engine,
     ) -> DeltaResult<Box<dyn Iterator<Item = DeltaResult<ScanResult>> + 'a>> {
-        #[derive(Debug)]
         struct ScanFile {
             path: String,
             size: i64,
@@ -272,7 +271,7 @@ impl Scan {
             .map_ok(|(data, vec)| {
                 let scan_files = vec![];
                 state::visit_scan_files(data.as_ref(), &vec, scan_files, scan_data_callback)
-                    .map(|batches| batches.into_iter())
+                    .map(IntoIterator::into_iter)
             })
             .flatten_ok()
             .flatten_ok();
@@ -643,7 +642,11 @@ mod tests {
         let table = Table::new(url);
         let snapshot = table.snapshot(&engine, None).unwrap();
         let scan = snapshot.into_scan_builder().build().unwrap();
-        let files: Vec<ScanResult> = scan.execute(&engine).unwrap().map(Result::unwrap).collect();
+        let files = scan
+            .execute(&engine)
+            .unwrap()
+            .map(Result::unwrap)
+            .collect_vec();
 
         assert_eq!(files.len(), 1);
         let num_rows = files[0].raw_data.as_ref().unwrap().length();

diff --git a/kernel/tests/read.rs b/kernel/tests/read.rs
@@ -231,11 +231,14 @@ async fn remove_action() -> Result<(), Box<dyn std::error::Error>> {
     let snapshot = table.snapshot(&engine, None)?;
     let scan = snapshot.into_scan_builder().build()?;
 
-    let stream = scan.execute(&engine)?.zip(expected_data);
+    let stream = scan
+        .execute(&engine)?
+        .map(Result::unwrap)
+        .zip(expected_data);
 
     let mut files = 0;
     for (data, expected) in stream {
-        let raw_data = data?.raw_data?;
+        let raw_data = data.raw_data?;
         files += 1;
         assert_eq!(into_record_batch(raw_data), expected);
     }
@@ -464,10 +467,10 @@ fn read_with_scan_data(
 ) -> Result<(), Box<dyn std::error::Error>> {
     let global_state = scan.global_scan_state();
     let result_schema: ArrowSchemaRef = Arc::new(scan.schema().as_ref().try_into()?);
-    let scan_data = scan.scan_data(engine)?.map(Result::unwrap);
+    let scan_data = scan.scan_data(engine)?;
     let mut scan_files = vec![];
     for data in scan_data {
-        let (data, vec) = data;
+        let (data, vec) = data?;
         scan_files = visit_scan_files(data.as_ref(), &vec, scan_files, scan_data_callback)?;
     }