From ed796acd3fca80597506d8ddb1456dcba90ae36d Mon Sep 17 00:00:00 2001 From: Roopesh S <119874392+TechWizard9999@users.noreply.github.com> Date: Tue, 17 Nov 2026 07:39:12 +0530 Subject: [PATCH 1/3] unify parse_url error --- crates/spark/src/function/url/parse_url.rs | 15 ++++++++++----- crates/sqllogictest/test_files/url/parse_url.slt | 9 ++++++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/crates/spark/src/function/url/parse_url.rs b/crates/spark/src/function/url/parse_url.rs index edb967bc..bbd88c66 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, @@ -95,12 +95,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" => { @@ -135,6 +133,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 2f39c04e..7355b226 100644 --- a/crates/sqllogictest/test_files/url/parse_url.slt +++ b/crates/sqllogictest/test_files/url/parse_url.slt @@ -337,7 +337,7 @@ SELECT parse_url('inva lid://spark.apache.org/path?query=1', 'QUERY'); NULL query T -SELECT parse_url('http://spark.apache.org:99999/path', 'HOST'); +SELECT parse_url('http://[::1/path', 'HOST'); ---- NULL @@ -360,8 +360,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: InvalidPort -SELECT parse_url('http://spark.apache.org:99999/path', 'HOST'); +query error +SELECT parse_url('http://[::1/path', 'HOST'); +---- +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 + # try_parse_url still returns NULL when ANSI mode is on query T From 3f083a1b37aa88a66a273a46bfbda8316d37e956 Mon Sep 17 00:00:00 2001 From: Roopesh S <119874392+TechWizard9999@users.noreply.github.com> Date: Tue, 17 Nov 2026 10:21:17 +0530 Subject: [PATCH 2/3] address review comments --- crates/sqllogictest/test_files/url/parse_url.slt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/crates/sqllogictest/test_files/url/parse_url.slt b/crates/sqllogictest/test_files/url/parse_url.slt index 7355b226..c38427d6 100644 --- a/crates/sqllogictest/test_files/url/parse_url.slt +++ b/crates/sqllogictest/test_files/url/parse_url.slt @@ -341,6 +341,13 @@ SELECT parse_url('http://[::1/path', 'HOST'); ---- NULL +# Known difference from Spark: java.net.URI doesn't range-check the port, so +# Spark returns the host in both ANSI modes. Here it is NULL, or an error with ANSI. +# query T +# SELECT parse_url('http://spark.apache.org:99999/path', 'HOST'); +# ---- +# spark.apache.org + # Mixed rows: a valid URL, a malformed URL and NULL query T SELECT parse_url(column1, 'HOST') @@ -360,11 +367,8 @@ 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 +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'); ----- -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 - # try_parse_url still returns NULL when ANSI mode is on query T From fde86c3ada6effc4c0c998a6dfa1f0379dbdb2fe Mon Sep 17 00:00:00 2001 From: Roopesh S <119874392+TechWizard9999@users.noreply.github.com> Date: Thu, 19 Nov 2026 18:31:45 +0530 Subject: [PATCH 3/3] restore port tests --- crates/sqllogictest/test_files/url/parse_url.slt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/crates/sqllogictest/test_files/url/parse_url.slt b/crates/sqllogictest/test_files/url/parse_url.slt index 3a275aad..fba58f2b 100644 --- a/crates/sqllogictest/test_files/url/parse_url.slt +++ b/crates/sqllogictest/test_files/url/parse_url.slt @@ -341,13 +341,11 @@ SELECT parse_url('http://[::1/path', 'HOST'); ---- NULL -# Known difference from Spark, tracked in #365. java.net.URI doesn't range-check -# the port, so Spark returns the host in both ANSI modes. Here it is NULL, or an -# error with ANSI. -# query T -# SELECT parse_url('http://spark.apache.org:99999/path', 'HOST'); -# ---- -# spark.apache.org +# 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'); +---- +NULL # Mixed rows: a valid URL, a malformed URL and NULL query T @@ -371,6 +369,10 @@ 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: 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 query T SELECT try_parse_url('inva lid://spark.apache.org/path?query=1', 'QUERY');