aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Hindman <benjamin.hindman@gmail.com>2013-07-31 12:29:42 -0700
committerBenjamin Hindman <benjamin.hindman@gmail.com>2013-07-31 12:29:44 -0700
commit4692ea48920cb7cebd2cf8cacc43382168801722 (patch)
tree58c4f978dcf911e286e6dd6bb2dc530548e6f7b1
parent7bdafa918ac5850197dacadd3ea56ef544a6a9f8 (diff)
downloadspark-4692ea48920cb7cebd2cf8cacc43382168801722.tar.gz
spark-4692ea48920cb7cebd2cf8cacc43382168801722.tar.bz2
spark-4692ea48920cb7cebd2cf8cacc43382168801722.zip
Used 'uri.split('/').last' instead of 'new File(uri).getName()'.
-rw-r--r--core/src/main/scala/spark/scheduler/mesos/CoarseMesosSchedulerBackend.scala2
-rw-r--r--core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/spark/scheduler/mesos/CoarseMesosSchedulerBackend.scala b/core/src/main/scala/spark/scheduler/mesos/CoarseMesosSchedulerBackend.scala
index f75244a9ac..6ebbb5ec9b 100644
--- a/core/src/main/scala/spark/scheduler/mesos/CoarseMesosSchedulerBackend.scala
+++ b/core/src/main/scala/spark/scheduler/mesos/CoarseMesosSchedulerBackend.scala
@@ -131,7 +131,7 @@ private[spark] class CoarseMesosSchedulerBackend(
} else {
// Grab everything to the first '.'. We'll use that and '*' to
// glob the directory "correctly".
- val basename = new File(uri).getName().split('.')(0)
+ val basename = uri.split('/').last.split('.').head
command.setValue("cd %s*; ./run spark.executor.StandaloneExecutorBackend %s %s %s %d".format(
basename, driverUrl, offer.getSlaveId.getValue, offer.getHostname, numCores))
command.addUris(CommandInfo.URI.newBuilder().setValue(uri))
diff --git a/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala b/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala
index 51b780ac72..f6069a5775 100644
--- a/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala
+++ b/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala
@@ -104,7 +104,7 @@ private[spark] class MesosSchedulerBackend(
} else {
// Grab everything to the first '.'. We'll use that and '*' to
// glob the directory "correctly".
- val basename = new File(uri).getName().split('.')(0)
+ val basename = uri.split('/').last.split('.').head
command.setValue("cd %s*; ./spark-executor".format(basename))
command.addUris(CommandInfo.URI.newBuilder().setValue(uri))
}