Formatting changes

apache · Feb 22, 2014 · 70e7e7a · 70e7e7a
1 parent e9e1c6d
commit 70e7e7a
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 17 deletions.
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -215,6 +215,7 @@ class SparkContext(
 
   /** A default Hadoop Configuration for the Hadoop code (e.g. file systems) that we reuse. */
   val hadoopConfiguration = {
+    val env = SparkEnv.get
     val hadoopConf = SparkHadoopUtil.get.newConfiguration()
     // Explicitly check for S3 environment variables
     if (System.getenv("AWS_ACCESS_KEY_ID") != null &&

diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
@@ -24,11 +24,11 @@ import akka.pattern.ask
 import javax.servlet.http.HttpServletRequest
 import net.liftweb.json.JsonAST.JValue
 
+import org.apache.spark.deploy.JsonProtocol
 import org.apache.spark.deploy.DeployMessages.{MasterStateResponse, RequestMasterState}
 import org.apache.spark.deploy.master.ExecutorInfo
 import org.apache.spark.ui.UIUtils
-import org.apache.spark.util.{Utils}
-import org.apache.spark.deploy.JsonProtocol
+import org.apache.spark.util.Utils
 
 private[spark] class ApplicationPage(parent: MasterWebUI) {
   val master = parent.masterActorRef

diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/IndexPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/IndexPage.scala
@@ -18,18 +18,17 @@
 package org.apache.spark.deploy.master.ui
 
 import scala.concurrent.Await
-import scala.concurrent.duration._
 import scala.xml.Node
 
 import akka.pattern.ask
 import javax.servlet.http.HttpServletRequest
 import net.liftweb.json.JsonAST.JValue
 
-import org.apache.spark.deploy.{JsonProtocol, DeployWebUI}
+import org.apache.spark.deploy.{DeployWebUI, JsonProtocol}
 import org.apache.spark.deploy.DeployMessages.{MasterStateResponse, RequestMasterState}
 import org.apache.spark.deploy.master.{ApplicationInfo, DriverInfo, WorkerInfo}
 import org.apache.spark.ui.UIUtils
-import org.apache.spark.util.{Utils}
+import org.apache.spark.util.Utils
 
 private[spark] class IndexPage(parent: MasterWebUI) {
   val master = parent.masterActorRef

diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/ui/IndexPage.scala b/core/src/main/scala/org/apache/spark/deploy/worker/ui/IndexPage.scala
@@ -24,12 +24,12 @@ import akka.pattern.ask
 import javax.servlet.http.HttpServletRequest
 import net.liftweb.json.JsonAST.JValue
 
+import org.apache.spark.deploy.JsonProtocol
 import org.apache.spark.deploy.DeployMessages.{RequestWorkerState, WorkerStateResponse}
 import org.apache.spark.deploy.master.DriverState
 import org.apache.spark.deploy.worker.{DriverRunner, ExecutorRunner}
 import org.apache.spark.ui.UIUtils
-import org.apache.spark.util.{Utils}
-import org.apache.spark.deploy.JsonProtocol
+import org.apache.spark.util.Utils
 
 private[spark] class IndexPage(parent: WorkerWebUI) {
   val workerActor = parent.worker.self

diff --git a/core/src/main/scala/org/apache/spark/executor/TaskMetrics.scala b/core/src/main/scala/org/apache/spark/executor/TaskMetrics.scala
@@ -74,6 +74,7 @@ object TaskMetrics {
   private[spark] def empty(): TaskMetrics = new TaskMetrics
 }
 
+
 class ShuffleReadMetrics extends Serializable {
   /**
    * Absolute time when this task finished reading shuffle data

diff --git a/core/src/main/scala/org/apache/spark/storage/StorageUtils.scala b/core/src/main/scala/org/apache/spark/storage/StorageUtils.scala
@@ -44,14 +44,8 @@ case class StorageStatus(blockManagerId: BlockManagerId, maxMem: Long,
   }
 }
 
-case class RDDInfo(
-    id: Int,
-    name: String,
-    storageLevel: StorageLevel,
-    numCachedPartitions: Int,
-    numPartitions: Int,
-    memSize: Long,
-    diskSize: Long)
+case class RDDInfo(id: Int, name: String, storageLevel: StorageLevel,
+  numCachedPartitions: Int, numPartitions: Int, memSize: Long, diskSize: Long)
   extends Ordered[RDDInfo] {
   override def toString = {
     ("RDD \"%s\" (%d) Storage: %s; CachedPartitions: %d; TotalPartitions: %d; MemorySize: %s; " +

diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/JobProgressListener.scala b/core/src/main/scala/org/apache/spark/ui/jobs/JobProgressListener.scala
@@ -248,4 +248,4 @@ private[spark] case class TaskUIData(
 private[spark] object JobProgressListener {
   val DEFAULT_RETAINED_STAGES = 1000
   val DEFAULT_POOL_NAME = "default"
-}
+}
diff --git a/core/src/test/scala/org/apache/spark/deploy/JsonProtocolSuite.scala b/core/src/test/scala/org/apache/spark/deploy/JsonProtocolSuite.scala
@@ -28,7 +28,6 @@ import org.scalatest.FunSuite
 import org.apache.spark.deploy.DeployMessages.{MasterStateResponse, WorkerStateResponse}
 import org.apache.spark.deploy.master.{ApplicationInfo, DriverInfo, RecoveryState, WorkerInfo}
 import org.apache.spark.deploy.worker.{ExecutorRunner, DriverRunner}
-import org.apache.spark.deploy.{ExecutorState, DriverDescription, Command, ApplicationDescription}
 
 class JsonProtocolSuite extends FunSuite {
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,6 +74,7 @@ object TaskMetrics { @@
       private[spark] def empty(): TaskMetrics = new TaskMetrics
     }
     class ShuffleReadMetrics extends Serializable {
       /**
        * Absolute time when this task finished reading shuffle data
@@ Expand Down @@