diff options
| author | Davies Liu <davies@databricks.com> | 2015-12-16 10:22:48 -0800 |
|---|---|---|
| committer | Davies Liu <davies.liu@gmail.com> | 2015-12-16 10:22:48 -0800 |
| commit | 54c512ba906edfc25b8081ad67498e99d884452b (patch) | |
| tree | 76eb59d8a81148fb6657d74ef0e6d201036b540a /sql/core | |
| parent | a6325fc401f68d9fa30cc947c44acc9d64ebda7b (diff) | |
| download | spark-54c512ba906edfc25b8081ad67498e99d884452b.tar.gz spark-54c512ba906edfc25b8081ad67498e99d884452b.tar.bz2 spark-54c512ba906edfc25b8081ad67498e99d884452b.zip | |
[SPARK-8745] [SQL] remove GenerateProjection
cc rxin
Author: Davies Liu <davies@databricks.com>
Closes #10316 from davies/remove_generate_projection.
Diffstat (limited to 'sql/core')
| -rw-r--r-- | sql/core/src/main/scala/org/apache/spark/sql/execution/local/ExpandNode.scala | 4 | ||||
| -rw-r--r-- | sql/core/src/main/scala/org/apache/spark/sql/execution/local/LocalNode.scala | 18 |
2 files changed, 2 insertions, 20 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/local/ExpandNode.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/local/ExpandNode.scala index 2aff156d18..85111bd6d1 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/local/ExpandNode.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/local/ExpandNode.scala @@ -19,7 +19,7 @@ package org.apache.spark.sql.execution.local import org.apache.spark.sql.SQLConf import org.apache.spark.sql.catalyst.InternalRow -import org.apache.spark.sql.catalyst.expressions.{Attribute, Expression, Projection} +import org.apache.spark.sql.catalyst.expressions._ case class ExpandNode( conf: SQLConf, @@ -36,7 +36,7 @@ case class ExpandNode( override def open(): Unit = { child.open() - groups = projections.map(ee => newProjection(ee, child.output)).toArray + groups = projections.map(ee => newMutableProjection(ee, child.output)()).toArray idx = groups.length } diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/local/LocalNode.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/local/LocalNode.scala index d3381eac91..6a882c9234 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/local/LocalNode.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/local/LocalNode.scala @@ -103,24 +103,6 @@ abstract class LocalNode(conf: SQLConf) extends QueryPlan[LocalNode] with Loggin result } - protected def newProjection( - expressions: Seq[Expression], - inputSchema: Seq[Attribute]): Projection = { - log.debug( - s"Creating Projection: $expressions, inputSchema: $inputSchema") - try { - GenerateProjection.generate(expressions, inputSchema) - } catch { - case NonFatal(e) => - if (isTesting) { - throw e - } else { - log.error("Failed to generate projection, fallback to interpret", e) - new InterpretedProjection(expressions, inputSchema) - } - } - } - protected def newMutableProjection( expressions: Seq[Expression], inputSchema: Seq[Attribute]): () => MutableProjection = { |