Skip to content

[SPARK-32240][SQL] Use URL to parse url string #30333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ulysses-you wants to merge 2 commits into from
Closed

[SPARK-32240][SQL] Use URL to parse url string #30333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea42bbd
init
ulysses-you Nov 11, 2020
f62e88b
init
ulysses-you Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 15 additions & 21 deletions ...catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.spark.sql.catalyst.expressions

import java.net.{URI, URISyntaxException}
import java.net.{MalformedURLException, URL}
import java.text.{BreakIterator, DecimalFormat, DecimalFormatSymbols}
import java.util.{HashMap, Locale, Map => JMap}
import java.util.regex.Pattern
Expand Down Expand Up @@ -1373,15 +1373,15 @@ case class ParseUrl(children: Seq[Expression])
Pattern.compile(REGEXPREFIX + key.toString + REGEXSUBFIX)
}

private def getUrl(url: UTF8String): URI = {
private def getUrl(url: UTF8String): URL = {
try {
new URI(url.toString)
new URL(url.toString)
} catch {
case e: URISyntaxException => null
case _: MalformedURLException => null
}
}

private def getExtractPartFunc(partToExtract: UTF8String): URI => String = {
private def getExtractPartFunc(partToExtract: UTF8String): URL => String = {

// partToExtract match {
// case HOST => _.toURL().getHost
Expand All @@ -1392,25 +1392,19 @@ case class ParseUrl(children: Seq[Expression])
// case FILE => _.toURL().getFile
// case AUTHORITY => _.toURL().getAuthority
// case USERINFO => _.toURL().getUserInfo
// case _ => (url: URI) => null
// case _ => (url: URL) => null
// }

partToExtract match {
case HOST => _.getHost
case PATH => _.getRawPath
case QUERY => _.getRawQuery
case REF => _.getRawFragment
case PROTOCOL => _.getScheme
case FILE =>
(url: URI) =>
if (url.getRawQuery ne null) {
url.getRawPath + "?" + url.getRawQuery
} else {
url.getRawPath
}
case AUTHORITY => _.getRawAuthority
case USERINFO => _.getRawUserInfo
case _ => (url: URI) => null
case PATH => _.getPath
case QUERY => _.getQuery
case REF => _.getRef
case PROTOCOL => _.getProtocol
case FILE => _.getFile
case AUTHORITY => _.getAuthority
case USERINFO => _.getUserInfo
case _ => (url: URL) => null
}
}

Expand All @@ -1423,7 +1417,7 @@ case class ParseUrl(children: Seq[Expression])
}
}

private def extractFromUrl(url: URI, partToExtract: UTF8String): UTF8String = {
private def extractFromUrl(url: URL, partToExtract: UTF8String): UTF8String = {
if (cachedExtractPartFunc ne null) {
UTF8String.fromString(cachedExtractPartFunc.apply(url))
} else {
Expand Down
1 change: 1 addition & 0 deletions ...yst/src/test/scala/org/apache/spark/sql/catalyst/expressions/StringExpressionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,6 +904,7 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
}

checkParseUrl("spark.apache.org", "http://spark.apache.org/path?query=1", "HOST")
checkParseUrl("a.b.c", "https://a.b.c/index.php?params1=a|b&params2=x", "HOST")
checkParseUrl("/path", "http://spark.apache.org/path?query=1", "PATH")
checkParseUrl("query=1", "http://spark.apache.org/path?query=1", "QUERY")
checkParseUrl("Ref", "http://spark.apache.org/path?query=1#Ref", "REF")
Expand Down