Moved streaming files not immediately necessary to spark.streaming.util.

9 files changed, 14 insertions, 19 deletions

diff --git a/streaming/src/main/scala/spark/streaming/Job.scala b/streaming/src/main/scala/spark/streaming/Job.scala
index 36958dafe1..2481a9a3ef 100644
--- a/streaming/src/main/scala/spark/streaming/Job.scala
+++ b/streaming/src/main/scala/spark/streaming/Job.scala
@@ -1,11 +1,12 @@
 package spark.streaming
 
-import spark.streaming.util.Utils
-
 class Job(val time: Time, func: () => _) {
   val id = Job.getNewId()
   def run(): Long = {
-    Utils.time { func() }
+    val startTime = System.currentTimeMillis 
+    func() 
+    val stopTime = System.currentTimeMillis
+    (startTime - stopTime)
   }
 
   override def toString = "streaming job " + id + " @ " + time 
diff --git a/streaming/src/main/scala/spark/streaming/ConnectionHandler.scala b/streaming/src/main/scala/spark/streaming/util/ConnectionHandler.scala
index a4f454632f..cde868a0c9 100644
--- a/streaming/src/main/scala/spark/streaming/ConnectionHandler.scala
+++ b/streaming/src/main/scala/spark/streaming/util/ConnectionHandler.scala
@@ -1,4 +1,4 @@
-package spark.streaming
+package spark.streaming.util
 
 import spark.Logging
 
diff --git a/streaming/src/main/scala/spark/streaming/TestGenerator.scala b/streaming/src/main/scala/spark/streaming/util/TestGenerator.scala
index 0ff6af61f2..23e9235c60 100644
--- a/streaming/src/main/scala/spark/streaming/TestGenerator.scala
+++ b/streaming/src/main/scala/spark/streaming/util/TestGenerator.scala
@@ -1,4 +1,4 @@
-package spark.streaming
+package spark.streaming.util
 
 import scala.util.Random
 import scala.io.Source
diff --git a/streaming/src/main/scala/spark/streaming/TestGenerator2.scala b/streaming/src/main/scala/spark/streaming/util/TestGenerator2.scala
index 00d43604d0..ff840d084f 100644
--- a/streaming/src/main/scala/spark/streaming/TestGenerator2.scala
+++ b/streaming/src/main/scala/spark/streaming/util/TestGenerator2.scala
@@ -1,4 +1,4 @@
-package spark.streaming
+package spark.streaming.util
 
 import scala.util.Random
 import scala.io.Source
diff --git a/streaming/src/main/scala/spark/streaming/TestGenerator4.scala b/streaming/src/main/scala/spark/streaming/util/TestGenerator4.scala
index 93c7f2f440..9c39ef3e12 100644
--- a/streaming/src/main/scala/spark/streaming/TestGenerator4.scala
+++ b/streaming/src/main/scala/spark/streaming/util/TestGenerator4.scala
@@ -1,4 +1,4 @@
-package spark.streaming
+package spark.streaming.util
 
 import spark.Logging
 
diff --git a/streaming/src/main/scala/spark/streaming/TestStreamCoordinator.scala b/streaming/src/main/scala/spark/streaming/util/TestStreamCoordinator.scala
index c658a036f9..f584f772bb 100644
--- a/streaming/src/main/scala/spark/streaming/TestStreamCoordinator.scala
+++ b/streaming/src/main/scala/spark/streaming/util/TestStreamCoordinator.scala
@@ -1,5 +1,6 @@
-package spark.streaming
+package spark.streaming.util
 
+import spark.streaming._
 import spark.Logging
 
 import akka.actor._
diff --git a/streaming/src/main/scala/spark/streaming/TestStreamReceiver3.scala b/streaming/src/main/scala/spark/streaming/util/TestStreamReceiver3.scala
index bbf2c7bf5e..d00ae9cbca 100644
--- a/streaming/src/main/scala/spark/streaming/TestStreamReceiver3.scala
+++ b/streaming/src/main/scala/spark/streaming/util/TestStreamReceiver3.scala
@@ -1,8 +1,9 @@
-package spark.streaming
+package spark.streaming.util
 
 import spark._
 import spark.storage._
 import spark.util.AkkaUtils
+import spark.streaming._
 
 import scala.math._
 import scala.collection.mutable.{Queue, HashMap, ArrayBuffer, SynchronizedMap}
diff --git a/streaming/src/main/scala/spark/streaming/TestStreamReceiver4.scala b/streaming/src/main/scala/spark/streaming/util/TestStreamReceiver4.scala
index a2babb23f4..31754870dd 100644
--- a/streaming/src/main/scala/spark/streaming/TestStreamReceiver4.scala
+++ b/streaming/src/main/scala/spark/streaming/util/TestStreamReceiver4.scala
@@ -1,5 +1,6 @@
-package spark.streaming
+package spark.streaming.util
 
+import spark.streaming._
 import spark._
 import spark.storage._
 import spark.util.AkkaUtils
diff --git a/streaming/src/main/scala/spark/streaming/util/Utils.scala b/streaming/src/main/scala/spark/streaming/util/Utils.scala
deleted file mode 100644
index 86a729fb49..0000000000
--- a/streaming/src/main/scala/spark/streaming/util/Utils.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package spark.streaming.util
-
-object Utils {
-  def time(func: => Unit): Long = {
-    val t = System.currentTimeMillis
-    func
-    (System.currentTimeMillis - t)
-  }
-}
\ No newline at end of file