HeartSaVioR commented on a change in pull request #22952: [SPARK-20568][SS]
Provide option to clean up completed files in streaming query
URL: https://github.com/apache/spark/pull/22952#discussion_r338847897
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/FileStreamSource.scala
##########
@@ -330,4 +362,139 @@ object FileStreamSource {
def size: Int = map.size()
}
+
+ private[sql] class FileStreamSourceCleaner(
+ fileSystem: FileSystem,
+ sourcePath: Path,
+ baseArchiveFileSystem: Option[FileSystem],
+ baseArchivePath: Option[Path]) extends Logging {
+ require(baseArchiveFileSystem.isDefined == baseArchivePath.isDefined)
+
+ private val sourceGlobFilters: Seq[GlobFilter] =
buildSourceGlobFilters(sourcePath)
+
+ private val sameFsSourceAndArchive: Boolean = {
+ baseArchiveFileSystem.exists { fs =>
+ if (fileSystem.getUri != fs.getUri) {
+ logWarning("Base archive path is located to the different filesystem
with source, " +
+ s"which is not supported. source path: ${sourcePath} / base
archive path: " +
+ s"${baseArchivePath.get}")
+ false
+ } else {
+ true
+ }
+ }
+ }
+
+ /**
+ * This is a flag to skip matching archived path with source path.
+ *
+ * FileStreamSource reads the files which one of below conditions is met:
+ * 1) file itself is matched with source path
+ * 2) parent directory is matched with source path
+ *
+ * Checking with glob pattern is costly, so this flag leverages above
information to prune
+ * the cases where the file cannot be matched with source path. For
example, when file is
+ * moved to archive directory, destination path will retain input file's
path as suffix,
+ * so destination path can't be matched with source path if archive
directory's depth is
+ * longer than 2, as neither file nor parent directory of destination path
can be matched
+ * with source path.
+ */
+ private val skipCheckingGlob: Boolean = baseArchivePath.exists(_.depth() >
2)
+
+ def archive(entry: FileEntry): Unit = {
+ require(baseArchivePath.isDefined)
+
+ if (sameFsSourceAndArchive) {
+ val curPath = new Path(new URI(entry.path))
+ val newPath = new Path(baseArchivePath.get,
curPath.toUri.getPath.stripPrefix("/"))
+
+ if (!skipCheckingGlob && pathMatchesSourcePattern(newPath)) {
Review comment:
> I don't fully understand the matching you explained, but my guess is that
you could end up with an archived file called "/hello/hello1/hell" and that
somehow matches the pattern?
Exactly. We cannot forecast if first depth of source path has wildcard. Yes
we can also prune the case if the first depth of source path doesn't contain
wildcard, but feels like more and more complicated.
As we would really want to simplify the case, how about just forcing
baseArchivePath to have depth more than 2? (I feel it would be harmless in
production - if they're encountering the case, just create subdirectory.) Then
we can eliminate the pattern check entirely and throw error on config
validation phase. WDYT?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
