Port ArrayPosition and ArrayPositions to functions-array subcrate

datafusion/expr/src/built_in_function.rs

@@ -20,12 +20,12 @@
 use std::collections::HashMap;
 use std::fmt;
 use std::str::FromStr;
-use std::sync::{Arc, OnceLock};
+use std::sync::OnceLock;
 
 use crate::type_coercion::functions::data_types;
 use crate::{FuncMonotonicity, Signature, TypeSignature, Volatility};
 
-use arrow::datatypes::{DataType, Field};
+use arrow::datatypes::DataType;
 use datafusion_common::{plan_err, DataFusionError, Result};
 
 use strum::IntoEnumIterator;
@@ -103,10 +103,6 @@ pub enum BuiltinScalarFunction {
     Cot,
 
     // array functions
-    /// array_position
-    ArrayPosition,
-    /// array_positions
-    ArrayPositions,
     /// array_remove
     ArrayRemove,
     /// array_remove_n
@@ -275,8 +271,6 @@ impl BuiltinScalarFunction {
             BuiltinScalarFunction::Cot => Volatility::Immutable,
             BuiltinScalarFunction::Trunc => Volatility::Immutable,
             BuiltinScalarFunction::ArrayExcept => Volatility::Immutable,
-            BuiltinScalarFunction::ArrayPosition => Volatility::Immutable,
-            BuiltinScalarFunction::ArrayPositions => Volatility::Immutable,
             BuiltinScalarFunction::ArrayRemove => Volatility::Immutable,
             BuiltinScalarFunction::ArrayRemoveN => Volatility::Immutable,
             BuiltinScalarFunction::ArrayRemoveAll => Volatility::Immutable,
@@ -340,10 +334,6 @@ impl BuiltinScalarFunction {
         // the return type of the built in function.
         // Some built-in functions' return type depends on the incoming type.
         match self {
-            BuiltinScalarFunction::ArrayPosition => Ok(UInt64),
-            BuiltinScalarFunction::ArrayPositions => {
-                Ok(List(Arc::new(Field::new("item", UInt64, true))))
-            }
             BuiltinScalarFunction::ArrayRemove => Ok(input_expr_types[0].clone()),
             BuiltinScalarFunction::ArrayRemoveN => Ok(input_expr_types[0].clone()),
             BuiltinScalarFunction::ArrayRemoveAll => Ok(input_expr_types[0].clone()),
@@ -511,12 +501,6 @@ impl BuiltinScalarFunction {
         // for now, the list is small, as we do not have many built-in functions.
         match self {
             BuiltinScalarFunction::ArrayExcept => Signature::any(2, self.volatility()),
-            BuiltinScalarFunction::ArrayPosition => {
-                Signature::array_and_element_and_optional_index(self.volatility())
-            }
-            BuiltinScalarFunction::ArrayPositions => {
-                Signature::array_and_element(self.volatility())
-            }
             BuiltinScalarFunction::ArrayRemove => {
                 Signature::array_and_element(self.volatility())
             }
@@ -829,15 +813,6 @@ impl BuiltinScalarFunction {
 
             // hashing functions
             BuiltinScalarFunction::ArrayExcept => &["array_except", "list_except"],
-            BuiltinScalarFunction::ArrayPosition => &[
-                "array_position",
-                "list_position",
-                "array_indexof",
-                "list_indexof",
-            ],
-            BuiltinScalarFunction::ArrayPositions => {
-                &["array_positions", "list_positions"]
-            }
             BuiltinScalarFunction::ArrayRemove => &["array_remove", "list_remove"],
             BuiltinScalarFunction::ArrayRemoveN => &["array_remove_n", "list_remove_n"],
             BuiltinScalarFunction::ArrayRemoveAll => {

datafusion/expr/src/expr_fn.rs

@@ -590,18 +590,6 @@ scalar_expr!(
     first_array second_array,
     "Returns an array of the elements that appear in the first array but not in the second."
 );
-scalar_expr!(
-    ArrayPosition,
-    array_position,
-    array element index,
-    "searches for an element in the array, returns first occurrence."
-);
-scalar_expr!(
-    ArrayPositions,
-    array_positions,
-    array element,
-    "searches for an element in the array, returns all occurrences."
-);
 scalar_expr!(
     ArrayRemove,
     array_remove,
@@ -1182,8 +1170,6 @@ mod test {
         test_scalar_expr!(Trim, trim, string);
         test_scalar_expr!(Upper, upper, string);
 
-        test_scalar_expr!(ArrayPosition, array_position, array, element, index);
-        test_scalar_expr!(ArrayPositions, array_positions, array, element);
         test_scalar_expr!(ArrayRemove, array_remove, array, element);
         test_scalar_expr!(ArrayRemoveN, array_remove_n, array, element, max);
         test_scalar_expr!(ArrayRemoveAll, array_remove_all, array, element);

datafusion/functions-array/src/lib.rs

@@ -33,6 +33,7 @@ mod concat;
 mod core;
 mod extract;
 mod kernels;
+mod position;
 mod rewrite;
 mod set_ops;
 mod udf;
@@ -57,6 +58,8 @@ pub mod expr_fn {
     pub use super::extract::array_pop_back;
     pub use super::extract::array_pop_front;
     pub use super::extract::array_slice;
+    pub use super::position::array_position;
+    pub use super::position::array_positions;
     pub use super::set_ops::array_distinct;
     pub use super::set_ops::array_intersect;
     pub use super::set_ops::array_union;
@@ -107,6 +110,8 @@ pub fn register_all(registry: &mut dyn FunctionRegistry) -> Result<()> {
         set_ops::array_distinct_udf(),
         set_ops::array_intersect_udf(),
         set_ops::array_union_udf(),
+        position::array_position_udf(),
+        position::array_positions_udf(),
     ];
     functions.into_iter().try_for_each(|udf| {
         let existing_udf = registry.register_udf(udf)?;