diff options
author | Reynold Xin <rxin@databricks.com> | 2016-02-24 11:58:32 -0800 |
---|---|---|
committer | Reynold Xin <rxin@databricks.com> | 2016-02-24 11:58:32 -0800 |
commit | d563c8fa01cfaebb5899ff7970115d0f2e64e8d5 (patch) | |
tree | 1704c20781e6cf148285de83eda3a01e15896be9 /sql/core | |
parent | 382b27babf7771b724f7abff78195a858631d138 (diff) | |
download | spark-d563c8fa01cfaebb5899ff7970115d0f2e64e8d5.tar.gz spark-d563c8fa01cfaebb5899ff7970115d0f2e64e8d5.tar.bz2 spark-d563c8fa01cfaebb5899ff7970115d0f2e64e8d5.zip |
Revert "[SPARK-13376] [SQL] improve column pruning"
This reverts commit e9533b419e3a87589313350310890ce0caf73dbb.
Diffstat (limited to 'sql/core')
-rw-r--r-- | sql/core/src/main/scala/org/apache/spark/sql/execution/columnar/InMemoryColumnarTableScan.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/columnar/InMemoryColumnarTableScan.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/columnar/InMemoryColumnarTableScan.scala index 22d4278085..4858140229 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/columnar/InMemoryColumnarTableScan.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/columnar/InMemoryColumnarTableScan.scala @@ -26,8 +26,7 @@ import org.apache.spark.sql.catalyst.InternalRow import org.apache.spark.sql.catalyst.analysis.MultiInstanceRelation import org.apache.spark.sql.catalyst.dsl.expressions._ import org.apache.spark.sql.catalyst.expressions._ -import org.apache.spark.sql.catalyst.plans.logical -import org.apache.spark.sql.catalyst.plans.logical.Statistics +import org.apache.spark.sql.catalyst.plans.logical.{LogicalPlan, Statistics} import org.apache.spark.sql.catalyst.plans.physical.Partitioning import org.apache.spark.sql.execution.{LeafNode, SparkPlan} import org.apache.spark.sql.execution.metric.SQLMetrics @@ -64,7 +63,7 @@ private[sql] case class InMemoryRelation( @transient private[sql] var _cachedColumnBuffers: RDD[CachedBatch] = null, @transient private[sql] var _statistics: Statistics = null, private[sql] var _batchStats: Accumulable[ArrayBuffer[InternalRow], InternalRow] = null) - extends logical.LeafNode with MultiInstanceRelation { + extends LogicalPlan with MultiInstanceRelation { override def producedAttributes: AttributeSet = outputSet @@ -185,6 +184,8 @@ private[sql] case class InMemoryRelation( _cachedColumnBuffers, statisticsToBePropagated, batchStats) } + override def children: Seq[LogicalPlan] = Seq.empty + override def newInstance(): this.type = { new InMemoryRelation( output.map(_.newInstance()), |