Fixed my bad

apache · Jan 9, 2020 · 163bda0 · 163bda0
1 parent 29ba0f2
commit 163bda0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/core/src/main/scala/org/apache/spark/deploy/history/EventFilter.scala b/core/src/main/scala/org/apache/spark/deploy/history/EventFilter.scala
@@ -91,10 +91,10 @@ private[spark] object EventFilter extends Logging {
 
           event.foreach { e =>
             val results = filters.flatMap(_.acceptFn().lift.apply(e))
-            if (results.isEmpty || !results.contains(false)) {
-              onAccepted(line, e)
-            } else {
+            if (results.nonEmpty && results.forall(_ == false)) {
               onRejected(line, e)
+            } else {
+              onAccepted(line, e)
             }
           }
         } catch {

diff --git a/core/src/main/scala/org/apache/spark/deploy/history/EventLogFileCompactor.scala b/core/src/main/scala/org/apache/spark/deploy/history/EventLogFileCompactor.scala
@@ -46,7 +46,7 @@ import org.apache.spark.util.Utils
  * represents approximate rate of filtered-out events. Score is being calculated via applying
  * heuristic; task events tend to take most size in event log.
  */
-private[spark] class EventLogFileCompactor(
+class EventLogFileCompactor(
     sparkConf: SparkConf,
     hadoopConf: Configuration,
     fs: FileSystem) extends Logging {
@@ -200,11 +200,9 @@ private[spark] class EventLogFileCompactor(
  * @param compactIndex The index of compact file if the compaction is successful.
  *                     Otherwise it will be None.
  */
-private[spark] case class CompactionResult(
-    code: CompactionResultCode.Value,
-    compactIndex: Option[Long])
+case class CompactionResult(code: CompactionResultCode.Value, compactIndex: Option[Long])
 
-private[spark] object CompactionResultCode extends Enumeration {
+object CompactionResultCode extends Enumeration {
   val SUCCESS, NOT_ENOUGH_FILES, LOW_SCORE_FOR_COMPACTION = Value
 }
 

diff --git a/core/src/test/scala/org/apache/spark/deploy/history/EventLogFileCompactorSuite.scala b/core/src/test/scala/org/apache/spark/deploy/history/EventLogFileCompactorSuite.scala
@@ -239,9 +239,9 @@ class EventLogFileCompactorSuite extends SparkFunSuite {
       // filterApplicationEnd: Some(true) & Some(true) => filter in
       expectedLines += writeEventToWriter(writer, SparkListenerApplicationEnd(0))
 
-      // filterBlockManagerAdded: Some(true) & Some(false) => filter out
-      writeEventToWriter(writer, SparkListenerBlockManagerAdded(0, BlockManagerId("1", "host1", 1),
-        10))
+      // filterBlockManagerAdded: Some(true) & Some(false) => filter in
+      expectedLines += writeEventToWriter(writer, SparkListenerBlockManagerAdded(
+        0, BlockManagerId("1", "host1", 1), 10))
 
       // filterApplicationStart: Some(false) & Some(false) => filter out
       writeEventToWriter(writer, SparkListenerApplicationStart("app", None, 0, "user", None))