Repository: spark Updated Branches: refs/heads/master 17a3f0067 -> df61fbd97
[SPARK-13986][CORE][MLLIB] Remove `DeveloperApi`-annotations for non-publics ## What changes were proposed in this pull request? Spark uses `DeveloperApi` annotation, but sometimes it seems to conflict with visibility. This PR tries to fix those conflict by removing annotations for non-publics. The following is the example. **JobResult.scala** ```scala DeveloperApi sealed trait JobResult DeveloperApi case object JobSucceeded extends JobResult -DeveloperApi private[spark] case class JobFailed(exception: Exception) extends JobResult ``` ## How was this patch tested? Pass the existing Jenkins test. Author: Dongjoon Hyun <dongj...@apache.org> Closes #11797 from dongjoon-hyun/SPARK-13986. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/df61fbd9 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/df61fbd9 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/df61fbd9 Branch: refs/heads/master Commit: df61fbd9787efbb80ff20927cb6b95002423d2f2 Parents: 17a3f00 Author: Dongjoon Hyun <dongj...@apache.org> Authored: Mon Mar 21 14:57:52 2016 +0000 Committer: Sean Owen <so...@cloudera.com> Committed: Mon Mar 21 14:57:52 2016 +0000 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/scheduler/JobResult.scala | 1 - .../scala/org/apache/spark/util/collection/OpenHashMap.scala | 4 ---- .../main/scala/org/apache/spark/ml/regression/Regressor.scala | 3 --- .../main/scala/org/apache/spark/ml/tree/impl/NodeIdCache.scala | 1 - .../main/scala/org/apache/spark/ml/tuning/ValidatorParams.scala | 3 --- .../src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala | 1 - .../scala/org/apache/spark/mllib/tree/impl/NodeIdCache.scala | 1 - .../org/apache/spark/mllib/tree/model/InformationGainStats.scala | 2 -- 8 files changed, 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/df61fbd9/core/src/main/scala/org/apache/spark/scheduler/JobResult.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/scheduler/JobResult.scala b/core/src/main/scala/org/apache/spark/scheduler/JobResult.scala index 4cd6cbe..4a304a0 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/JobResult.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/JobResult.scala @@ -29,5 +29,4 @@ sealed trait JobResult @DeveloperApi case object JobSucceeded extends JobResult -@DeveloperApi private[spark] case class JobFailed(exception: Exception) extends JobResult http://git-wip-us.apache.org/repos/asf/spark/blob/df61fbd9/core/src/main/scala/org/apache/spark/util/collection/OpenHashMap.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/util/collection/OpenHashMap.scala b/core/src/main/scala/org/apache/spark/util/collection/OpenHashMap.scala index efc2482..22d7a49 100644 --- a/core/src/main/scala/org/apache/spark/util/collection/OpenHashMap.scala +++ b/core/src/main/scala/org/apache/spark/util/collection/OpenHashMap.scala @@ -19,17 +19,13 @@ package org.apache.spark.util.collection import scala.reflect.ClassTag -import org.apache.spark.annotation.DeveloperApi - /** - * :: DeveloperApi :: * A fast hash map implementation for nullable keys. This hash map supports insertions and updates, * but not deletions. This map is about 5X faster than java.util.HashMap, while using much less * space overhead. * * Under the hood, it uses our OpenHashSet implementation. */ -@DeveloperApi private[spark] class OpenHashMap[K : ClassTag, @specialized(Long, Int, Double) V: ClassTag]( initialCapacity: Int) http://git-wip-us.apache.org/repos/asf/spark/blob/df61fbd9/mllib/src/main/scala/org/apache/spark/ml/regression/Regressor.scala ---------------------------------------------------------------------- diff --git a/mllib/src/main/scala/org/apache/spark/ml/regression/Regressor.scala b/mllib/src/main/scala/org/apache/spark/ml/regression/Regressor.scala index cf189e8..be35657 100644 --- a/mllib/src/main/scala/org/apache/spark/ml/regression/Regressor.scala +++ b/mllib/src/main/scala/org/apache/spark/ml/regression/Regressor.scala @@ -22,15 +22,12 @@ import org.apache.spark.ml.{PredictionModel, Predictor, PredictorParams} /** - * :: DeveloperApi :: - * * Single-label regression * * @tparam FeaturesType Type of input features. E.g., [[org.apache.spark.mllib.linalg.Vector]] * @tparam Learner Concrete Estimator type * @tparam M Concrete Model type */ -@DeveloperApi private[spark] abstract class Regressor[ FeaturesType, Learner <: Regressor[FeaturesType, Learner, M], http://git-wip-us.apache.org/repos/asf/spark/blob/df61fbd9/mllib/src/main/scala/org/apache/spark/ml/tree/impl/NodeIdCache.scala ---------------------------------------------------------------------- diff --git a/mllib/src/main/scala/org/apache/spark/ml/tree/impl/NodeIdCache.scala b/mllib/src/main/scala/org/apache/spark/ml/tree/impl/NodeIdCache.scala index 526b9c4..2c82867 100644 --- a/mllib/src/main/scala/org/apache/spark/ml/tree/impl/NodeIdCache.scala +++ b/mllib/src/main/scala/org/apache/spark/ml/tree/impl/NodeIdCache.scala @@ -171,7 +171,6 @@ private[spark] class NodeIdCache( } } -@DeveloperApi private[spark] object NodeIdCache { /** * Initialize the node Id cache with initial node Id values. http://git-wip-us.apache.org/repos/asf/spark/blob/df61fbd9/mllib/src/main/scala/org/apache/spark/ml/tuning/ValidatorParams.scala ---------------------------------------------------------------------- diff --git a/mllib/src/main/scala/org/apache/spark/ml/tuning/ValidatorParams.scala b/mllib/src/main/scala/org/apache/spark/ml/tuning/ValidatorParams.scala index c004644..953456e 100644 --- a/mllib/src/main/scala/org/apache/spark/ml/tuning/ValidatorParams.scala +++ b/mllib/src/main/scala/org/apache/spark/ml/tuning/ValidatorParams.scala @@ -17,17 +17,14 @@ package org.apache.spark.ml.tuning -import org.apache.spark.annotation.DeveloperApi import org.apache.spark.ml.Estimator import org.apache.spark.ml.evaluation.Evaluator import org.apache.spark.ml.param.{Param, ParamMap, Params} import org.apache.spark.sql.types.StructType /** - * :: DeveloperApi :: * Common params for [[TrainValidationSplitParams]] and [[CrossValidatorParams]]. */ -@DeveloperApi private[ml] trait ValidatorParams extends Params { /** http://git-wip-us.apache.org/repos/asf/spark/blob/df61fbd9/mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala ---------------------------------------------------------------------- diff --git a/mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala b/mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala index 157f2db..c6de775 100644 --- a/mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala @@ -156,7 +156,6 @@ sealed trait Matrix extends Serializable { def numActives: Int } -@DeveloperApi private[spark] class MatrixUDT extends UserDefinedType[Matrix] { override def sqlType: StructType = { http://git-wip-us.apache.org/repos/asf/spark/blob/df61fbd9/mllib/src/main/scala/org/apache/spark/mllib/tree/impl/NodeIdCache.scala ---------------------------------------------------------------------- diff --git a/mllib/src/main/scala/org/apache/spark/mllib/tree/impl/NodeIdCache.scala b/mllib/src/main/scala/org/apache/spark/mllib/tree/impl/NodeIdCache.scala index fbbec11..dc7e969 100644 --- a/mllib/src/main/scala/org/apache/spark/mllib/tree/impl/NodeIdCache.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/tree/impl/NodeIdCache.scala @@ -173,7 +173,6 @@ private[spark] class NodeIdCache( } } -@DeveloperApi private[spark] object NodeIdCache { /** * Initialize the node Id cache with initial node Id values. http://git-wip-us.apache.org/repos/asf/spark/blob/df61fbd9/mllib/src/main/scala/org/apache/spark/mllib/tree/model/InformationGainStats.scala ---------------------------------------------------------------------- diff --git a/mllib/src/main/scala/org/apache/spark/mllib/tree/model/InformationGainStats.scala b/mllib/src/main/scala/org/apache/spark/mllib/tree/model/InformationGainStats.scala index 091a046..db1e27b 100644 --- a/mllib/src/main/scala/org/apache/spark/mllib/tree/model/InformationGainStats.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/tree/model/InformationGainStats.scala @@ -79,7 +79,6 @@ private[spark] object InformationGainStats { } /** - * :: DeveloperApi :: * Impurity statistics for each split * @param gain information gain value * @param impurity current node impurity @@ -89,7 +88,6 @@ private[spark] object InformationGainStats { * @param valid whether the current split satisfies minimum info gain or * minimum number of instances per node */ -@DeveloperApi private[spark] class ImpurityStats( val gain: Double, val impurity: Double, --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
