rebase

Author: cloud-fan

sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/SpecializedGetters.java

@@ -19,7 +19,6 @@
 
 import org.apache.spark.sql.catalyst.InternalRow;
 import org.apache.spark.sql.types.ArrayData;
-import org.apache.spark.sql.types.DataType;
 import org.apache.spark.sql.types.Decimal;
 import org.apache.spark.unsafe.types.CalendarInterval;
 import org.apache.spark.unsafe.types.UTF8String;

sql/catalyst/src/main/scala/org/apache/spark/sql/types/GenericArrayData.scala

@@ -18,7 +18,7 @@
 package org.apache.spark.sql.types
 
 import org.apache.spark.sql.catalyst.InternalRow
-import org.apache.spark.unsafe.types.{UTF8String, Interval}
+import org.apache.spark.unsafe.types.{UTF8String, CalendarInterval}
 
 class GenericArrayData(array: Array[Any]) extends ArrayData {
   private def getAs[T](ordinal: Int) = get(ordinal).asInstanceOf[T]
@@ -49,7 +49,7 @@ class GenericArrayData(array: Array[Any]) extends ArrayData {
 
   override def getBinary(ordinal: Int): Array[Byte] = getAs(ordinal)
 
-  override def getInterval(ordinal: Int): Interval = getAs(ordinal)
+  override def getInterval(ordinal: Int): CalendarInterval = getAs(ordinal)
 
   override def getStruct(ordinal: Int, numFields: Int): InternalRow = getAs(ordinal)
 

sql/core/src/main/scala/org/apache/spark/sql/json/JacksonParser.scala

@@ -173,10 +173,10 @@ private[sql] object JacksonParser {
   private def convertArray(
       factory: JsonFactory,
       parser: JsonParser,
-      schema: DataType): ArrayData = {
+      elementType: DataType): ArrayData = {
     val values = scala.collection.mutable.ArrayBuffer.empty[Any]
     while (nextUntil(parser, JsonToken.END_ARRAY)) {
-      values += convertField(factory, parser, schema)
+      values += convertField(factory, parser, elementType)
     }
 
     new GenericArrayData(values.toArray)

sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveInspectorSuite.scala

@@ -217,7 +217,7 @@ class HiveInspectorSuite extends SparkFunSuite with HiveInspectors {
   test("wrap / unwrap Array Type") {
     val dt = ArrayType(dataTypes(0))
 
-    val d = row(0) :: row(0) :: Nil
+    val d = new GenericArrayData(Array(row(0), row(0)))
     checkValue(d, unwrap(wrap(d, toInspector(dt), dt), toInspector(dt)))
     checkValue(null, unwrap(wrap(null, toInspector(dt), dt), toInspector(dt)))
     checkValue(d,