[SPARK-16948][SQL] Querying empty partitioned orc tables throws excep…

…tion
apache · Sep 22, 2016 · e39715e · e39715e
1 parent fa71370
commit e39715e
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala
@@ -238,7 +238,13 @@ private[hive] class HiveMetastoreCatalog(sparkSession: SparkSession) extends Log
           partitionSpec)
 
         val schema = fileType match {
-          case "orc" | "parquet" =>
+          case "parquet" =>
+            val inferredSchema =
+              defaultSource.inferSchema(sparkSession, options, fileCatalog.allFiles())
+            inferredSchema.map { inferred =>
+              ParquetFileFormat.mergeMetastoreParquetSchema(metastoreSchema, inferred)
+            }.getOrElse(metastoreSchema)
+          case "orc" =>
             metastoreSchema
           case _ =>
             throw new RuntimeException(s"Cannot convert a $fileType to a data source table")