no need for -1s

Author: nicklan

kernel/src/client/arrow_utils.rs

@@ -25,16 +25,13 @@ pub(crate) fn get_requested_indices(
         .fields()
         .iter()
         .enumerate()
-        .map(
-            |(parquet_position, field)| match requested_schema.index_of(field.name()) {
-                Some(index) => {
-                    found_count += 1;
-                    indicies[index] = parquet_position;
-                    index as i32
-                }
-                None => -1,
-            },
-        )
+        .filter_map(|(parquet_position, field)| {
+            requested_schema.index_of(field.name()).map(|index| {
+                found_count += 1;
+                indicies[index] = parquet_position;
+                index as i32
+            })
+        })
         .collect();
     if found_count != requested_len {
         return Err(Error::generic(
@@ -85,15 +82,11 @@ pub(crate) fn reorder_record_batch(
         let mut fields = Vec::with_capacity(indicies.len());
         let reordered_columns = requested_ordering
             .iter()
-            .filter_map(|index| {
-                if *index >= 0 {
-                    let idx = *index as usize;
-                    // cheap clones of `Arc`s
-                    fields.push(input_schema.field(idx).clone());
-                    Some(input_data.column(idx).clone())
-                } else {
-                    None
-                }
+            .map(|index| {
+                let idx = *index as usize;
+                // cheap clones of `Arc`s
+                fields.push(input_schema.field(idx).clone());
+                input_data.column(idx).clone()
             })
             .collect();
         let schema = Arc::new(ArrowSchema::new(fields));