Skip to content

[SPARK-2088] fix NPE in toString #1028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

[SPARK-2088] fix NPE in toString #1028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76199c6
[SPARK-2088] fix NPE in toString
dorx Jun 10, 2014
f47fecf
Merge branch 'master' into toStringNPE
dorx Jun 10, 2014
6f0a586
Merge branch 'master' into toStringNPE
dorx Jun 10, 2014
f20021e
unit test for toString after desrialization
dorx Jun 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/rdd/RDD.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@ abstract class RDD[T: ClassTag](

/** User code that created this RDD (e.g. `textFile`, `parallelize`). */
@transient private[spark] val creationSiteInfo = Utils.getCallSiteInfo
private[spark] def getCreationSite: String = creationSiteInfo.toString
private[spark] def getCreationSite: String = Option(creationSiteInfo).getOrElse("").toString

private[spark] def elementClassTag: ClassTag[T] = classTag[T]

Expand Down
9 changes: 8 additions & 1 deletion core/src/test/scala/org/apache/spark/rdd/RDDSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import org.scalatest.FunSuite

import org.apache.spark._
import org.apache.spark.SparkContext._
import org.apache.spark.rdd._
import org.apache.spark.util.Utils

class RDDSuite extends FunSuite with SharedSparkContext {

Expand Down Expand Up @@ -66,6 +66,13 @@ class RDDSuite extends FunSuite with SharedSparkContext {
}
}

test("serialization") {
val empty = new EmptyRDD[Int](sc)
val serial = Utils.serialize(empty)
val deserial: EmptyRDD[Int] = Utils.deserialize(serial)
assert(!deserial.toString().isEmpty())
}

test("countApproxDistinct") {

def error(est: Long, size: Long) = math.abs(est - size) / size.toDouble
Expand Down