diff --git a/crates/spark/src/function/url/parse_url.rs b/crates/spark/src/function/url/parse_url.rs index 5f78d4bc..fa76c6e7 100644 --- a/crates/spark/src/function/url/parse_url.rs +++ b/crates/spark/src/function/url/parse_url.rs @@ -12,7 +12,7 @@ use arrow::datatypes::DataType; use datafusion_common::cast::{ as_large_string_array, as_string_array, as_string_view_array, }; -use datafusion_common::{Result, exec_datafusion_err, exec_err}; +use datafusion_common::{DataFusionError, Result, exec_datafusion_err, exec_err}; use datafusion_expr::{ ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature, Volatility, @@ -97,12 +97,10 @@ impl ParseUrl { _ => None, }) } else { - Err(exec_datafusion_err!( - "The url is invalid: {value}. Use `try_parse_url` to tolerate invalid URL and return NULL instead. SQLSTATE: 22P02" - )) + Err(Self::invalid_url_err(value)) }; } - url.map_err(|e| exec_datafusion_err!("{e:?}")) + url.map_err(|_| Self::invalid_url_err(value)) .map(|url| match part { "HOST" => url.host_str().map(String::from), "PATH" => { @@ -137,6 +135,13 @@ impl ParseUrl { }) } + /// The same error for every URL that can't be parsed + fn invalid_url_err(value: &str) -> DataFusionError { + exec_datafusion_err!( + "The url is invalid: {value}. Use `try_parse_url` to tolerate invalid URL and return NULL instead. SQLSTATE: 22P02" + ) + } + fn path<'a>(value: &str, url: &'a Url) -> &'a str { let path = url.path(); if path == "/" && Self::absolute_url_has_empty_path(value) { diff --git a/crates/sqllogictest/test_files/url/parse_url.slt b/crates/sqllogictest/test_files/url/parse_url.slt index d07bf5bc..fba58f2b 100644 --- a/crates/sqllogictest/test_files/url/parse_url.slt +++ b/crates/sqllogictest/test_files/url/parse_url.slt @@ -336,6 +336,11 @@ SELECT parse_url('inva lid://spark.apache.org/path?query=1', 'QUERY'); ---- NULL +query T +SELECT parse_url('http://[::1/path', 'HOST'); +---- +NULL + # xfail spark: Spark does not range-check the port, so it returns the host for a port above 65535 (https://github.com/apache/datafusion-spark/issues/365) query T SELECT parse_url('http://spark.apache.org:99999/path', 'HOST'); @@ -361,8 +366,11 @@ set datafusion.execution.enable_ansi_mode = true; query error DataFusion error: Execution error: The url is invalid: inva lid://spark\.apache\.org/path\?query=1\. Use `try_parse_url` to tolerate invalid URL and return NULL instead\. SQLSTATE: 22P02 SELECT parse_url('inva lid://spark.apache.org/path?query=1', 'QUERY'); +query error DataFusion error: Execution error: The url is invalid: http://\[::1/path\. Use `try_parse_url` to tolerate invalid URL and return NULL instead\. SQLSTATE: 22P02 +SELECT parse_url('http://[::1/path', 'HOST'); + # xfail spark: Spark does not range-check the port, so it returns the host for a port above 65535 (https://github.com/apache/datafusion-spark/issues/365) -query error DataFusion error: Execution error: InvalidPort +query error DataFusion error: Execution error: The url is invalid: http://spark\.apache\.org:99999/path\. Use `try_parse_url` to tolerate invalid URL and return NULL instead\. SQLSTATE: 22P02 SELECT parse_url('http://spark.apache.org:99999/path', 'HOST'); # try_parse_url still returns NULL when ANSI mode is on