You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/04/25 08:34:06 UTC
git commit: SPARK-1607. Replace octal literals, removed in Scala 2.11,
with hex literals
Repository: spark
Updated Branches:
refs/heads/master 45ad7f0ca -> 6e101f118
SPARK-1607. Replace octal literals, removed in Scala 2.11, with hex literals
Octal literals like "0700" are deprecated in Scala 2.10, generating a warning. They have been removed entirely in 2.11. See https://issues.scala-lang.org/browse/SI-7618
This change simply replaces two uses of octals with hex literals, which seemed the next-best representation since they express a bit mask (file permission in particular)
Author: Sean Owen <so...@cloudera.com>
Closes #529 from srowen/SPARK-1607 and squashes the following commits:
1ee0e67 [Sean Owen] Use Integer.parseInt(...,8) for octal literal instead of hex equivalent
0102f3d [Sean Owen] Replace octal literals, removed in Scala 2.11, with hex literals
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6e101f11
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6e101f11
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6e101f11
Branch: refs/heads/master
Commit: 6e101f1183f92769779bc8ac14813c063bf1ff3f
Parents: 45ad7f0
Author: Sean Owen <so...@cloudera.com>
Authored: Thu Apr 24 23:34:00 2014 -0700
Committer: Matei Zaharia <ma...@databricks.com>
Committed: Thu Apr 24 23:34:00 2014 -0700
----------------------------------------------------------------------
.../main/scala/org/apache/spark/deploy/yarn/ClientBase.scala | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/6e101f11/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
----------------------------------------------------------------------
diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
index b403292..eb95d78 100644
--- a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
+++ b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
@@ -59,9 +59,11 @@ trait ClientBase extends Logging {
private val distCacheMgr = new ClientDistributedCacheManager()
// Staging directory is private! -> rwx--------
- val STAGING_DIR_PERMISSION: FsPermission = FsPermission.createImmutable(0700: Short)
+ val STAGING_DIR_PERMISSION: FsPermission =
+ FsPermission.createImmutable(Integer.parseInt("700", 8): Short)
// App files are world-wide readable and owner writable -> rw-r--r--
- val APP_FILE_PERMISSION: FsPermission = FsPermission.createImmutable(0644: Short)
+ val APP_FILE_PERMISSION: FsPermission =
+ FsPermission.createImmutable(Integer.parseInt("644", 8): Short)
// TODO(harvey): This could just go in ClientArguments.
def validateArgs() = {