Skip to content

[SPARK-34225][CORE][FOLLOWUP] Replace Hadoop's Path with Utils.resolveURI to make the way to get URI simple #32164

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
sarutak wants to merge 2 commits into from
Closed

[SPARK-34225][CORE][FOLLOWUP] Replace Hadoop's Path with Utils.resolveURI to make the way to get URI simple #32164

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0069c8a
Replace Hadoop's Path with Utils.resolveURI.
sarutak Apr 14, 2021
1446667
Merge branch 'master' of https://github.com/apache/spark into followu…
sarutak Apr 15, 2021
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
16 changes: 2 additions & 14 deletions core/src/main/scala/org/apache/spark/SparkContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1583,15 +1583,7 @@ class SparkContext(config: SparkConf) extends Logging {
private def addFile(
path: String, recursive: Boolean, addedOnSubmit: Boolean, isArchive: Boolean = false
): Unit = {
val uri = if (!isArchive) {
if (Utils.isAbsoluteURI(path) && path.contains("%")) {
new URI(path)
} else {
new Path(path).toUri
}
} else {
Utils.resolveURI(path)
}
val uri = Utils.resolveURI(path)
val schemeCorrectedURI = uri.getScheme match {
case null => new File(path).getCanonicalFile.toURI
case "local" =>
Expand Down Expand Up @@ -1979,11 +1971,7 @@ class SparkContext(config: SparkConf) extends Logging {
// For local paths with backslashes on Windows, URI throws an exception
(addLocalJarFile(new File(path)), "local")
} else {
val uri = if (Utils.isAbsoluteURI(path) && path.contains("%")) {
new URI(path)
} else {
new Path(path).toUri
}
val uri = Utils.resolveURI(path)
// SPARK-17650: Make sure this is a valid URL before adding it to the list of dependencies
Utils.validateURL(uri)
val uriScheme = uri.getScheme
Expand Down