spark git commit: [SPARK-5661]function hasShutdownDeleteTachyonDir should use shutdownDeleteTachyonPaths to determine whether contains file
Repository: spark
Updated Branches:
refs/heads/branch-1.3 2bf2b56ef -> 420bc9b3a
[SPARK-5661]function hasShutdownDeleteTachyonDir should use
shutdownDeleteTachyonPaths to determine whether contains file
hasShutdownDeleteTachyonDir(file: TachyonFile) should use
shutdownDeleteTachyonPaths(not shutdownDeletePaths) to determine Whether
contain file. To solve it ,delete two unused function.
Author: xukun 00228947
Author: viper-kun
Closes #4418 from viper-kun/deleteunusedfun and squashes the following commits:
87340eb [viper-kun] fix style
3d6c69e [xukun 00228947] fix bug
2bc397e [xukun 00228947] deleteunusedfun
(cherry picked from commit b271c265b742fa6947522eda4592e9e6a7fd1f3a)
Signed-off-by: Sean Owen
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/420bc9b3
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/420bc9b3
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/420bc9b3
Branch: refs/heads/branch-1.3
Commit: 420bc9b3ae49883f17962b1cff18a3b8df3bd05c
Parents: 2bf2b56
Author: xukun 00228947
Authored: Tue Feb 17 18:59:41 2015 +
Committer: Sean Owen
Committed: Tue Feb 17 18:59:51 2015 +
--
core/src/main/scala/org/apache/spark/util/Utils.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/420bc9b3/core/src/main/scala/org/apache/spark/util/Utils.scala
--
diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala
b/core/src/main/scala/org/apache/spark/util/Utils.scala
index c06bd6f..df21ed3 100644
--- a/core/src/main/scala/org/apache/spark/util/Utils.scala
+++ b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -213,8 +213,8 @@ private[spark] object Utils extends Logging {
// Is the path already registered to be deleted via a shutdown hook ?
def hasShutdownDeleteTachyonDir(file: TachyonFile): Boolean = {
val absolutePath = file.getPath()
-shutdownDeletePaths.synchronized {
- shutdownDeletePaths.contains(absolutePath)
+shutdownDeleteTachyonPaths.synchronized {
+ shutdownDeleteTachyonPaths.contains(absolutePath)
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
spark git commit: [SPARK-5661]function hasShutdownDeleteTachyonDir should use shutdownDeleteTachyonPaths to determine whether contains file
Repository: spark
Updated Branches:
refs/heads/master d8f69cf78 -> b271c265b
[SPARK-5661]function hasShutdownDeleteTachyonDir should use
shutdownDeleteTachyonPaths to determine whether contains file
hasShutdownDeleteTachyonDir(file: TachyonFile) should use
shutdownDeleteTachyonPaths(not shutdownDeletePaths) to determine Whether
contain file. To solve it ,delete two unused function.
Author: xukun 00228947
Author: viper-kun
Closes #4418 from viper-kun/deleteunusedfun and squashes the following commits:
87340eb [viper-kun] fix style
3d6c69e [xukun 00228947] fix bug
2bc397e [xukun 00228947] deleteunusedfun
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b271c265
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b271c265
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b271c265
Branch: refs/heads/master
Commit: b271c265b742fa6947522eda4592e9e6a7fd1f3a
Parents: d8f69cf
Author: xukun 00228947
Authored: Tue Feb 17 18:59:41 2015 +
Committer: Sean Owen
Committed: Tue Feb 17 18:59:41 2015 +
--
core/src/main/scala/org/apache/spark/util/Utils.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/b271c265/core/src/main/scala/org/apache/spark/util/Utils.scala
--
diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala
b/core/src/main/scala/org/apache/spark/util/Utils.scala
index c06bd6f..df21ed3 100644
--- a/core/src/main/scala/org/apache/spark/util/Utils.scala
+++ b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -213,8 +213,8 @@ private[spark] object Utils extends Logging {
// Is the path already registered to be deleted via a shutdown hook ?
def hasShutdownDeleteTachyonDir(file: TachyonFile): Boolean = {
val absolutePath = file.getPath()
-shutdownDeletePaths.synchronized {
- shutdownDeletePaths.contains(absolutePath)
+shutdownDeleteTachyonPaths.synchronized {
+ shutdownDeleteTachyonPaths.contains(absolutePath)
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
