address review comment

kiszk · kiszk · commit db61b41a61da · 2017-10-24T04:57:14.000+01:00
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/WholeStageCodegenExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/WholeStageCodegenExec.scala
@@ -509,7 +509,7 @@ case class CollapseCodegenStages(conf: SQLConf) extends Rule[SparkPlan] {
       val hasTooManyOutputFields =
         WholeStageCodegenExec.isTooManyFields(conf, plan.schema)
       val hasTooManyInputFields =
-        plan.children.find(p => WholeStageCodegenExec.isTooManyFields(conf, p.schema)).isDefined
+        plan.children.exists(p => WholeStageCodegenExec.isTooManyFields(conf, p.schema))
       !willFallback && !hasTooManyOutputFields && !hasTooManyInputFields
     case _ => false
   }
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/columnar/InMemoryTableScanExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/columnar/InMemoryTableScanExec.scala
@@ -46,11 +46,11 @@ case class InMemoryTableScanExec(
   override val supportCodegen: Boolean = {
     // In the initial implementation, for ease of review
     // support only primitive data types and # of fields is less than wholeStageMaxNumFields
-    relation.schema.fields.find(f => f.dataType match {
+    relation.schema.fields.forall(f => f.dataType match {
       case BooleanType | ByteType | ShortType | IntegerType | LongType |
-           FloatType | DoubleType => false
-      case _ => true
-    }).isEmpty && !WholeStageCodegenExec.isTooManyFields(conf, relation.schema)
+           FloatType | DoubleType => true
+      case _ => false
+    }) && !WholeStageCodegenExec.isTooManyFields(conf, relation.schema)
   }
 
   private val columnIndices =

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@ case class CollapseCodegenStages(conf: SQLConf) extends Rule[SparkPlan] {`
`509`	`509`	`val hasTooManyOutputFields =`
`510`	`510`	`WholeStageCodegenExec.isTooManyFields(conf, plan.schema)`
`511`	`511`	`val hasTooManyInputFields =`
`512`		`- plan.children.find(p => WholeStageCodegenExec.isTooManyFields(conf, p.schema)).isDefined`
	`512`	`+ plan.children.exists(p => WholeStageCodegenExec.isTooManyFields(conf, p.schema))`
`513`	`513`	`!willFallback && !hasTooManyOutputFields && !hasTooManyInputFields`
`514`	`514`	`case _ => false`
`515`	`515`	`}`