Skip to content

Commit 6146fe4

Browse files
committed
Refactor and simplify
1 parent f623175 commit 6146fe4

1 file changed

Lines changed: 37 additions & 43 deletions

File tree

‎datafusion/functions/src/unicode/find_in_set.rs‎

Lines changed: 37 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -269,22 +269,20 @@ where
269269
{
270270
let len = string_array.len();
271271
let nulls = NullBuffer::union(string_array.nulls(), str_list_array.nulls());
272-
let zero = T::Native::from_usize(0).unwrap();
272+
let mut values = vec![T::Native::default(); len];
273273

274-
let values: Vec<T::Native> = (0..len)
275-
.map(|i| {
276-
if nulls.as_ref().is_some_and(|n| n.is_null(i)) {
277-
return zero;
278-
}
279-
let string = string_array.value(i);
280-
let str_list = str_list_array.value(i);
281-
let position = str_list
282-
.split(',')
283-
.position(|s| s == string)
284-
.map_or(0, |idx| idx + 1);
285-
T::Native::from_usize(position).unwrap()
286-
})
287-
.collect();
274+
for i in 0..len {
275+
if nulls.as_ref().is_some_and(|n| n.is_null(i)) {
276+
continue;
277+
}
278+
let string = string_array.value(i);
279+
let str_list = str_list_array.value(i);
280+
let position = str_list
281+
.split(',')
282+
.position(|s| s == string)
283+
.map_or(0, |idx| idx + 1);
284+
values[i] = T::Native::from_usize(position).unwrap();
285+
}
288286

289287
Ok(Arc::new(PrimitiveArray::<T>::new(values.into(), nulls)) as ArrayRef)
290288
}
@@ -297,21 +295,19 @@ where
297295
{
298296
let len = str_list_array.len();
299297
let nulls = str_list_array.nulls().cloned();
300-
let zero = T::Native::from_usize(0).unwrap();
298+
let mut values = vec![T::Native::default(); len];
301299

302-
let values: Vec<T::Native> = (0..len)
303-
.map(|i| {
304-
if nulls.as_ref().is_some_and(|n| n.is_null(i)) {
305-
return zero;
306-
}
307-
let str_list = str_list_array.value(i);
308-
let position = str_list
309-
.split(',')
310-
.position(|s| s == string)
311-
.map_or(0, |idx| idx + 1);
312-
T::Native::from_usize(position).unwrap()
313-
})
314-
.collect();
300+
for i in 0..len {
301+
if nulls.as_ref().is_some_and(|n| n.is_null(i)) {
302+
continue;
303+
}
304+
let str_list = str_list_array.value(i);
305+
let position = str_list
306+
.split(',')
307+
.position(|s| s == string)
308+
.map_or(0, |idx| idx + 1);
309+
values[i] = T::Native::from_usize(position).unwrap();
310+
}
315311

316312
Ok(Arc::new(PrimitiveArray::<T>::new(values.into(), nulls)) as ArrayRef)
317313
}
@@ -327,21 +323,19 @@ where
327323
{
328324
let len = string_array.len();
329325
let nulls = string_array.nulls().cloned();
330-
let zero = T::Native::from_usize(0).unwrap();
326+
let mut values = vec![T::Native::default(); len];
331327

332-
let values: Vec<T::Native> = (0..len)
333-
.map(|i| {
334-
if nulls.as_ref().is_some_and(|n| n.is_null(i)) {
335-
return zero;
336-
}
337-
let string = string_array.value(i);
338-
let position = str_list
339-
.iter()
340-
.position(|s| *s == string)
341-
.map_or(0, |idx| idx + 1);
342-
T::Native::from_usize(position).unwrap()
343-
})
344-
.collect();
328+
for i in 0..len {
329+
if nulls.as_ref().is_some_and(|n| n.is_null(i)) {
330+
continue;
331+
}
332+
let string = string_array.value(i);
333+
let position = str_list
334+
.iter()
335+
.position(|s| *s == string)
336+
.map_or(0, |idx| idx + 1);
337+
values[i] = T::Native::from_usize(position).unwrap();
338+
}
345339

346340
Ok(Arc::new(PrimitiveArray::<T>::new(values.into(), nulls)) as ArrayRef)
347341
}

0 commit comments

Comments
 (0)