Repository: spark Updated Branches: refs/heads/master ef9299965 -> 2a29a60da
Revert "[SPARK-22600][SQL][FOLLOW-UP] Fix a compilation error in TPCDS q75/q77" This reverts commit ef92999653f0e2a47752379a867647445d849aab. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bc7e4a90 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bc7e4a90 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bc7e4a90 Branch: refs/heads/master Commit: bc7e4a90c0c91970a94aa385971daac48db6264e Parents: ef92999 Author: Wenchen Fan <wenc...@databricks.com> Authored: Thu Dec 14 11:21:34 2017 +0800 Committer: Wenchen Fan <wenc...@databricks.com> Committed: Thu Dec 14 11:21:34 2017 +0800 ---------------------------------------------------------------------- .../spark/sql/catalyst/expressions/codegen/ExpressionCodegen.scala | 1 + .../apache/spark/sql/execution/joins/BroadcastHashJoinExec.scala | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/bc7e4a90/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/ExpressionCodegen.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/ExpressionCodegen.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/ExpressionCodegen.scala index 807cb94..a2dda48 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/ExpressionCodegen.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/ExpressionCodegen.scala @@ -20,6 +20,7 @@ package org.apache.spark.sql.catalyst.expressions.codegen import scala.collection.mutable import org.apache.spark.sql.catalyst.expressions._ +import org.apache.spark.sql.types.DataType /** * Defines util methods used in expression code generation. http://git-wip-us.apache.org/repos/asf/spark/blob/bc7e4a90/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/BroadcastHashJoinExec.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/BroadcastHashJoinExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/BroadcastHashJoinExec.scala index 634014a..c96ed6e 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/BroadcastHashJoinExec.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/BroadcastHashJoinExec.scala @@ -192,7 +192,7 @@ case class BroadcastHashJoinExec( | $value = ${ev.value}; |} """.stripMargin - ExprCode(code, isNull, value, inputRow = matched) + ExprCode(code, isNull, value) } } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
