Github user aarondav commented on a diff in the pull request:
https://github.com/apache/spark/pull/2609#discussion_r18360895
--- Diff: core/src/main/scala/org/apache/spark/util/Utils.scala ---
@@ -703,17 +705,20 @@ private[spark] object Utils extends Logging {
}
/**
- * Finds all the files in a directory whose last modified time is older
than cutoff seconds.
- * @param dir must be the path to a directory, or
IllegalArgumentException is thrown
- * @param cutoff measured in seconds. Files older than this are returned.
+ * Determines if a directory contains any files newer than cutoff
seconds.
+ *
+ * @param dir must be the path to a directory, or
IllegalArgumentException is thrown
+ * @param cutoff measured in seconds. Returns true if there are any
files in dir newer than this.
*/
- def findOldFiles(dir: File, cutoff: Long): Seq[File] = {
+ def doesDirectoryContainAnyNewFiles(dir: File, cutoff: Long) : Boolean =
{
val currentTimeMillis = System.currentTimeMillis
- if (dir.isDirectory) {
- val files = listFilesSafely(dir)
- files.filter { file => file.lastModified < (currentTimeMillis -
cutoff * 1000) }
+ if (!dir.isDirectory) {
+ throw new IllegalArgumentException (dir + " is not a directory!")
} else {
- throw new IllegalArgumentException(dir + " is not a directory!")
+ val files = FileUtils.listFilesAndDirs(dir, TrueFileFilter.TRUE,
TrueFileFilter.TRUE)
+ val cutoffTimeInMillis = (currentTimeMillis - (cutoff * 1000))
+ val newFiles = files.filter { file => file.lastModified >
cutoffTimeInMillis }
+ (dir.lastModified > cutoffTimeInMillis) || (!newFiles.isEmpty)
--- End diff --
nit: newFiles.nonEmpty
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
