Moved ReceivedBlockInfo back into spark.streaming.scheduler package

apache · Oct 27, 2014 · 18aec1e · 18aec1e
1 parent 95a4987
commit 18aec1e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/dstream/ReceiverInputDStream.scala b/streaming/src/main/scala/org/apache/spark/streaming/dstream/ReceiverInputDStream.scala
@@ -24,7 +24,7 @@ import org.apache.spark.rdd.{BlockRDD, RDD}
 import org.apache.spark.storage.BlockId
 import org.apache.spark.streaming._
 import org.apache.spark.streaming.receiver.Receiver
-import org.apache.spark.streaming.receiver.ReceivedBlockInfo
+import org.apache.spark.streaming.scheduler.ReceivedBlockInfo
 
 /**
  * Abstract class for defining any [[org.apache.spark.streaming.dstream.InputDStream]]

diff --git a/streaming/src/main/scala/org/apache/spark/streaming/scheduler/BatchInfo.scala b/streaming/src/main/scala/org/apache/spark/streaming/scheduler/BatchInfo.scala
@@ -19,7 +19,6 @@ package org.apache.spark.streaming.scheduler
 
 import org.apache.spark.annotation.DeveloperApi
 import org.apache.spark.streaming.Time
-import org.apache.spark.streaming.receiver.ReceivedBlockInfo
 
 /**
  * :: DeveloperApi ::

diff --git a/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobSet.scala b/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobSet.scala
@@ -17,9 +17,9 @@
 
 package org.apache.spark.streaming.scheduler
 
-import scala.collection.mutable.{ArrayBuffer, HashSet}
+import scala.collection.mutable.HashSet
+
 import org.apache.spark.streaming.Time
-import org.apache.spark.streaming.receiver.ReceivedBlockInfo
 
 /** Class representing a set of Jobs
   * belong to the same batch.

diff --git a/...treaming/receiver/ReceivedBlockInfo.scala → ...reaming/scheduler/ReceivedBlockInfo.scala b/...treaming/receiver/ReceivedBlockInfo.scala → ...reaming/scheduler/ReceivedBlockInfo.scala
@@ -1,7 +1,8 @@
-package org.apache.spark.streaming.receiver
+package org.apache.spark.streaming.scheduler
 
 import org.apache.spark.storage.StreamBlockId
 import org.apache.spark.streaming.util.WriteAheadLogFileSegment
+import org.apache.spark.annotation.DeveloperApi
 
 /** Information about blocks received by the receiver */
 private[streaming] case class ReceivedBlockInfo(

diff --git a/streaming/src/main/scala/org/apache/spark/streaming/scheduler/ReceiverTracker.scala b/streaming/src/main/scala/org/apache/spark/streaming/scheduler/ReceiverTracker.scala
@@ -24,7 +24,7 @@ import akka.actor._
 import org.apache.spark.{SerializableWritable, Logging, SparkEnv, SparkException}
 import org.apache.spark.SparkContext._
 import org.apache.spark.streaming.{StreamingContext, Time}
-import org.apache.spark.streaming.receiver.{ReceivedBlockInfo, Receiver, ReceiverSupervisorImpl, StopReceiver}
+import org.apache.spark.streaming.receiver.{Receiver, ReceiverSupervisorImpl, StopReceiver}
 import org.apache.spark.util.AkkaUtils
 
 /**