You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2016/03/26 13:40:35 UTC
spark git commit: [SPARK-14089][CORE][MLLIB] Remove methods that has
been deprecated since 1.1, 1.2, 1.3, 1.4, and 1.5
Repository: spark
Updated Branches:
refs/heads/master 180846585 -> 62a85eb09
[SPARK-14089][CORE][MLLIB] Remove methods that has been deprecated since 1.1, 1.2, 1.3, 1.4, and 1.5
## What changes were proposed in this pull request?
Removed methods that has been deprecated since 1.1, 1.2, 1.3, 1.4, and 1.5.
## How was this patch tested?
- manully checked that no codes in Spark call these methods any more
- existing test suits
Author: Liwei Lin <lw...@gmail.com>
Author: proflin <pr...@gmail.com>
Closes #11910 from lw-lin/remove-deprecates.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/62a85eb0
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/62a85eb0
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/62a85eb0
Branch: refs/heads/master
Commit: 62a85eb09f3e33d7b8948bb96c67859d712b34e3
Parents: 1808465
Author: Liwei Lin <lw...@gmail.com>
Authored: Sat Mar 26 12:41:34 2016 +0000
Committer: Sean Owen <so...@cloudera.com>
Committed: Sat Mar 26 12:41:34 2016 +0000
----------------------------------------------------------------------
.../apache/spark/api/java/StorageLevels.java | 13 ----
.../main/scala/org/apache/spark/SparkEnv.scala | 8 ---
.../BinaryClassificationEvaluator.scala | 8 ---
.../apache/spark/mllib/optimization/LBFGS.scala | 9 ---
.../apache/spark/mllib/rdd/RDDFunctions.scala | 24 -------
.../mllib/tree/configuration/Strategy.scala | 4 --
.../apache/spark/mllib/tree/model/Node.scala | 21 ------
.../org/apache/spark/mllib/util/MLUtils.scala | 71 --------------------
project/MimaExcludes.scala | 13 ++++
9 files changed, 13 insertions(+), 158 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/62a85eb0/core/src/main/java/org/apache/spark/api/java/StorageLevels.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/spark/api/java/StorageLevels.java b/core/src/main/java/org/apache/spark/api/java/StorageLevels.java
index 840a1bd..666c797 100644
--- a/core/src/main/java/org/apache/spark/api/java/StorageLevels.java
+++ b/core/src/main/java/org/apache/spark/api/java/StorageLevels.java
@@ -40,19 +40,6 @@ public class StorageLevels {
* Create a new StorageLevel object.
* @param useDisk saved to disk, if true
* @param useMemory saved to memory, if true
- * @param deserialized saved as deserialized objects, if true
- * @param replication replication factor
- */
- @Deprecated
- public static StorageLevel create(boolean useDisk, boolean useMemory, boolean deserialized,
- int replication) {
- return StorageLevel.apply(useDisk, useMemory, false, deserialized, replication);
- }
-
- /**
- * Create a new StorageLevel object.
- * @param useDisk saved to disk, if true
- * @param useMemory saved to memory, if true
* @param useOffHeap saved to Tachyon, if true
* @param deserialized saved as deserialized objects, if true
* @param replication replication factor
http://git-wip-us.apache.org/repos/asf/spark/blob/62a85eb0/core/src/main/scala/org/apache/spark/SparkEnv.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SparkEnv.scala b/core/src/main/scala/org/apache/spark/SparkEnv.scala
index e2c47ce..700e2cb 100644
--- a/core/src/main/scala/org/apache/spark/SparkEnv.scala
+++ b/core/src/main/scala/org/apache/spark/SparkEnv.scala
@@ -157,14 +157,6 @@ object SparkEnv extends Logging {
}
/**
- * Returns the ThreadLocal SparkEnv.
- */
- @deprecated("Use SparkEnv.get instead", "1.2.0")
- def getThreadLocal: SparkEnv = {
- env
- }
-
- /**
* Create a SparkEnv for the driver.
*/
private[spark] def createDriverEnv(
http://git-wip-us.apache.org/repos/asf/spark/blob/62a85eb0/mllib/src/main/scala/org/apache/spark/ml/evaluation/BinaryClassificationEvaluator.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/ml/evaluation/BinaryClassificationEvaluator.scala b/mllib/src/main/scala/org/apache/spark/ml/evaluation/BinaryClassificationEvaluator.scala
index 00f3125..337ffbe 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/evaluation/BinaryClassificationEvaluator.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/evaluation/BinaryClassificationEvaluator.scala
@@ -63,14 +63,6 @@ class BinaryClassificationEvaluator @Since("1.4.0") (@Since("1.4.0") override va
@Since("1.5.0")
def setRawPredictionCol(value: String): this.type = set(rawPredictionCol, value)
- /**
- * @group setParam
- * @deprecated use [[setRawPredictionCol()]] instead
- */
- @deprecated("use setRawPredictionCol instead", "1.5.0")
- @Since("1.2.0")
- def setScoreCol(value: String): this.type = set(rawPredictionCol, value)
-
/** @group setParam */
@Since("1.2.0")
def setLabelCol(value: String): this.type = set(labelCol, value)
http://git-wip-us.apache.org/repos/asf/spark/blob/62a85eb0/mllib/src/main/scala/org/apache/spark/mllib/optimization/LBFGS.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/optimization/LBFGS.scala b/mllib/src/main/scala/org/apache/spark/mllib/optimization/LBFGS.scala
index 16a3352..74e2cad 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/optimization/LBFGS.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/optimization/LBFGS.scala
@@ -80,15 +80,6 @@ class LBFGS(private var gradient: Gradient, private var updater: Updater)
/**
* Set the maximal number of iterations for L-BFGS. Default 100.
- * @deprecated use [[LBFGS#setNumIterations]] instead
- */
- @deprecated("use setNumIterations instead", "1.1.0")
- def setMaxNumIterations(iters: Int): this.type = {
- this.setNumIterations(iters)
- }
-
- /**
- * Set the maximal number of iterations for L-BFGS. Default 100.
*/
def setNumIterations(iters: Int): this.type = {
require(iters >= 0,
http://git-wip-us.apache.org/repos/asf/spark/blob/62a85eb0/mllib/src/main/scala/org/apache/spark/mllib/rdd/RDDFunctions.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/rdd/RDDFunctions.scala b/mllib/src/main/scala/org/apache/spark/mllib/rdd/RDDFunctions.scala
index 19a047d..e8a937f 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/rdd/RDDFunctions.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/rdd/RDDFunctions.scala
@@ -51,30 +51,6 @@ class RDDFunctions[T: ClassTag](self: RDD[T]) extends Serializable {
*/
def sliding(windowSize: Int): RDD[Array[T]] = sliding(windowSize, 1)
- /**
- * Reduces the elements of this RDD in a multi-level tree pattern.
- *
- * @param depth suggested depth of the tree (default: 2)
- * @see [[org.apache.spark.rdd.RDD#treeReduce]]
- * @deprecated Use [[org.apache.spark.rdd.RDD#treeReduce]] instead.
- */
- @deprecated("Use RDD.treeReduce instead.", "1.3.0")
- def treeReduce(f: (T, T) => T, depth: Int = 2): T = self.treeReduce(f, depth)
-
- /**
- * Aggregates the elements of this RDD in a multi-level tree pattern.
- *
- * @param depth suggested depth of the tree (default: 2)
- * @see [[org.apache.spark.rdd.RDD#treeAggregate]]
- * @deprecated Use [[org.apache.spark.rdd.RDD#treeAggregate]] instead.
- */
- @deprecated("Use RDD.treeAggregate instead.", "1.3.0")
- def treeAggregate[U: ClassTag](zeroValue: U)(
- seqOp: (U, T) => U,
- combOp: (U, U) => U,
- depth: Int = 2): U = {
- self.treeAggregate(zeroValue)(seqOp, combOp, depth)
- }
}
@DeveloperApi
http://git-wip-us.apache.org/repos/asf/spark/blob/62a85eb0/mllib/src/main/scala/org/apache/spark/mllib/tree/configuration/Strategy.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/tree/configuration/Strategy.scala b/mllib/src/main/scala/org/apache/spark/mllib/tree/configuration/Strategy.scala
index 0214db5..b34e1b1 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/tree/configuration/Strategy.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/tree/configuration/Strategy.scala
@@ -202,8 +202,4 @@ object Strategy {
numClasses = 0)
}
- @deprecated("Use Strategy.defaultStrategy instead.", "1.5.0")
- @Since("1.2.0")
- def defaultStategy(algo: Algo): Strategy = defaultStrategy(algo)
-
}
http://git-wip-us.apache.org/repos/asf/spark/blob/62a85eb0/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Node.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Node.scala b/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Node.scala
index 114a33a..5fd0536 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Node.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Node.scala
@@ -57,27 +57,6 @@ class Node @Since("1.2.0") (
}
/**
- * build the left node and right nodes if not leaf
- * @param nodes array of nodes
- */
- @Since("1.0.0")
- @deprecated("build should no longer be used since trees are constructed on-the-fly in training",
- "1.2.0")
- def build(nodes: Array[Node]): Unit = {
- logDebug("building node " + id + " at level " + Node.indexToLevel(id))
- logDebug("id = " + id + ", split = " + split)
- logDebug("stats = " + stats)
- logDebug("predict = " + predict)
- logDebug("impurity = " + impurity)
- if (!isLeaf) {
- leftNode = Some(nodes(Node.leftChildIndex(id)))
- rightNode = Some(nodes(Node.rightChildIndex(id)))
- leftNode.get.build(nodes)
- rightNode.get.build(nodes)
- }
- }
-
- /**
* predict value if node is not leaf
* @param features feature value
* @return predicted value
http://git-wip-us.apache.org/repos/asf/spark/blob/62a85eb0/mllib/src/main/scala/org/apache/spark/mllib/util/MLUtils.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/util/MLUtils.scala b/mllib/src/main/scala/org/apache/spark/mllib/util/MLUtils.scala
index 74e9271..c3b1d5c 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/util/MLUtils.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/util/MLUtils.scala
@@ -110,18 +110,6 @@ object MLUtils {
}
}
- // Convenient methods for `loadLibSVMFile`.
-
- @Since("1.0.0")
- @deprecated("use method without multiclass argument, which no longer has effect", "1.1.0")
- def loadLibSVMFile(
- sc: SparkContext,
- path: String,
- multiclass: Boolean,
- numFeatures: Int,
- minPartitions: Int): RDD[LabeledPoint] =
- loadLibSVMFile(sc, path, numFeatures, minPartitions)
-
/**
* Loads labeled data in the LIBSVM format into an RDD[LabeledPoint], with the default number of
* partitions.
@@ -133,23 +121,6 @@ object MLUtils {
numFeatures: Int): RDD[LabeledPoint] =
loadLibSVMFile(sc, path, numFeatures, sc.defaultMinPartitions)
- @Since("1.0.0")
- @deprecated("use method without multiclass argument, which no longer has effect", "1.1.0")
- def loadLibSVMFile(
- sc: SparkContext,
- path: String,
- multiclass: Boolean,
- numFeatures: Int): RDD[LabeledPoint] =
- loadLibSVMFile(sc, path, numFeatures)
-
- @Since("1.0.0")
- @deprecated("use method without multiclass argument, which no longer has effect", "1.1.0")
- def loadLibSVMFile(
- sc: SparkContext,
- path: String,
- multiclass: Boolean): RDD[LabeledPoint] =
- loadLibSVMFile(sc, path)
-
/**
* Loads binary labeled data in the LIBSVM format into an RDD[LabeledPoint], with number of
* features determined automatically and the default number of partitions.
@@ -217,48 +188,6 @@ object MLUtils {
loadLabeledPoints(sc, dir, sc.defaultMinPartitions)
/**
- * Load labeled data from a file. The data format used here is
- * L, f1 f2 ...
- * where f1, f2 are feature values in Double and L is the corresponding label as Double.
- *
- * @param sc SparkContext
- * @param dir Directory to the input data files.
- * @return An RDD of LabeledPoint. Each labeled point has two elements: the first element is
- * the label, and the second element represents the feature values (an array of Double).
- *
- * @deprecated Should use [[org.apache.spark.rdd.RDD#saveAsTextFile]] for saving and
- * [[org.apache.spark.mllib.util.MLUtils#loadLabeledPoints]] for loading.
- */
- @Since("1.0.0")
- @deprecated("Should use MLUtils.loadLabeledPoints instead.", "1.0.1")
- def loadLabeledData(sc: SparkContext, dir: String): RDD[LabeledPoint] = {
- sc.textFile(dir).map { line =>
- val parts = line.split(',')
- val label = parts(0).toDouble
- val features = Vectors.dense(parts(1).trim().split(' ').map(_.toDouble))
- LabeledPoint(label, features)
- }
- }
-
- /**
- * Save labeled data to a file. The data format used here is
- * L, f1 f2 ...
- * where f1, f2 are feature values in Double and L is the corresponding label as Double.
- *
- * @param data An RDD of LabeledPoints containing data to be saved.
- * @param dir Directory to save the data.
- *
- * @deprecated Should use [[org.apache.spark.rdd.RDD#saveAsTextFile]] for saving and
- * [[org.apache.spark.mllib.util.MLUtils#loadLabeledPoints]] for loading.
- */
- @Since("1.0.0")
- @deprecated("Should use RDD[LabeledPoint].saveAsTextFile instead.", "1.0.1")
- def saveLabeledData(data: RDD[LabeledPoint], dir: String) {
- val dataStr = data.map(x => x.label + "," + x.features.toArray.mkString(" "))
- dataStr.saveAsTextFile(dir)
- }
-
- /**
* Return a k element array of pairs of RDDs with the first element of each pair
* containing the training data, a complement of the validation data and the second
* element, the validation data, containing a unique 1/kth of the data. Where k=numFolds.
http://git-wip-us.apache.org/repos/asf/spark/blob/62a85eb0/project/MimaExcludes.scala
----------------------------------------------------------------------
diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala
index 9158983..208c7a2 100644
--- a/project/MimaExcludes.scala
+++ b/project/MimaExcludes.scala
@@ -576,6 +576,19 @@ object MimaExcludes {
) ++ Seq(
// [SPARK-13990] Automatically pick serializer when caching RDDs
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.network.netty.NettyBlockTransferService.uploadBlock")
+ ) ++ Seq(
+ // [SPARK-14089][CORE][MLLIB] Remove methods that has been deprecated since 1.1, 1.2, 1.3, 1.4, and 1.5
+ ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.SparkEnv.getThreadLocal"),
+ ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.mllib.rdd.RDDFunctions.treeReduce"),
+ ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.mllib.rdd.RDDFunctions.treeAggregate"),
+ ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.mllib.tree.configuration.Strategy.defaultStategy"),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.spark.mllib.util.MLUtils.loadLibSVMFile"),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.spark.mllib.util.MLUtils.loadLibSVMFile"),
+ ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.mllib.util.MLUtils.loadLibSVMFile"),
+ ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.mllib.util.MLUtils.saveLabeledData"),
+ ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.mllib.util.MLUtils.loadLabeledData"),
+ ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.mllib.optimization.LBFGS.setMaxNumIterations"),
+ ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.ml.evaluation.BinaryClassificationEvaluator.setScoreCol")
)
case v if v.startsWith("1.6") =>
Seq(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org