Addresses PR comments

apache · Mar 26, 2016 · 25d894f · 25d894f
1 parent a26973e
commit 25d894f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcRelation.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcRelation.scala
@@ -149,8 +149,10 @@ private[sql] class DefaultSource
       // case, `OrcFileOperator.readSchema` returns `None`, and we can simply return an empty
       // iterator.
       val maybePhysicalSchema = OrcFileOperator.readSchema(Seq(file.filePath), Some(conf))
-
-      maybePhysicalSchema.fold(Iterator.empty: Iterator[InternalRow]) { physicalSchema =>
+      if (maybePhysicalSchema.isEmpty) {
+        Iterator.empty
+      } else {
+        val physicalSchema = maybePhysicalSchema.get
         OrcRelation.setRequiredColumns(conf, physicalSchema, dataSchema)
 
         val orcRecordReader = {