Repository: spark
Updated Branches:
  refs/heads/branch-1.6 7c8a399a2 -> 980db2bd4


[HOTFIX] Fix build break.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/980db2bd
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/980db2bd
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/980db2bd

Branch: refs/heads/branch-1.6
Commit: 980db2bd491398ac4d6db3a4550f1a377b6bf577
Parents: 7c8a399
Author: Reynold Xin <r...@databricks.com>
Authored: Tue Jul 12 23:40:37 2016 -0700
Committer: Reynold Xin <r...@databricks.com>
Committed: Tue Jul 12 23:40:37 2016 -0700

----------------------------------------------------------------------
 .../expressions/ExpressionEvalHelperSuite.scala      | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/980db2bd/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvalHelperSuite.scala
----------------------------------------------------------------------
diff --git 
a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvalHelperSuite.scala
 
b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvalHelperSuite.scala
index 64b65e2..a176fd8 100644
--- 
a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvalHelperSuite.scala
+++ 
b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvalHelperSuite.scala
@@ -19,7 +19,7 @@ package org.apache.spark.sql.catalyst.expressions
 
 import org.apache.spark.SparkFunSuite
 import org.apache.spark.sql.catalyst.InternalRow
-import org.apache.spark.sql.catalyst.expressions.codegen.{CodegenContext, 
ExprCode}
+import org.apache.spark.sql.catalyst.expressions.codegen.{CodeGenContext, 
GeneratedExpressionCode}
 import org.apache.spark.sql.types.{DataType, IntegerType}
 
 /**
@@ -43,12 +43,13 @@ class ExpressionEvalHelperSuite extends SparkFunSuite with 
ExpressionEvalHelper
 case class BadCodegenExpression() extends LeafExpression {
   override def nullable: Boolean = false
   override def eval(input: InternalRow): Any = 10
-  override protected def doGenCode(ctx: CodegenContext, ev: ExprCode): 
ExprCode = {
-    ev.copy(code =
-      s"""
-        |int some_variable = 11;
-        |int ${ev.value} = 10;
-      """.stripMargin)
+
+  override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): 
String = {
+    s"""
+       |int some_variable = 11;
+       |int ${ev.value} = 10;
+    """.stripMargin
   }
+
   override def dataType: DataType = IntegerType
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to