supportBatch should check unsupported MapType recursively.

viirya · viirya · commit ded41b2726a0 · 2016-07-06T13:04:20.000+08:00
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala
@@ -258,7 +258,7 @@ private[sql] class ParquetFileFormat
     val conf = sparkSession.sessionState.conf
     conf.parquetVectorizedReaderEnabled && conf.wholeStageEnabled &&
       schema.length <= conf.wholeStageMaxNumFields &&
-      schema.forall(!_.dataType.isInstanceOf[MapType])
+      !schema.existsRecursively(_.isInstanceOf[MapType])
   }
 
   override def isSplitable(

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ private[sql] class ParquetFileFormat`
`258`	`258`	`val conf = sparkSession.sessionState.conf`
`259`	`259`	`conf.parquetVectorizedReaderEnabled && conf.wholeStageEnabled &&`
`260`	`260`	`schema.length <= conf.wholeStageMaxNumFields &&`
`261`		`- schema.forall(!_.dataType.isInstanceOf[MapType])`
	`261`	`+ !schema.existsRecursively(_.isInstanceOf[MapType])`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`override def isSplitable(`