Skip to content

Commit 7c51b99

Browse files
committed
[SPARK-14818] Post-2.0 MiMa exclusion and build changes
This patch makes a handful of post-Spark-2.0 MiMa exclusion and build updates. It should be merged to master and a subset of it should be picked into branch-2.0 in order to test Spark 2.0.1-SNAPSHOT. - Remove the ` sketch`, `mllibLocal`, and `streamingKafka010` from the list of excluded subprojects so that MiMa checks them. - Remove now-unnecessary special-case handling of the Kafka 0.8 artifact in `mimaSettings`. - Move the exclusion added in SPARK-14743 from `v20excludes` to `v21excludes`, since that patch was only merged into master and not branch-2.0. - Add exclusions for an API change introduced by SPARK-17096 / #14675. - Add missing exclusions for the `o.a.spark.internal` and `o.a.spark.sql.internal` packages. Author: Josh Rosen <joshrosen@databricks.com> Closes #15061 from JoshRosen/post-2.0-mima-changes.
1 parent 3d40896 commit 7c51b99

3 files changed

Lines changed: 12 additions & 13 deletions

File tree

project/MimaBuild.scala

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,8 @@ object MimaBuild {
8888

8989
def mimaSettings(sparkHome: File, projectRef: ProjectRef) = {
9090
val organization = "org.apache.spark"
91-
val previousSparkVersion = "1.6.0"
92-
// This check can be removed post-2.0
93-
val project = if (previousSparkVersion == "1.6.0" &&
94-
projectRef.project == "streaming-kafka-0-8"
95-
) {
96-
"streaming-kafka"
97-
} else {
98-
projectRef.project
99-
}
91+
val previousSparkVersion = "2.0.0"
92+
val project = projectRef.project
10093
val fullId = "spark-" + project + "_2.11"
10194
mimaDefaultSettings ++
10295
Seq(previousArtifact := Some(organization % fullId % previousSparkVersion),

project/MimaExcludes.scala

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ object MimaExcludes {
3737
// Exclude rules for 2.1.x
3838
lazy val v21excludes = v20excludes ++ {
3939
Seq(
40+
// [SPARK-14743] Improve delegation token handling in secure cluster
41+
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.deploy.SparkHadoopUtil.getTimeFromNowToRenewal"),
4042
// [SPARK-16199][SQL] Add a method to list the referenced columns in data source Filter
4143
ProblemFilters.exclude[ReversedMissingMethodProblem]("org.apache.spark.sql.sources.Filter.references"),
4244
// [SPARK-16853][SQL] Fixes encoder error in DataSet typed select
@@ -51,12 +53,15 @@ object MimaExcludes {
5153
Seq(
5254
excludePackage("org.apache.spark.rpc"),
5355
excludePackage("org.spark-project.jetty"),
56+
excludePackage("org.spark_project.jetty"),
57+
excludePackage("org.apache.spark.internal"),
5458
excludePackage("org.apache.spark.unused"),
5559
excludePackage("org.apache.spark.unsafe"),
5660
excludePackage("org.apache.spark.memory"),
5761
excludePackage("org.apache.spark.util.collection.unsafe"),
5862
excludePackage("org.apache.spark.sql.catalyst"),
5963
excludePackage("org.apache.spark.sql.execution"),
64+
excludePackage("org.apache.spark.sql.internal"),
6065
ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.mllib.feature.PCAModel.this"),
6166
ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.status.api.v1.StageData.this"),
6267
ProblemFilters.exclude[MissingMethodProblem](
@@ -787,9 +792,10 @@ object MimaExcludes {
787792
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.spark.sql.SQLContext.parquetFile"),
788793
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.spark.sql.SQLContext.applySchema")
789794
) ++ Seq(
790-
// [SPARK-14743] Improve delegation token handling in secure cluster
791-
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.deploy.SparkHadoopUtil.getTimeFromNowToRenewal")
792-
)
795+
// SPARK-17096: Improve exception string reported through the StreamingQueryListener
796+
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.sql.streaming.StreamingQueryListener#QueryTerminated.stackTrace"),
797+
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.sql.streaming.StreamingQueryListener#QueryTerminated.this")
798+
)
793799
}
794800

795801
def excludes(version: String) = version match {

project/SparkBuild.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ object SparkBuild extends PomBuild {
353353
val mimaProjects = allProjects.filterNot { x =>
354354
Seq(
355355
spark, hive, hiveThriftServer, catalyst, repl, networkCommon, networkShuffle, networkYarn,
356-
unsafe, tags, sketch, mllibLocal, streamingKafka010
356+
unsafe, tags
357357
).contains(x)
358358
}
359359

0 commit comments

Comments
 (0)