From cb52f2bb747960cd4945a3784d2d8a153565bbf8 Mon Sep 17 00:00:00 2001
From: Kelvin Chu <kelvinkwchu@yahoo.com>
Date: Wed, 2 Apr 2014 00:23:24 -0700
Subject: [PATCH] Change the name of findOldestFiles() to findOldFiles()

---
 core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala | 2 +-
 core/src/main/scala/org/apache/spark/util/Utils.scala           | 2 +-
 core/src/test/scala/org/apache/spark/util/UtilsSuite.scala      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala b/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala
index aa336db95593a..df78e1e3d1d96 100755
--- a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala
@@ -196,7 +196,7 @@ private[spark] class Worker(
       // Spin up a separate thread (in a future) to do the dir cleanup; don't tie up worker actor
       val cleanupFuture = concurrent.future {
         logInfo("Cleaning up oldest application directories in " + workDir + " ...")
-        Utils.findOldestFiles(workDir, APP_DATA_RETENTION_SECS)
+        Utils.findOldFiles(workDir, APP_DATA_RETENTION_SECS)
              .foreach(Utils.deleteRecursively(_))
       }
       cleanupFuture onFailure {
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 891caed156776..559cd7f00471b 100644
--- a/core/src/main/scala/org/apache/spark/util/Utils.scala
+++ b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -541,7 +541,7 @@ private[spark] object Utils extends Logging {
    * @param dir  must be the path to a directory, or IllegalArgumentException is thrown
    * @param cutoff measured in seconds. Files older than this are returned.
    */
-  def findOldestFiles(dir: File, cutoff: Long): Seq[File] = {
+  def findOldFiles(dir: File, cutoff: Long): Seq[File] = {
     val currentTimeSecs = System.currentTimeMillis / 1000
     if (dir.isDirectory) {
       val files = listFilesSafely(dir)
diff --git a/core/src/test/scala/org/apache/spark/util/UtilsSuite.scala b/core/src/test/scala/org/apache/spark/util/UtilsSuite.scala
index dabecd89be9f3..eb7fb6318262b 100644
--- a/core/src/test/scala/org/apache/spark/util/UtilsSuite.scala
+++ b/core/src/test/scala/org/apache/spark/util/UtilsSuite.scala
@@ -155,7 +155,7 @@ class UtilsSuite extends FunSuite {
     assert(Utils.getIteratorSize(iterator) === 5L)
   }
 
-  test("findOldestFiles") {
+  test("findOldFiles") {
     // create some temporary directories and files
     val parent: File = Utils.createTempDir()
     val child1: File = Utils.createTempDir(parent.getCanonicalPath) // The parent directory has two child directories