[SPARK-23731][SQL] FileSourceScanExec throws NullPointerException in subexpression elimination

jaceklaskowski · jaceklaskowski · commit 39814216026d · 2018-03-18T18:25:02.000+01:00
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala
@@ -163,7 +163,7 @@ case class FileSourceScanExec(
     override val tableIdentifier: Option[TableIdentifier])
   extends DataSourceScanExec with ColumnarBatchScan  {
 
-  override val supportsBatch: Boolean = relation.fileFormat.supportBatch(
+  override val supportsBatch: Boolean = relation != null && relation.fileFormat.supportBatch(
     relation.sparkSession, StructType.fromAttributes(output))
 
   override val needsUnsafeRowConversion: Boolean = {
