Changes for SPARK-1853

apache · Aug 11, 2014 · 1d90cc3 · 1d90cc3
1 parent 5f3105a
commit 1d90cc3
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/conf/log4j.properties.template b/conf/log4j.properties.template
@@ -4,7 +4,6 @@ log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.target=System.err
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
 log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n
-log4j.logger.org.apache.spark.rdd.RDD=INFO
 
 # Settings to quiet third party logs that are too verbose
 log4j.logger.org.eclipse.jetty=WARN

diff --git a/core/src/main/scala/org/apache/spark/rdd/RDD.scala b/core/src/main/scala/org/apache/spark/rdd/RDD.scala
@@ -125,7 +125,7 @@ abstract class RDD[T: ClassTag](
   val id: Int = sc.newRddId()
 
   /** A friendly name for this RDD */
-  @transient var name: String = sc.getLocalProperty("rddName")
+  @transient var name: String = null
 
   /** Assign a name to this RDD */
   def setName(_name: String): this.type = {

diff --git a/streaming/src/main/scala/org/apache/spark/streaming/dstream/ForEachDStream.scala b/streaming/src/main/scala/org/apache/spark/streaming/dstream/ForEachDStream.scala
@@ -35,7 +35,7 @@ class ForEachDStream[T: ClassTag] (
   override def compute(validTime: Time): Option[RDD[Unit]] = None
 
   override def generateJob(time: Time): Option[Job] = {
-    return parent.getOrCompute(time) match {
+    parent.getOrCompute(time) match {
       case Some(rdd) =>
         val jobFunc = () => {
           foreachFunc(rdd, time)

diff --git a/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala b/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala
@@ -22,7 +22,6 @@ import org.apache.spark.{SparkException, SparkEnv, Logging}
 import org.apache.spark.streaming.{Checkpoint, Time, CheckpointWriter}
 import org.apache.spark.streaming.util.{ManualClock, RecurringTimer, Clock}
 import scala.util.{Failure, Success, Try}
-import org.apache.spark.util.{CallSite, Utils}
 
 /** Event classes for JobGenerator */
 private[scheduler] sealed trait JobGeneratorEvent