Skip to content

Apache DataFusion SQL Query Engine

fix: handle empty delimiter in split_part (closes #20503) (#20542)

Gabriel Ferraté3ab1301c5320
diff --git a/datafusion/functions/src/string/split_part.rs b/datafusion/functions/src/string/split_part.rs
index e24dbd63d1..0bd197818e 100644
--- a/datafusion/functions/src/string/split_part.rs
+++ b/datafusion/functions/src/string/split_part.rs
@@ -231,7 +231,15 @@ where
"split_part index {n} exceeds maximum supported value"
)
})?;
- string.split(delimiter).nth(idx)
+
+ if delimiter.is_empty() {
+ // Match PostgreSQL split_part behavior for empty delimiter:
+ // treat the input as a single field ("ab" -> ["ab"]),
+ // rather than Rust's split("") result (["", "a", "b", ""]).
+ (n == 1).then_some(string)
+ } else {
+ string.split(delimiter).nth(idx)
+ }
}
std::cmp::Ordering::Less => {
// Negative index: use rsplit().nth() to efficiently get from the end
@@ -241,7 +249,14 @@ where
"split_part index {n} exceeds minimum supported value"
)
})?;
- string.rsplit(delimiter).nth(idx)
+ if delimiter.is_empty() {
+ // Match PostgreSQL split_part behavior for empty delimiter:
+ // treat the input as a single field ("ab" -> ["ab"]),
+ // rather than Rust's split("") result (["", "a", "b", ""]).
+ (n == -1).then_some(string)
+ } else {
+ string.rsplit(delimiter).nth(idx)
+ }
}
std::cmp::Ordering::Equal => {
return exec_err!("field position must not be zero");
@@ -341,6 +356,117 @@ mod tests {
Utf8,
StringArray
);
+ // Edge cases with delimiters
+ test_function!(
+ SplitPartFunc::new(),
+ vec![
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("a,b")))),
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from(",")))),
+ ColumnarValue::Scalar(ScalarValue::Int64(Some(1))),
+ ],
+ Ok(Some("a")),
+ &str,
+ Utf8,
+ StringArray
+ );
+ test_function!(
+ SplitPartFunc::new(),
+ vec![
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("a,b")))),
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from(",")))),
+ ColumnarValue::Scalar(ScalarValue::Int64(Some(3))),
+ ],
+ Ok(Some("")),
+ &str,
+ Utf8,
+ StringArray
+ );
+ test_function!(
+ SplitPartFunc::new(),
+ vec![
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("a,b")))),
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("")))),
+ ColumnarValue::Scalar(ScalarValue::Int64(Some(1))),
+ ],
+ Ok(Some("a,b")),
+ &str,
+ Utf8,
+ StringArray
+ );
+ test_function!(
+ SplitPartFunc::new(),
+ vec![
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("a,b")))),
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("")))),
+ ColumnarValue::Scalar(ScalarValue::Int64(Some(2))),
+ ],
+ Ok(Some("")),
+ &str,
+ Utf8,
+ StringArray
+ );
+ test_function!(
+ SplitPartFunc::new(),
+ vec![
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("a,b")))),
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from(" ")))),
+ ColumnarValue::Scalar(ScalarValue::Int64(Some(1))),
+ ],
+ Ok(Some("a,b")),
+ &str,
+ Utf8,
+ StringArray
+ );
+ test_function!(
+ SplitPartFunc::new(),
+ vec![
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("a,b")))),
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from(" ")))),
+ ColumnarValue::Scalar(ScalarValue::Int64(Some(2))),
+ ],
+ Ok(Some("")),
+ &str,
+ Utf8,
+ StringArray
+ );
+
+ // Edge cases with delimiters with negative n
+ test_function!(
+ SplitPartFunc::new(),
+ vec![
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("a,b")))),
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("")))),
+ ColumnarValue::Scalar(ScalarValue::Int64(Some(-1))),
+ ],
+ Ok(Some("a,b")),
+ &str,
+ Utf8,
+ StringArray
+ );
+ test_function!(
+ SplitPartFunc::new(),
+ vec![
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("a,b")))),
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from(" ")))),
+ ColumnarValue::Scalar(ScalarValue::Int64(Some(-1))),
+ ],
+ Ok(Some("a,b")),
+ &str,
+ Utf8,
+ StringArray
+ );
+ test_function!(
+ SplitPartFunc::new(),
+ vec![
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("a,b")))),
+ ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("")))),
+ ColumnarValue::Scalar(ScalarValue::Int64(Some(-2))),
+ ],
+ Ok(Some("")),
+ &str,
+ Utf8,
+ StringArray
+ );
Ok(())
}
diff --git a/datafusion/sqllogictest/test_files/expr.slt b/datafusion/sqllogictest/test_files/expr.slt
index c737efca4a..6d19d1436e 100644
--- a/datafusion/sqllogictest/test_files/expr.slt
+++ b/datafusion/sqllogictest/test_files/expr.slt
@@ -701,6 +701,26 @@ SELECT split_part('abc~@~def~@~ghi', '~@~', -100)
----
(empty)
+query T
+SELECT split_part('a,b', '', 1)
+----
+a,b
+
+query T
+SELECT split_part('a,b', '', -1)
+----
+a,b
+
+query T
+SELECT split_part('a,b', '', 2)
+----
+(empty)
+
+query T
+SELECT split_part('a,b', '', -2)
+----
+(empty)
+
statement error DataFusion error: Execution error: field position must not be zero
SELECT split_part('abc~@~def~@~ghi', '~@~', 0)