From 79fa8fd4b198904ca9ed78a821fd924bd1a82902 Mon Sep 17 00:00:00 2001 From: Prashant Sharma Date: Fri, 30 May 2014 01:13:51 -0700 Subject: [SPARK-1971] Update MIMA to compare against Spark 1.0.0 Author: Prashant Sharma Closes #910 from ScrapCodes/enable-mima/spark-core and squashes the following commits: 79f3687 [Prashant Sharma] updated Mima to check against version 1.0 1e8969c [Prashant Sharma] Spark core missed out on Mima settings. So in effect we never tested spark core for mima related errors. --- project/MimaBuild.scala | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) (limited to 'project/MimaBuild.scala') diff --git a/project/MimaBuild.scala b/project/MimaBuild.scala index e147be7dda..182ca7615d 100644 --- a/project/MimaBuild.scala +++ b/project/MimaBuild.scala @@ -31,7 +31,7 @@ object MimaBuild { // Read package-private excludes from file val excludeFilePath = (base.getAbsolutePath + "/.mima-excludes") val excludeFile = file(excludeFilePath) - val packagePrivateList: Seq[String] = + val ignoredClasses: Seq[String] = if (!excludeFile.exists()) { Seq() } else { @@ -60,35 +60,9 @@ object MimaBuild { excludePackage("org.apache.spark." + packageName) } - val packagePrivateExcludes = packagePrivateList.flatMap(excludeClass) + val externalExcludeFileClasses = ignoredClasses.flatMap(excludeClass) - /* Excludes specific to a given version of Spark. When comparing the given version against - its immediate predecessor, the excludes listed here will be applied. */ - val versionExcludes = - SparkBuild.SPARK_VERSION match { - case v if v.startsWith("1.0") => - Seq( - excludeSparkPackage("api.java"), - excludeSparkPackage("mllib"), - excludeSparkPackage("streaming") - ) ++ - excludeSparkClass("rdd.ClassTags") ++ - excludeSparkClass("util.XORShiftRandom") ++ - excludeSparkClass("graphx.EdgeRDD") ++ - excludeSparkClass("graphx.VertexRDD") ++ - excludeSparkClass("graphx.impl.GraphImpl") ++ - excludeSparkClass("graphx.impl.RoutingTable") ++ - excludeSparkClass("graphx.util.collection.PrimitiveKeyOpenHashMap") ++ - excludeSparkClass("graphx.util.collection.GraphXPrimitiveKeyOpenHashMap") ++ - excludeSparkClass("mllib.recommendation.MFDataGenerator") ++ - excludeSparkClass("mllib.optimization.SquaredGradient") ++ - excludeSparkClass("mllib.regression.RidgeRegressionWithSGD") ++ - excludeSparkClass("mllib.regression.LassoWithSGD") ++ - excludeSparkClass("mllib.regression.LinearRegressionWithSGD") - case _ => Seq() - } - - defaultExcludes ++ packagePrivateExcludes ++ versionExcludes + defaultExcludes ++ externalExcludeFileClasses } def mimaSettings(sparkHome: File) = mimaDefaultSettings ++ Seq( -- cgit v1.2.3