Merge remote-tracking branch 'upstream/main' into move-array2

guojidan · Mar 9, 2024 · 94d7022 · 94d7022
2 parents 2031259 + b7f4772
commit 94d7022
Show file tree

Hide file tree

Showing 29 changed files with 836 additions and 435 deletions.
diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock
diff --git a/datafusion/expr/src/built_in_function.rs b/datafusion/expr/src/built_in_function.rs
@@ -112,12 +112,6 @@ pub enum BuiltinScalarFunction {
     // array functions
     /// array_sort
     ArraySort,
-    /// array_has
-    ArrayHas,
-    /// array_has_all
-    ArrayHasAll,
-    /// array_has_any
-    ArrayHasAny,
     /// array_pop_front
     ArrayPopFront,
     /// array_pop_back
@@ -355,9 +349,6 @@ impl BuiltinScalarFunction {
             BuiltinScalarFunction::Trunc => Volatility::Immutable,
             BuiltinScalarFunction::ArraySort => Volatility::Immutable,
             BuiltinScalarFunction::ArrayEmpty => Volatility::Immutable,
-            BuiltinScalarFunction::ArrayHasAll => Volatility::Immutable,
-            BuiltinScalarFunction::ArrayHasAny => Volatility::Immutable,
-            BuiltinScalarFunction::ArrayHas => Volatility::Immutable,
             BuiltinScalarFunction::ArrayDistinct => Volatility::Immutable,
             BuiltinScalarFunction::ArrayElement => Volatility::Immutable,
             BuiltinScalarFunction::ArrayExcept => Volatility::Immutable,
@@ -472,10 +463,7 @@ impl BuiltinScalarFunction {
                 Ok(data_type)
             }
             BuiltinScalarFunction::ArraySort => Ok(input_expr_types[0].clone()),
-            BuiltinScalarFunction::ArrayHasAll
-            | BuiltinScalarFunction::ArrayHasAny
-            | BuiltinScalarFunction::ArrayHas
-            | BuiltinScalarFunction::ArrayEmpty => Ok(Boolean),
+            BuiltinScalarFunction::ArrayEmpty => Ok(Boolean),
             BuiltinScalarFunction::ArrayDistinct => Ok(input_expr_types[0].clone()),
             BuiltinScalarFunction::ArrayElement => match &input_expr_types[0] {
                 List(field)
@@ -760,12 +748,6 @@ impl BuiltinScalarFunction {
             }
             BuiltinScalarFunction::ArrayExcept => Signature::any(2, self.volatility()),
             BuiltinScalarFunction::Flatten => Signature::array(self.volatility()),
-            BuiltinScalarFunction::ArrayHasAll | BuiltinScalarFunction::ArrayHasAny => {
-                Signature::any(2, self.volatility())
-            }
-            BuiltinScalarFunction::ArrayHas => {
-                Signature::array_and_element(self.volatility())
-            }
             BuiltinScalarFunction::ArrayLength => {
                 Signature::variadic_any(self.volatility())
             }
@@ -1321,11 +1303,6 @@ impl BuiltinScalarFunction {
             ],
             BuiltinScalarFunction::ArrayExcept => &["array_except", "list_except"],
             BuiltinScalarFunction::Flatten => &["flatten"],
-            BuiltinScalarFunction::ArrayHasAll => &["array_has_all", "list_has_all"],
-            BuiltinScalarFunction::ArrayHasAny => &["array_has_any", "list_has_any"],
-            BuiltinScalarFunction::ArrayHas => {
-                &["array_has", "list_has", "array_contains", "list_contains"]
-            }
             BuiltinScalarFunction::ArrayLength => &["array_length", "list_length"],
             BuiltinScalarFunction::ArrayPopFront => {
                 &["array_pop_front", "list_pop_front"]

diff --git a/datafusion/expr/src/expr_fn.rs b/datafusion/expr/src/expr_fn.rs
@@ -602,30 +602,12 @@ scalar_expr!(
     "returns the array without the first element."
 );
 
-scalar_expr!(
-    ArrayHas,
-    array_has,
-    first_array second_array,
-    "returns true, if the element appears in the first array, otherwise false."
-);
 scalar_expr!(
     ArrayEmpty,
     array_empty,
     array,
     "returns true for an empty array or false for a non-empty array."
 );
-scalar_expr!(
-    ArrayHasAll,
-    array_has_all,
-    first_array second_array,
-    "returns true if each element of the second array appears in the first array; otherwise, it returns false."
-);
-scalar_expr!(
-    ArrayHasAny,
-    array_has_any,
-    first_array second_array,
-    "returns true if at least one element of the second array appears in the first array; otherwise, it returns false."
-);
 scalar_expr!(
     Flatten,
     flatten,

diff --git a/datafusion/functions-array/Cargo.toml b/datafusion/functions-array/Cargo.toml
@@ -44,5 +44,6 @@ arrow-schema = { workspace = true }
 datafusion-common = { workspace = true }
 datafusion-execution = { workspace = true }
 datafusion-expr = { workspace = true }
+itertools = { version = "0.12", features = ["use_std"] }
 log = { workspace = true }
 paste = "1.0.14"