You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/05/14 04:04:16 UTC

git commit: [SPARK-1527] change rootDir*.getName to rootDir*.getAbsolutePath

Repository: spark
Updated Branches:
  refs/heads/master 5c0dafc2c -> 753b04dea


[SPARK-1527] change rootDir*.getName to rootDir*.getAbsolutePath

JIRA issue: [SPARK-1527](https://issues.apache.org/jira/browse/SPARK-1527)

getName() only gets the last component of the file path. When deleting test-generated directories,
we should pass the generated directory's absolute path to DiskBlockManager.

Author: Ye Xianjin <ad...@gmail.com>

This patch had conflicts when merged, resolved by
Committer: Patrick Wendell <pw...@gmail.com>

Closes #436 from advancedxy/SPARK-1527 and squashes the following commits:

4678bab [Ye Xianjin] change rootDir*.getname to rootDir*.getAbsolutePath so the temporary directories are deleted when the test is finished.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/753b04de
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/753b04de
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/753b04de

Branch: refs/heads/master
Commit: 753b04dea4b04ba9d0dd0011f00e9d70367e76fc
Parents: 5c0dafc
Author: Ye Xianjin <ad...@gmail.com>
Authored: Tue May 13 19:03:51 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Tue May 13 19:03:51 2014 -0700

----------------------------------------------------------------------
 .../scala/org/apache/spark/storage/DiskBlockManagerSuite.scala     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/753b04de/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala b/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala
index 2167718..aaa7714 100644
--- a/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala
@@ -52,7 +52,7 @@ class DiskBlockManagerSuite extends FunSuite with BeforeAndAfterEach with Before
     rootDir0.deleteOnExit()
     rootDir1 = Files.createTempDir()
     rootDir1.deleteOnExit()
-    rootDirs = rootDir0.getName + "," + rootDir1.getName
+    rootDirs = rootDir0.getAbsolutePath + "," + rootDir1.getAbsolutePath
     println("Created root dirs: " + rootDirs)
   }