Github user zsxwing commented on a diff in the pull request:
https://github.com/apache/spark/pull/13513#discussion_r79518445
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/FileStreamSourceLog.scala
---
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.execution.streaming
+
+import java.util.{LinkedHashMap => JLinkedHashMap}
+import java.util.Map.Entry
+
+import scala.collection.mutable
+
+import org.json4s.NoTypeHints
+import org.json4s.jackson.Serialization
+
+import org.apache.spark.sql.SparkSession
+import org.apache.spark.sql.execution.streaming.FileStreamSource.FileEntry
+import org.apache.spark.sql.internal.SQLConf
+
+class FileStreamSourceLog(
+ metadataLogVersion: String,
+ sparkSession: SparkSession,
+ path: String)
+ extends CompactibleFileStreamLog[FileEntry](metadataLogVersion,
sparkSession, path) {
+
+ import CompactibleFileStreamLog._
+
+ // Configurations about metadata compaction
+ protected override val compactInterval =
+ sparkSession.conf.get(SQLConf.FILE_SOURCE_LOG_COMPACT_INTERVAL)
+ require(compactInterval > 0,
+ s"Please set ${SQLConf.FILE_SOURCE_LOG_COMPACT_INTERVAL.key} (was
$compactInterval) to a " +
+ s"positive value.")
+
+ protected override val fileCleanupDelayMs =
+ sparkSession.conf.get(SQLConf.FILE_SOURCE_LOG_CLEANUP_DELAY)
+
+ protected override val isDeletingExpiredLog =
+ sparkSession.conf.get(SQLConf.FILE_SOURCE_LOG_DELETION)
+
+ private implicit val formats = Serialization.formats(NoTypeHints)
+
+ // A fixed size log entry cache to cache the file entries belong to the
compaction batch. It is
+ // used to avoid scanning the compacted log file to retrieve it's own
batch data.
+ private val cacheSize = compactInterval
+ private val fileEntryCache = new JLinkedHashMap[Long, Array[FileEntry]] {
+ override def removeEldestEntry(eldest: Entry[Long, Array[FileEntry]]):
Boolean = {
+ size() > cacheSize
+ }
+ }
+
+ protected override def serializeData(data: FileEntry): String = {
+ Serialization.write(data)
+ }
+
+ protected override def deserializeData(encodedString: String): FileEntry
= {
+ Serialization.read[FileEntry](encodedString)
+ }
+
+ def compactLogs(logs: Seq[FileEntry]): Seq[FileEntry] = {
+ logs
+ }
+
+ override def add(batchId: Long, logs: Array[FileEntry]): Boolean = {
+ if (super.add(batchId, logs) && isCompactionBatch(batchId,
compactInterval)) {
--- End diff --
This is wrong. If `super.add(batchId, logs)` is false, then we should
always return `false`.
---
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
