Skip to content

[SPARK-6300][Spark Core] sc.addFile(path) does not support the relative path. #4993

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
pzzs wants to merge 9 commits into from
Closed

[SPARK-6300][Spark Core] sc.addFile(path) does not support the relative path. #4993

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c3f046f
Merge pull request #1 from apache/master
pzzs Mar 2, 2015
cb1852d
Merge pull request #2 from apache/master
pzzs Mar 5, 2015
c87e8b6
Merge pull request #3 from apache/master
pzzs Mar 10, 2015
161cae3
Merge pull request #4 from apache/master
pzzs Mar 12, 2015
e4a13fe
getCanonicalPath
pzzs Mar 12, 2015
dced8eb
Update SparkContext.scala
pzzs Mar 12, 2015
0ff3fa8
test for add file
pzzs Mar 12, 2015
d594e16
Update SparkContext.scala
pzzs Mar 13, 2015
ee375cd
Update SparkContextSuite.scala
pzzs Mar 13, 2015
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
2 changes: 1 addition & 1 deletion 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 @@ -1093,7 +1093,7 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
def addFile(path: String, recursive: Boolean): Unit = {
val uri = new URI(path)
val schemeCorrectedPath = uri.getScheme match {
case null | "local" => "file:" + uri.getPath
case null | "local" => "file:" + new File(path).getCanonicalPath
Copy link
Member

@srowen srowen Mar 12, 2015

Choose a reason for hiding this comment

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

I think this might be slightly more robust as new File(path).getCanonicalFile.toURI.toString. Then the "file:" can go away too.

case _ => path
}

Expand Down
29 changes: 29 additions & 0 deletions core/src/test/scala/org/apache/spark/SparkContextSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,35 @@ class SparkContextSuite extends FunSuite with LocalSparkContext {
sc.stop()
}
}

test("addFile works with relative path") {
Copy link
Member

@srowen srowen Mar 12, 2015

Choose a reason for hiding this comment

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

Rather than copy and paste the test I wonder if this can just be injected into the "addFile works" test. Like, make the test file a relative path there. Also I see that test doesn't use the framework provided temp dir which you did correctly here.

Copy link
Contributor

@sryza sryza Mar 12, 2015

Choose a reason for hiding this comment

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

I think it would be good to test both absolute and relative paths. Maybe we can break the meat of the test out into a separate function and have both tests call it.

val pluto = Utils.createTempDir()
val file = File.createTempFile("someprefix", "somesuffix", pluto)
val relativePath = file.getParent + "/../" + file.getParentFile.getName + "/" + file.getName
val absolutePath = file.getAbsolutePath
try {
Files.write("somewords", file, UTF_8)
val length = file.length()
sc = new SparkContext(new SparkConf().setAppName("test").setMaster("local"))
sc.addFile(relativePath)
sc.parallelize(Array(1), 1).map(x => {
val gotten = new File(SparkFiles.get(file.getName))
if (!gotten.exists()) {
throw new SparkException("file doesn't exist")
}
if (length != gotten.length()) {
throw new SparkException(
s"file has different length $length than added file ${gotten.length()}")
}
if (absolutePath == gotten.getAbsolutePath) {
throw new SparkException("file should have been copied")
}
x
}).count()
} finally {
sc.stop()
}
}

test("addFile recursive works") {
val pluto = Utils.createTempDir()
Expand Down