Skip to content
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

[SPARK-26137][CORE] Use Java system property "file.separator" inste… #23102

Closed
wants to merge 5 commits into from
Closed

[SPARK-26137][CORE] Use Java system property "file.separator" inste… #23102

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49ce5a8
[SPARK-26137][CORE] Use Java system property "file.separator" instead…
Nov 21, 2018
24c05e3
[SPARK-26137][CORE] Use File.separator instead of System.getProperty(…
Nov 26, 2018
bfabd4f
[SPARK-26137][CORE] Add unit test
Nov 26, 2018
4ab68f0
[SPARK-26137][CORE] Add missing blank line to comply with style
Nov 26, 2018
e1e97aa
[SPARK-26137][CORE] Use File.separatorChar instead of File.separator
Nov 27, 2018
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
4 changes: 3 additions & 1 deletion core/src/main/scala/org/apache/spark/deploy/DependencyUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package org.apache.spark.deploy

import java.io.File
import java.net.URI
import java.util.regex.Pattern
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Remove this import)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done


import org.apache.commons.lang3.StringUtils
import org.apache.hadoop.conf.Configuration
Expand Down Expand Up @@ -61,11 +62,12 @@ private[deploy] object DependencyUtils extends Logging {
hadoopConf: Configuration,
secMgr: SecurityManager): String = {
val targetDir = Utils.createTempDir()
val fileSeparator = Pattern.quote(System.getProperty("file.separator"))
Option(jars)
.map {
resolveGlobPaths(_, hadoopConf)
.split(",")
.filterNot(_.contains(userJar.split("/").last))
.filterNot(_.contains(userJar.split(fileSeparator).last))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just split on File.separator, not a regex.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Beyond the original purpose of this PR, is it better to move userJar.split(fileSeparator).last before line 66? This is because userJar is not changed in map { ... }.

.mkString(",")
}
.filterNot(_ == "")
Expand Down