Merge remote-tracking branch 'apache-github/master' into SPARK-17761

hvanhovell · hvanhovell · commit b650c86be808 · 2016-10-04T11:18:15.000-07:00
# Conflicts:
#	sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateMutableProjection.scala
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CodeGenerationSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CodeGenerationSuite.scala
@@ -174,7 +174,7 @@ class CodeGenerationSuite extends SparkFunSuite with ExpressionEvalHelper {
         Literal.create("PST", StringType))
     }
     val plan = GenerateMutableProjection.generate(expressions)
-    val actual = plan(new GenericMutableRow(length)).toSeq(expressions.map(_.dataType))
+    val actual = plan(new GenericInternalRow(length)).toSeq(expressions.map(_.dataType))
     val expected = Seq.fill(length)(
       DateTimeUtils.fromJavaTimestamp(Timestamp.valueOf("2015-07-24 07:00:00")))
 

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ class CodeGenerationSuite extends SparkFunSuite with ExpressionEvalHelper {`
`174`	`174`	`Literal.create("PST", StringType))`
`175`	`175`	`}`
`176`	`176`	`val plan = GenerateMutableProjection.generate(expressions)`
`177`		`- val actual = plan(new GenericMutableRow(length)).toSeq(expressions.map(_.dataType))`
	`177`	`+ val actual = plan(new GenericInternalRow(length)).toSeq(expressions.map(_.dataType))`
`178`	`178`	`val expected = Seq.fill(length)(`
`179`	`179`	`DateTimeUtils.fromJavaTimestamp(Timestamp.valueOf("2015-07-24 07:00:00")))`
`180`	`180`