From 0e5ba5cefaca04c188aadf5309ca6d5dffe1c63f Mon Sep 17 00:00:00 2001 From: Sean Owen Date: Tue, 30 Dec 2014 12:46:10 +0000 Subject: [PATCH 1/2] Re-enable MiMa for Streaming Flume Sink module --- project/SparkBuild.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index c512b62f6137..46a54c681840 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -166,7 +166,7 @@ object SparkBuild extends PomBuild { // TODO: Add Sql to mima checks allProjects.filterNot(x => Seq(spark, sql, hive, hiveThriftServer, catalyst, repl, - streamingFlumeSink, networkCommon, networkShuffle, networkYarn).contains(x)).foreach { + networkCommon, networkShuffle, networkYarn).contains(x)).foreach { x => enable(MimaBuild.mimaSettings(sparkHome, x))(x) } From 50ff80e4498c2cb0a30793fb41fa2d20942811d6 Mon Sep 17 00:00:00 2001 From: Sean Owen Date: Tue, 30 Dec 2014 14:41:09 +0000 Subject: [PATCH 2/2] Exclude apparent false positive turned up by re-enabling MiMa checks for Streaming Flume Sink --- project/MimaExcludes.scala | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala index 230239aa4050..c377e5cffa7d 100644 --- a/project/MimaExcludes.scala +++ b/project/MimaExcludes.scala @@ -53,6 +53,11 @@ object MimaExcludes { "org.apache.spark.mllib.linalg.Matrices.randn"), ProblemFilters.exclude[MissingMethodProblem]( "org.apache.spark.mllib.linalg.Matrices.rand") + ) ++ Seq( + // SPARK-2757 + ProblemFilters.exclude[IncompatibleResultTypeProblem]( + "org.apache.spark.streaming.flume.sink.SparkAvroCallbackHandler." + + "removeAndGetProcessor") ) case v if v.startsWith("1.2") =>