You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "HeartSaVioR (via GitHub)" <gi...@apache.org> on 2024/05/20 01:55:15 UTC
Re: [PR] [SPARK-48314][SQL] Don't double cache files for FileStreamSource using Trigger.AvailableNow [spark]
HeartSaVioR commented on code in PR #46627:
URL: https://github.com/apache/spark/pull/46627#discussion_r1606163587
##########
sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSourceSuite.scala:
##########
@@ -2357,6 +2357,46 @@ class FileStreamSourceSuite extends FileStreamSourceTest {
}
}
+ test("SPARK-48314: Don't cache unread files when using Trigger.AvailableNow") {
+ withCountListingLocalFileSystemAsLocalFileSystem {
+ withThreeTempDirs { case (src, meta, tmp) =>
+ val options = Map("latestFirst" -> "true", "maxFilesPerTrigger" -> "5")
+ val scheme = CountListingLocalFileSystem.scheme
+ val source = new FileStreamSource(spark, s"$scheme:///${src.getCanonicalPath}/*/*", "text",
+ StructType(Nil), Seq.empty, meta.getCanonicalPath, options)
+
+ source.prepareForTriggerAvailableNow()
+
+ CountListingLocalFileSystem.resetCount()
+
+ // provide 20 files in src, with sequential "last modified" to guarantee ordering
+ (0 to 19).map { idx =>
+ val f = createFile(idx.toString, new File(src, idx.toString), tmp)
+ f.setLastModified(idx * 10000)
+ f
+ }
+
+ source.latestOffset(FileStreamSourceOffset(-1L), ReadLimit.maxFiles(5))
Review Comment:
Shall we check the result just for completeness sake?
##########
sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSourceSuite.scala:
##########
@@ -2357,6 +2357,46 @@ class FileStreamSourceSuite extends FileStreamSourceTest {
}
}
+ test("SPARK-48314: Don't cache unread files when using Trigger.AvailableNow") {
+ withCountListingLocalFileSystemAsLocalFileSystem {
+ withThreeTempDirs { case (src, meta, tmp) =>
+ val options = Map("latestFirst" -> "true", "maxFilesPerTrigger" -> "5")
+ val scheme = CountListingLocalFileSystem.scheme
+ val source = new FileStreamSource(spark, s"$scheme:///${src.getCanonicalPath}/*/*", "text",
+ StructType(Nil), Seq.empty, meta.getCanonicalPath, options)
+
+ source.prepareForTriggerAvailableNow()
+
+ CountListingLocalFileSystem.resetCount()
+
+ // provide 20 files in src, with sequential "last modified" to guarantee ordering
+ (0 to 19).map { idx =>
+ val f = createFile(idx.toString, new File(src, idx.toString), tmp)
+ f.setLastModified(idx * 10000)
+ f
+ }
+
+ source.latestOffset(FileStreamSourceOffset(-1L), ReadLimit.maxFiles(5))
+ .asInstanceOf[FileStreamSourceOffset]
+
+ // All files are already tracked in allFilesForTriggerAvailableNow
+ assert(0 === CountListingLocalFileSystem.pathToNumListStatusCalled
+ .get(src.getCanonicalPath).map(_.get()).getOrElse(0))
+
+ // Unread files should be empty
+ assert(source.unreadFiles == null)
+
+ // Reading again leverages the files already tracked in allFilesForTriggerAvailableNow,
+ // so no more listings need to happen
+ source.latestOffset(FileStreamSourceOffset(-1L), ReadLimit.maxFiles(5))
Review Comment:
Same here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org