Skip to content

Commit

Permalink
remove upstreamed implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
@alamb
alamb committed Oct 2, 2024
1 parent 72a8d59 commit 8720f02
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 136 deletions.
3 changes: 0 additions & 3 deletions datafusion/functions/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ pub mod macros;
pub mod string;
make_stub_package!(string, "string_expressions");

#[cfg(feature = "string_expressions")]
mod regexp_common;

/// Core datafusion expressions
/// Enabled via feature flag `core_expressions`
#[cfg(feature = "core_expressions")]
Expand Down
123 changes: 0 additions & 123 deletions datafusion/functions/src/regexp_common.rs
View file

This file was deleted.

20 changes: 10 additions & 10 deletions datafusion/functions/src/string/contains.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
// specific language governing permissions and limitations
// under the License.

use crate::regexp_common::regexp_is_match_utf8;
use crate::utils::make_scalar_function;

use arrow::array::{Array, ArrayRef, AsArray, GenericStringArray, StringViewArray};
Expand All @@ -30,6 +29,7 @@ use datafusion_expr::{ColumnarValue, Signature, Volatility};

use std::any::Any;
use std::sync::Arc;
use arrow::compute::regexp_is_match;

#[derive(Debug)]
pub struct ContainsFunc {
Expand Down Expand Up @@ -92,7 +92,7 @@ pub fn contains(args: &[ArrayRef]) -> Result<ArrayRef, DataFusionError> {
(Utf8View, Utf8View) => {
let mod_str = args[0].as_string_view();
let match_str = args[1].as_string_view();
let res = regexp_is_match_utf8::<
let res = regexp_is_match::<
StringViewArray,
StringViewArray,
GenericStringArray<i32>,
Expand All @@ -103,7 +103,7 @@ pub fn contains(args: &[ArrayRef]) -> Result<ArrayRef, DataFusionError> {
(Utf8View, Utf8) => {
let mod_str = args[0].as_string_view();
let match_str = args[1].as_string::<i32>();
let res = regexp_is_match_utf8::<
let res = regexp_is_match::<
StringViewArray,
GenericStringArray<i32>,
GenericStringArray<i32>,
Expand All @@ -114,7 +114,7 @@ pub fn contains(args: &[ArrayRef]) -> Result<ArrayRef, DataFusionError> {
(Utf8View, LargeUtf8) => {
let mod_str = args[0].as_string_view();
let match_str = args[1].as_string::<i64>();
let res = regexp_is_match_utf8::<
let res = regexp_is_match::<
StringViewArray,
GenericStringArray<i64>,
GenericStringArray<i32>,
Expand All @@ -125,7 +125,7 @@ pub fn contains(args: &[ArrayRef]) -> Result<ArrayRef, DataFusionError> {
(Utf8, Utf8View) => {
let mod_str = args[0].as_string::<i32>();
let match_str = args[1].as_string_view();
let res = regexp_is_match_utf8::<
let res = regexp_is_match::<
GenericStringArray<i32>,
StringViewArray,
GenericStringArray<i32>,
Expand All @@ -136,7 +136,7 @@ pub fn contains(args: &[ArrayRef]) -> Result<ArrayRef, DataFusionError> {
(Utf8, Utf8) => {
let mod_str = args[0].as_string::<i32>();
let match_str = args[1].as_string::<i32>();
let res = regexp_is_match_utf8::<
let res = regexp_is_match::<
GenericStringArray<i32>,
GenericStringArray<i32>,
GenericStringArray<i32>,
Expand All @@ -147,7 +147,7 @@ pub fn contains(args: &[ArrayRef]) -> Result<ArrayRef, DataFusionError> {
(Utf8, LargeUtf8) => {
let mod_str = args[0].as_string::<i32>();
let match_str = args[1].as_string::<i64>();
let res = regexp_is_match_utf8::<
let res = regexp_is_match::<
GenericStringArray<i32>,
GenericStringArray<i64>,
GenericStringArray<i32>,
Expand All @@ -158,7 +158,7 @@ pub fn contains(args: &[ArrayRef]) -> Result<ArrayRef, DataFusionError> {
(LargeUtf8, Utf8View) => {
let mod_str = args[0].as_string::<i64>();
let match_str = args[1].as_string_view();
let res = regexp_is_match_utf8::<
let res = regexp_is_match::<
GenericStringArray<i64>,
StringViewArray,
GenericStringArray<i32>,
Expand All @@ -169,7 +169,7 @@ pub fn contains(args: &[ArrayRef]) -> Result<ArrayRef, DataFusionError> {
(LargeUtf8, Utf8) => {
let mod_str = args[0].as_string::<i64>();
let match_str = args[1].as_string::<i32>();
let res = regexp_is_match_utf8::<
let res = regexp_is_match::<
GenericStringArray<i64>,
GenericStringArray<i32>,
GenericStringArray<i32>,
Expand All @@ -180,7 +180,7 @@ pub fn contains(args: &[ArrayRef]) -> Result<ArrayRef, DataFusionError> {
(LargeUtf8, LargeUtf8) => {
let mod_str = args[0].as_string::<i64>();
let match_str = args[1].as_string::<i64>();
let res = regexp_is_match_utf8::<
let res = regexp_is_match::<
GenericStringArray<i64>,
GenericStringArray<i64>,
GenericStringArray<i32>,
Expand Down

0 comments on commit 8720f02

Please sign in to comment.