aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Hunter <timhunter@databricks.com>2015-11-17 20:51:20 +0000
committerSean Owen <sowen@cloudera.com>2015-11-17 20:51:20 +0000
commitfa603e08de641df16d066302be5d5f92a60a923e (patch)
tree3e0b76d1b74c1aead729eece36c55743940bdb76
parent5aca6ad00c9d7fa43c725b8da4a10114a3a77421 (diff)
downloadspark-fa603e08de641df16d066302be5d5f92a60a923e.tar.gz
spark-fa603e08de641df16d066302be5d5f92a60a923e.tar.bz2
spark-fa603e08de641df16d066302be5d5f92a60a923e.zip
[SPARK-11732] Removes some MiMa false positives
This adds an extra filter for private or protected classes. We only filter for package private right now. Author: Timothy Hunter <timhunter@databricks.com> Closes #9697 from thunterdb/spark-11732.
-rw-r--r--project/MimaExcludes.scala7
-rw-r--r--tools/src/main/scala/org/apache/spark/tools/GenerateMIMAIgnore.scala4
2 files changed, 4 insertions, 7 deletions
diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala
index 815951822c..8b3bc96801 100644
--- a/project/MimaExcludes.scala
+++ b/project/MimaExcludes.scala
@@ -54,12 +54,7 @@ object MimaExcludes {
MimaBuild.excludeSparkClass("streaming.flume.FlumeTestUtils") ++
MimaBuild.excludeSparkClass("streaming.flume.PollingFlumeTestUtils") ++
Seq(
- ProblemFilters.exclude[MissingMethodProblem](
- "org.apache.spark.ml.classification.LogisticCostFun.this"),
- ProblemFilters.exclude[MissingMethodProblem](
- "org.apache.spark.ml.classification.LogisticAggregator.add"),
- ProblemFilters.exclude[MissingMethodProblem](
- "org.apache.spark.ml.classification.LogisticAggregator.count"),
+ // MiMa does not deal properly with sealed traits
ProblemFilters.exclude[MissingMethodProblem](
"org.apache.spark.ml.classification.LogisticRegressionSummary.featuresCol")
) ++ Seq(
diff --git a/tools/src/main/scala/org/apache/spark/tools/GenerateMIMAIgnore.scala b/tools/src/main/scala/org/apache/spark/tools/GenerateMIMAIgnore.scala
index a0524cabff..5155daa6d1 100644
--- a/tools/src/main/scala/org/apache/spark/tools/GenerateMIMAIgnore.scala
+++ b/tools/src/main/scala/org/apache/spark/tools/GenerateMIMAIgnore.scala
@@ -72,7 +72,9 @@ object GenerateMIMAIgnore {
val classSymbol = mirror.classSymbol(Class.forName(className, false, classLoader))
val moduleSymbol = mirror.staticModule(className)
val directlyPrivateSpark =
- isPackagePrivate(classSymbol) || isPackagePrivateModule(moduleSymbol)
+ isPackagePrivate(classSymbol) ||
+ isPackagePrivateModule(moduleSymbol) ||
+ classSymbol.isPrivate
val developerApi = isDeveloperApi(classSymbol) || isDeveloperApi(moduleSymbol)
val experimental = isExperimental(classSymbol) || isExperimental(moduleSymbol)
/* Inner classes defined within a private[spark] class or object are effectively