Move SizeEstimator out of util

Author: sryza

core/src/main/scala/org/apache/spark/util/SizeEstimator.scala renamed to core/src/main/scala/org/apache/spark/SizeEstimator.scala

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.util
+package org.apache.spark
 
 import java.lang.management.ManagementFactory
 import java.lang.reflect.{Field, Modifier}
@@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap
 import scala.collection.mutable.ArrayBuffer
 import scala.runtime.ScalaRunTime
 
-import org.apache.spark.Logging
+import org.apache.spark.annotation.DeveloperApi
 import org.apache.spark.util.collection.OpenHashSet
 
 
@@ -35,7 +35,8 @@ import org.apache.spark.util.collection.OpenHashSet
  * Based on the following JavaWorld article:
  * http://www.javaworld.com/javaworld/javaqa/2003-12/02-qa-1226-sizeof.html
  */
-private[spark] object SizeEstimator extends Logging {
+@DeveloperApi
+object SizeEstimator extends Logging {
 
   // Sizes of primitive types
   private val BYTE_SIZE    = 1
@@ -155,6 +156,18 @@ private[spark] object SizeEstimator extends Logging {
     val shellSize: Long,
     val pointerFields: List[Field]) {}
 
+  /**
+   * :: DeveloperApi ::
+   * Estimate the number of bytes that the given object takes up on the JVM heap. The estimate
+   * includes space taken up by objects referenced by the given object, their references, and so on
+   * and so forth.
+   *
+   * This is useful for determining the amount of heap space a broadcast variable will occupy on
+   * each executor or the amount of space each object will take when caching objects in
+   * deserialized form. This is not the same as the serialized size of the object, which will
+   * typically be much smaller.
+   */
+  @DeveloperApi
   def estimate(obj: AnyRef): Long = estimate(obj, new IdentityHashMap[AnyRef, AnyRef])
 
   private def estimate(obj: AnyRef, visited: IdentityHashMap[AnyRef, AnyRef]): Long = {

core/src/main/scala/org/apache/spark/SparkContext.scala

@@ -2263,20 +2263,6 @@ object SparkContext extends Logging {
    */
   def jarOfObject(obj: AnyRef): Option[String] = jarOfClass(obj.getClass)
 
-  /**
-   * :: DeveloperApi ::
-   * Estimate the number of bytes that the given object takes up on the JVM heap. The estimate
-   * includes space taken up by objects referenced by the given object, their references, and so on
-   * and so forth.
-   *
-   * This is useful for determining the amount of heap space a broadcast variable will occupy on
-   * each executor or the amount of space each object will take when caching objects in
-   * deserialized form. This is not the same as the serialized size of the object, which will
-   * typically be much smaller.
-   */
-  @DeveloperApi
-  def estimateSizeOf(obj: AnyRef): Long = SizeEstimator.estimate(obj)
-
   /**
    * Creates a modified version of a SparkConf with the parameters that can be passed separately
    * to SparkContext, to make it easier to write SparkContext's constructors. This ignores

core/src/main/scala/org/apache/spark/storage/MemoryStore.scala

@@ -23,7 +23,8 @@ import java.util.LinkedHashMap
 import scala.collection.mutable
 import scala.collection.mutable.ArrayBuffer
 
-import org.apache.spark.util.{SizeEstimator, Utils}
+import org.apache.spark.SizeEstimator
+import org.apache.spark.util.Utils
 import org.apache.spark.util.collection.SizeTrackingVector
 
 private case class MemoryEntry(value: Any, size: Long, deserialized: Boolean)

core/src/main/scala/org/apache/spark/util/collection/SizeTracker.scala

@@ -19,7 +19,7 @@ package org.apache.spark.util.collection
 
 import scala.collection.mutable
 
-import org.apache.spark.util.SizeEstimator
+import org.apache.spark.SizeEstimator
 
 /**
  * A general interface for collections to keep track of their estimated sizes in bytes.

core/src/test/scala/org/apache/spark/util/SizeEstimatorSuite.scala renamed to core/src/test/scala/org/apache/spark/SizeEstimatorSuite.scala

@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.spark.util
+package org.apache.spark
 
 import scala.collection.mutable.ArrayBuffer
 
 import org.scalatest.{BeforeAndAfterEach, BeforeAndAfterAll, FunSuite, PrivateMethodTester}
+import org.apache.spark.util.ResetSystemProperties
 
 class DummyClass1 {}
 

core/src/test/scala/org/apache/spark/storage/BlockManagerSuite.scala

@@ -31,7 +31,7 @@ import org.scalatest.concurrent.Eventually._
 import org.scalatest.concurrent.Timeouts._
 
 import org.apache.spark.rpc.RpcEnv
-import org.apache.spark.{MapOutputTrackerMaster, SparkConf, SparkContext, SecurityManager}
+import org.apache.spark._
 import org.apache.spark.executor.DataReadMethod
 import org.apache.spark.network.nio.NioBlockTransferService
 import org.apache.spark.scheduler.LiveListenerBus

core/src/test/scala/org/apache/spark/util/collection/OpenHashMapSuite.scala

@@ -22,7 +22,7 @@ import scala.collection.mutable.HashSet
 import org.scalatest.FunSuite
 import org.scalatest.Matchers
 
-import org.apache.spark.util.SizeEstimator
+import org.apache.spark.SizeEstimator
 
 class OpenHashMapSuite extends FunSuite with Matchers {
 

core/src/test/scala/org/apache/spark/util/collection/OpenHashSetSuite.scala

@@ -20,7 +20,7 @@ package org.apache.spark.util.collection
 import org.scalatest.FunSuite
 import org.scalatest.Matchers
 
-import org.apache.spark.util.SizeEstimator
+import org.apache.spark.SizeEstimator
 
 class OpenHashSetSuite extends FunSuite with Matchers {
 

core/src/test/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMapSuite.scala

@@ -22,7 +22,7 @@ import scala.collection.mutable.HashSet
 import org.scalatest.FunSuite
 import org.scalatest.Matchers
 
-import org.apache.spark.util.SizeEstimator
+import org.apache.spark.SizeEstimator
 
 class PrimitiveKeyOpenHashMapSuite extends FunSuite with Matchers {
 

core/src/test/scala/org/apache/spark/util/collection/PrimitiveVectorSuite.scala

@@ -19,7 +19,7 @@ package org.apache.spark.util.collection
 
 import org.scalatest.FunSuite
 
-import org.apache.spark.util.SizeEstimator
+import org.apache.spark.SizeEstimator
 
 class PrimitiveVectorSuite extends FunSuite {