Commit a7e0941
fix(spark): return input string for PATH/FILE on schemeless URLs in
## Which issue does this PR close?
- NA
## Rationale for this change
Spark's `java.net.URI` treats schemeless strings (e.g. `'notaurl'`) as
relative URIs where the entire input becomes the path component. The
Rust `url` crate rejects these with `RelativeUrlWithoutBase`, and the
current implementation maps all such errors to `NULL` — but Spark
returns the input string for `PATH` and `FILE`.
## What changes are included in this PR?
- In `parse_url.rs`, when catching `RelativeUrlWithoutBase` for
schemeless URLs, return the input string for `PATH` and `FILE` parts
instead of `NULL`
- Updated unit tests and sqllogictests for both `parse_url` and
`try_parse_url`
## Are these changes tested?
Yes:
- Unit test `test_parse_schemeless_url` covers all 8 URL parts against a
schemeless input
- sqllogictest coverage in `parse_url.slt` and `try_parse_url.slt`
## Are there any user-facing changes?
Yes — `parse_url('notaurl', 'PATH')` and `parse_url('notaurl', 'FILE')`
now return `'notaurl'` instead of `NULL`, matching Spark behavior.
---------
Co-authored-by: Andrew Lamb <andrew@nerdnetworks.org>parse_url (#20506)1 parent 26251bb commit a7e0941
3 files changed
Lines changed: 387 additions & 5 deletions
File tree
- datafusion
- spark/src/function/url
- sqllogictest/test_files/spark/url
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
87 | | - | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
88 | 116 | | |
89 | 117 | | |
90 | 118 | | |
| |||
199 | 227 | | |
200 | 228 | | |
201 | 229 | | |
| 230 | + | |
202 | 231 | | |
203 | 232 | | |
204 | 233 | | |
| |||
207 | 236 | | |
208 | 237 | | |
209 | 238 | | |
| 239 | + | |
210 | 240 | | |
211 | 241 | | |
212 | 242 | | |
| |||
215 | 245 | | |
216 | 246 | | |
217 | 247 | | |
| 248 | + | |
218 | 249 | | |
219 | 250 | | |
220 | 251 | | |
| |||
240 | 271 | | |
241 | 272 | | |
242 | 273 | | |
| 274 | + | |
243 | 275 | | |
244 | 276 | | |
245 | 277 | | |
| |||
248 | 280 | | |
249 | 281 | | |
250 | 282 | | |
| 283 | + | |
251 | 284 | | |
252 | 285 | | |
253 | 286 | | |
| |||
256 | 289 | | |
257 | 290 | | |
258 | 291 | | |
| 292 | + | |
259 | 293 | | |
260 | 294 | | |
261 | 295 | | |
| |||
272 | 306 | | |
273 | 307 | | |
274 | 308 | | |
| 309 | + | |
275 | 310 | | |
276 | 311 | | |
277 | 312 | | |
| |||
284 | 319 | | |
285 | 320 | | |
286 | 321 | | |
287 | | - | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
288 | 327 | | |
289 | 328 | | |
290 | 329 | | |
| |||
357 | 396 | | |
358 | 397 | | |
359 | 398 | | |
360 | | - | |
361 | | - | |
362 | | - | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
363 | 479 | | |
364 | 480 | | |
365 | 481 | | |
| |||
Lines changed: 133 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
143 | 233 | | |
144 | 234 | | |
145 | 235 | | |
| |||
175 | 265 | | |
176 | 266 | | |
177 | 267 | | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
0 commit comments