Cut down size estimation related stuff.

Author: concretevitamin

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala

@@ -109,12 +109,3 @@ abstract class UnaryNode extends LogicalPlan with trees.UnaryNode[LogicalPlan] {
 abstract class BinaryNode extends LogicalPlan with trees.BinaryNode[LogicalPlan] {
   self: Product =>
 }
-
-/**
- * A trait that can be mixed in by logical operators representing relations that could
- * estimate their physical sizes.
- * @tparam Ctx input (context) to the size estimator
- */
-trait SizeEstimatableRelation[Ctx] { self: LogicalPlan =>
-  def estimatedSize(context: Ctx): Long
-}

sql/core/src/main/scala/org/apache/spark/sql/parquet/ParquetRelation.scala

@@ -29,9 +29,8 @@ import parquet.schema.MessageType
 
 import org.apache.spark.sql.SQLContext
 import org.apache.spark.sql.catalyst.analysis.{MultiInstanceRelation, UnresolvedException}
-import org.apache.spark.sql.catalyst.expressions.{Attribute, AttributeReference, Row}
-import org.apache.spark.sql.catalyst.plans.logical.{SizeEstimatableRelation, LogicalPlan, LeafNode}
-import org.apache.spark.sql.catalyst.types._
+import org.apache.spark.sql.catalyst.expressions.Attribute
+import org.apache.spark.sql.catalyst.plans.logical.{LogicalPlan, LeafNode}
 
 // Implicits
 import scala.collection.JavaConversions._
@@ -52,8 +51,7 @@ private[sql] case class ParquetRelation(
     path: String,
     @transient conf: Option[Configuration] = None)
   extends LeafNode
-  with MultiInstanceRelation
-  with SizeEstimatableRelation[SQLContext] {
+  with MultiInstanceRelation {
 
   self: Product =>
 

sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala

@@ -247,8 +247,7 @@ object HiveMetastoreTypes extends RegexParsers {
 private[hive] case class MetastoreRelation
     (databaseName: String, tableName: String, alias: Option[String])
     (val table: TTable, val partitions: Seq[TPartition])
-  extends BaseRelation
-  with SizeEstimatableRelation[HiveContext] {
+  extends BaseRelation {
   // TODO: Can we use org.apache.hadoop.hive.ql.metadata.Table as the type of table and
   // use org.apache.hadoop.hive.ql.metadata.Partition as the type of elements of partitions.
   // Right now, using org.apache.hadoop.hive.ql.metadata.Table and