You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/12/21 23:07:52 UTC
spark git commit: [SPARK-2331] SparkContext.emptyRDD should return
RDD[T] not EmptyRDD[T]
Repository: spark
Updated Branches:
refs/heads/master b0849b8ae -> a820ca19d
[SPARK-2331] SparkContext.emptyRDD should return RDD[T] not EmptyRDD[T]
Author: Reynold Xin <rx...@databricks.com>
Closes #10394 from rxin/SPARK-2331.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a820ca19
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a820ca19
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a820ca19
Branch: refs/heads/master
Commit: a820ca19de1fb4daa01939a4b8bde8d874a7f3fc
Parents: b0849b8
Author: Reynold Xin <rx...@databricks.com>
Authored: Mon Dec 21 14:07:48 2015 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Mon Dec 21 14:07:48 2015 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/SparkContext.scala | 2 +-
project/MimaExcludes.scala | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/a820ca19/core/src/main/scala/org/apache/spark/SparkContext.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
index 81a4d0a..c4541aa 100644
--- a/core/src/main/scala/org/apache/spark/SparkContext.scala
+++ b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -1248,7 +1248,7 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
}
/** Get an RDD that has no partitions or elements. */
- def emptyRDD[T: ClassTag]: EmptyRDD[T] = new EmptyRDD[T](this)
+ def emptyRDD[T: ClassTag]: RDD[T] = new EmptyRDD[T](this)
// Methods for creating shared variables
http://git-wip-us.apache.org/repos/asf/spark/blob/a820ca19/project/MimaExcludes.scala
----------------------------------------------------------------------
diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala
index a3cfcd2..ad878c1 100644
--- a/project/MimaExcludes.scala
+++ b/project/MimaExcludes.scala
@@ -34,6 +34,9 @@ import com.typesafe.tools.mima.core.ProblemFilters._
object MimaExcludes {
def excludes(version: String) = version match {
case v if v.startsWith("2.0") =>
+ Seq(
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.spark.SparkContext.emptyRDD")
+ ) ++
// When 1.6 is officially released, update this exclusion list.
Seq(
MimaBuild.excludeSparkPackage("deploy"),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org