Jefffrey commented on code in PR #17732:
URL: https://github.com/apache/datafusion/pull/17732#discussion_r2373952849
##########
datafusion/functions-nested/src/array_has.rs:
##########
@@ -131,40 +131,42 @@ impl ScalarUDFImpl for ArrayHas {
// if the haystack is a constant list, we can use an inlist expression
which is more
// efficient because the haystack is not varying per-row
- if let Expr::Literal(ScalarValue::List(array), _) = haystack {
- // TODO: support LargeList
- // (not supported by `convert_array_to_scalar_vec`)
- // (FixedSizeList not supported either, but seems to have worked
fine when attempting to
- // build a reproducer)
-
- assert_eq!(array.len(), 1); // guarantee of ScalarValue
- if let Ok(scalar_values) =
- ScalarValue::convert_array_to_scalar_vec(array.as_ref())
- {
- assert_eq!(scalar_values.len(), 1);
- let list = scalar_values
- .into_iter()
- .flatten()
- .map(|v| Expr::Literal(v, None))
- .collect();
-
- return Ok(ExprSimplifyResult::Simplified(Expr::InList(InList {
- expr: Box::new(std::mem::take(needle)),
- list,
- negated: false,
- })));
+ match haystack {
+ Expr::Literal(
+ // FixedSizeList gets coerced to List
+ scalar @ ScalarValue::List(_) | scalar @
ScalarValue::LargeList(_),
+ _,
+ ) => {
+ let array = scalar.to_array().unwrap(); // guarantee of
ScalarValue
+ if let Ok(scalar_values) =
+ ScalarValue::convert_array_to_scalar_vec(&array)
+ {
+ assert_eq!(scalar_values.len(), 1);
+ let list = scalar_values
+ .into_iter()
+ .flatten()
+ .map(|v| Expr::Literal(v, None))
+ .collect();
+
+ return
Ok(ExprSimplifyResult::Simplified(Expr::InList(InList {
Review Comment:
Thanks, applied the simplification 👍
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
