Fixes issues introduced while rebasing

Author: liancheng

sql/core/src/main/scala/org/apache/spark/sql/parquet/ParquetTypes.scala

@@ -545,10 +545,10 @@ private[parquet] object ParquetTypesConverter extends Logging {
         val newFields = ArrayBuffer.empty[StructField]
 
         leftFields.foreach {
-          case leftField @ StructField(leftName, leftType, leftNullable, leftMetadata) =>
+          case leftField @ StructField(leftName, leftType, leftNullable, _) =>
             rightFields
               .find(_.name == leftName)
-              .map { case rightField @ StructField(_, rightType, rightNullable, rightMeatadata) =>
+              .map { case rightField @ StructField(_, rightType, rightNullable, _) =>
                 leftField.copy(
                   dataType = mergeCatalystDataTypes(leftType, rightType),
                   nullable = leftNullable || rightNullable)

sql/core/src/main/scala/org/apache/spark/sql/parquet/newParquet.scala

@@ -393,7 +393,10 @@ object ParquetRelation2 {
         // Falls back to Parquet schema if Spark SQL schema is absent.
         StructType.fromAttributes(
           // TODO Really no need to use `Attribute` here, we only need to know the data type.
-          convertToAttributes(parquetSchema, sqlContext.conf.isParquetBinaryAsString))
+          convertToAttributes(
+            parquetSchema,
+            sqlContext.conf.isParquetBinaryAsString,
+            sqlContext.conf.isParquetINT96AsTimestamp))
       }
     }.reduce { (left, right) =>
       try mergeCatalystSchemas(left, right) catch { case e: Throwable =>

sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetFilterSuite.scala

@@ -312,10 +312,10 @@ class ParquetFilterSuite extends QueryTest with ParquetTest {
   }
 
   withSQLConf(SQLConf.PARQUET_USE_DATA_SOURCE_API -> "true") {
-    run("Enable Parquet data source")
+    run("Parquet data source enabled")
   }
 
   withSQLConf(SQLConf.PARQUET_USE_DATA_SOURCE_API -> "false") {
-    run("Disable Parquet data source")
+    run("Parquet data source disabled")
   }
 }

sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetIOSuite.scala

@@ -291,10 +291,10 @@ class ParquetIOSuite extends QueryTest with ParquetTest {
   }
 
   withSQLConf(SQLConf.PARQUET_USE_DATA_SOURCE_API -> "true") {
-    run("Enable Parquet data source")
+    run("Parquet data source enabled")
   }
 
   withSQLConf(SQLConf.PARQUET_USE_DATA_SOURCE_API -> "false") {
-    run("Disable Parquet data source")
+    run("Parquet data source disabled")
   }
 }

sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetQuerySuite.scala

@@ -46,15 +46,15 @@ class ParquetQuerySuite extends QueryTest with ParquetTest {
 
     // This test case will trigger the NPE mentioned in
     // https://issues.apache.org/jira/browse/PARQUET-151.
-    ignore("overwriting") {
+    ignore(s"$prefix: overwriting") {
       val data = (0 until 10).map(i => (i, i.toString))
       withParquetTable(data, "t") {
         sql("INSERT OVERWRITE TABLE t SELECT * FROM t")
         checkAnswer(table("t"), data.map(Row.fromTuple))
       }
     }
 
-    test("self-join") {
+    test(s"$prefix: self-join") {
       // 4 rows, cells of column 1 of row 2 and row 4 are null
       val data = (1 to 4).map { i =>
         val maybeInt = if (i % 2 == 0) None else Some(i)
@@ -111,10 +111,10 @@ class ParquetQuerySuite extends QueryTest with ParquetTest {
   }
 
   withSQLConf(SQLConf.PARQUET_USE_DATA_SOURCE_API -> "true") {
-    run("Enable Parquet data source")
+    run("Parquet data source enabled")
   }
 
   withSQLConf(SQLConf.PARQUET_USE_DATA_SOURCE_API -> "false") {
-    run("Disable Parquet data source")
+    run("Parquet data source disabled")
   }
 }

sql/hive/src/test/scala/org/apache/spark/sql/parquet/parquetSuites.scala

@@ -286,8 +286,8 @@ abstract class ParquetPartitioningTest extends QueryTest with BeforeAndAfterAll
   }
 
   setConf(SQLConf.PARQUET_USE_DATA_SOURCE_API, "false")
-  run("Enable Parquet data source")
+  run("Parquet data source enabled")
 
   setConf(SQLConf.PARQUET_USE_DATA_SOURCE_API, "true")
-  run("Disable Parquet data source")
+  run("Parquet data source disabled")
 }