aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2013-11-01 15:40:33 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2013-11-01 15:40:33 -0700
commitd6d11c2edbd11d2fde6dceb706711f2a4c3cf39d (patch)
tree1e666ae4b51b1a7cceb0e6ccf3dfe278480c4086 /core
parent8f1098a3f0de8c9b2eb9ede91a1b01da10a525ea (diff)
parentf3679fd494893d4feafec5c44d31adf1ee3aa2dc (diff)
downloadspark-d6d11c2edbd11d2fde6dceb706711f2a4c3cf39d.tar.gz
spark-d6d11c2edbd11d2fde6dceb706711f2a4c3cf39d.tar.bz2
spark-d6d11c2edbd11d2fde6dceb706711f2a4c3cf39d.zip
Merge pull request #129 from velvia/2013-11/document-local-uris
Document & finish support for local: URIs Review all the supported URI schemes for addJar / addFile to the Cluster Overview page. Add support for local: URI to addFile.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/SparkContext.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
index 8d7c5a77da..880b49e8ef 100644
--- a/core/src/main/scala/org/apache/spark/SparkContext.scala
+++ b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -591,7 +591,8 @@ class SparkContext(
val uri = new URI(path)
val key = uri.getScheme match {
case null | "file" => env.httpFileServer.addFile(new File(uri.getPath))
- case _ => path
+ case "local" => "file:" + uri.getPath
+ case _ => path
}
addedFiles(key) = System.currentTimeMillis