From 5b51e9ae7b8f4cb45887ee1ab75f04f59acf9616 Mon Sep 17 00:00:00 2001 From: Robert Kruszewski Date: Thu, 28 Mar 2024 01:26:49 +0000 Subject: [PATCH] simpler --- vortex-ree/src/compute.rs | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/vortex-ree/src/compute.rs b/vortex-ree/src/compute.rs index 57b42162e6..6624c0d2cb 100644 --- a/vortex-ree/src/compute.rs +++ b/vortex-ree/src/compute.rs @@ -56,28 +56,17 @@ impl ScalarAtFn for REEArray { impl TakeFn for REEArray { fn take(&self, indices: &dyn Array) -> VortexResult { let primitive_indices = flatten_primitive(indices)?; - let mut values_to_take: Vec = Vec::new(); - let physical_indices: Vec = match_each_integer_ptype!(primitive_indices.ptype(), |$P| { + let physical_indices = match_each_integer_ptype!(primitive_indices.ptype(), |$P| { primitive_indices .typed_data::<$P>() .iter() .map(|idx| { - self.find_physical_index(*idx as usize).map(|loc| { - values_to_take - .iter() - .position(|to_take| *to_take == loc as u64) - .map(|p| p as u64) - .unwrap_or_else(|| { - let position = values_to_take.len(); - values_to_take.push(loc as u64); - position as u64 - }) - }) + self.find_physical_index(*idx as usize) + .map(|loc| loc as u64) }) .collect::>>()? }); - let taken_values = take(self.values(), &PrimitiveArray::from(values_to_take))?; - take(&taken_values, &PrimitiveArray::from(physical_indices)) + take(self.values(), &PrimitiveArray::from(physical_indices)) } } @@ -95,7 +84,7 @@ mod test { 1, 1, 1, 4, 4, 4, 2, 2, 5, 5, 5, 5, ])) .unwrap(); - let taken = take(&ree, &PrimitiveArray::from(vec![8, 1, 3])).unwrap(); - assert_eq!(taken.as_primitive().typed_data::(), &[5, 1, 4]); + let taken = take(&ree, &PrimitiveArray::from(vec![9, 8, 1, 3])).unwrap(); + assert_eq!(taken.as_primitive().typed_data::(), &[5, 5, 1, 4]); } }