Replace unwrap with Result combinator

kszucs · Sep 25, 2019 · 77bee15 · 77bee15
1 parent cd11b97
commit 77bee15
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/rust/datafusion/src/datasource/parquet.rs b/rust/datafusion/src/datasource/parquet.rs
@@ -74,21 +74,16 @@ impl TableProvider for ParquetTable {
         projection: &Option<Vec<usize>>,
         batch_size: usize,
     ) -> Result<Vec<ScanResult>> {
-        //TODO remove the unwrap
         Ok(self
             .filenames
             .iter()
             .map(|filename| {
-                Arc::new(Mutex::new(
-                    ParquetScanPartition::try_new(
-                        filename,
-                        projection.clone(),
-                        batch_size,
-                    )
-                    .unwrap(),
-                )) as Arc<Mutex<dyn BatchIterator>>
+                ParquetScanPartition::try_new(filename, projection.clone(), batch_size)
+                    .and_then(|part| {
+                        Ok(Arc::new(Mutex::new(part)) as Arc<Mutex<dyn BatchIterator>>)
+                    })
             })
-            .collect())
+            .collect::<Result<Vec<_>>>()?)
     }
 }