Skip to content

Commit 6d37e1e

Browse files
committed
[SPARK-13817][BUILD][SQL] Re-enable MiMA and removes object DataFrame
## What changes were proposed in this pull request? PR #11443 temporarily disabled MiMA check, this PR re-enables it. One extra change is that `object DataFrame` is also removed. The only purpose of introducing `object DataFrame` was to use it as an internal factory for creating `Dataset[Row]`. By replacing this internal factory with `Dataset.newDataFrame`, both `DataFrame` and `DataFrame$` are entirely removed from the API, so that we can simply put a `MissingClassProblem` filter in `MimaExcludes.scala` for most DataFrame API changes. ## How was this patch tested? Tested by MiMA check triggered by Jenkins. Author: Cheng Lian <[email protected]> Closes #11656 from liancheng/re-enable-mima.
1 parent 07f1c54 commit 6d37e1e

33 files changed

+78
-69
lines changed

dev/run-tests.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,7 @@ def main():
573573
# backwards compatibility checks
574574
if build_tool == "sbt":
575575
# Note: compatibility tests only supported in sbt for now
576-
# TODO Temporarily disable MiMA check for DF-to-DS migration prototyping
577-
# detect_binary_inop_with_mima()
576+
detect_binary_inop_with_mima()
578577
# Since we did not build assembly/assembly before running dev/mima, we need to
579578
# do it here because the tests still rely on it; see SPARK-13294 for details.
580579
build_spark_assembly_sbt(hadoop_version)

examples/src/main/java/org/apache/spark/examples/ml/JavaAFTSurvivalRegressionExample.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.spark.ml.regression.AFTSurvivalRegression;
2727
import org.apache.spark.ml.regression.AFTSurvivalRegressionModel;
2828
import org.apache.spark.mllib.linalg.*;
29-
import org.apache.spark.sql.DataFrame;
3029
import org.apache.spark.sql.Dataset;
3130
import org.apache.spark.sql.Row;
3231
import org.apache.spark.sql.RowFactory;

examples/src/main/java/org/apache/spark/examples/ml/JavaALSExample.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.apache.spark.ml.evaluation.RegressionEvaluator;
3232
import org.apache.spark.ml.recommendation.ALS;
3333
import org.apache.spark.ml.recommendation.ALSModel;
34-
import org.apache.spark.sql.DataFrame;
3534
import org.apache.spark.sql.types.DataTypes;
3635
// $example off$
3736

examples/src/main/java/org/apache/spark/examples/ml/JavaBinarizerExample.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
import org.apache.spark.api.java.JavaRDD;
2929
import org.apache.spark.ml.feature.Binarizer;
30-
import org.apache.spark.sql.DataFrame;
3130
import org.apache.spark.sql.Row;
3231
import org.apache.spark.sql.RowFactory;
3332
import org.apache.spark.sql.types.DataTypes;

examples/src/main/java/org/apache/spark/examples/ml/JavaCrossValidatorExample.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.apache.spark.ml.tuning.CrossValidator;
3434
import org.apache.spark.ml.tuning.CrossValidatorModel;
3535
import org.apache.spark.ml.tuning.ParamGridBuilder;
36-
import org.apache.spark.sql.DataFrame;
3736
import org.apache.spark.sql.Dataset;
3837
import org.apache.spark.sql.Row;
3938
import org.apache.spark.sql.SQLContext;

examples/src/main/java/org/apache/spark/examples/ml/JavaDeveloperApiExample.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.apache.spark.mllib.linalg.Vector;
3434
import org.apache.spark.mllib.linalg.Vectors;
3535
import org.apache.spark.mllib.regression.LabeledPoint;
36-
import org.apache.spark.sql.DataFrame;
3736
import org.apache.spark.sql.Dataset;
3837
import org.apache.spark.sql.Row;
3938
import org.apache.spark.sql.SQLContext;

examples/src/main/java/org/apache/spark/examples/ml/JavaEstimatorTransformerParamExample.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.spark.ml.param.ParamMap;
3030
import org.apache.spark.mllib.linalg.Vectors;
3131
import org.apache.spark.mllib.regression.LabeledPoint;
32-
import org.apache.spark.sql.DataFrame;
3332
import org.apache.spark.sql.Dataset;
3433
import org.apache.spark.sql.Row;
3534
// $example off$

examples/src/main/java/org/apache/spark/examples/ml/JavaKMeansExample.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.apache.spark.mllib.linalg.Vector;
3333
import org.apache.spark.mllib.linalg.VectorUDT;
3434
import org.apache.spark.mllib.linalg.Vectors;
35-
import org.apache.spark.sql.DataFrame;
3635
import org.apache.spark.sql.Row;
3736
import org.apache.spark.sql.types.Metadata;
3837
import org.apache.spark.sql.types.StructField;

examples/src/main/java/org/apache/spark/examples/ml/JavaLDAExample.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.apache.spark.mllib.linalg.Vector;
2929
import org.apache.spark.mllib.linalg.VectorUDT;
3030
import org.apache.spark.mllib.linalg.Vectors;
31-
import org.apache.spark.sql.DataFrame;
3231
import org.apache.spark.sql.Dataset;
3332
import org.apache.spark.sql.Row;
3433
import org.apache.spark.sql.SQLContext;

examples/src/main/java/org/apache/spark/examples/ml/JavaOneVsRestExample.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.spark.mllib.evaluation.MulticlassMetrics;
3030
import org.apache.spark.mllib.linalg.Matrix;
3131
import org.apache.spark.mllib.linalg.Vector;
32-
import org.apache.spark.sql.DataFrame;
3332
import org.apache.spark.sql.Dataset;
3433
import org.apache.spark.sql.Row;
3534
import org.apache.spark.sql.SQLContext;

0 commit comments

Comments
 (0)