address review comments

kiszk · kiszk · commit a5fd4653af29 · 2017-05-16T22:40:46.000+09:00
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkPlan.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkPlan.scala
@@ -373,9 +373,8 @@ abstract class SparkPlan extends QueryPlan[SparkPlan] with Logging with Serializ
     try {
       GeneratePredicate.generate(expression, inputSchema)
     } catch {
-      case e: JaninoRuntimeException if sqlContext == null || sqlContext.conf.wholeStageFallback =>
-        genInterpretedPredicate(expression, inputSchema)
-      case e: CompileException if sqlContext == null || sqlContext.conf.wholeStageFallback =>
+      case e @ (_: JaninoRuntimeException | _: CompileException)
+          if sqlContext == null || sqlContext.conf.wholeStageFallback =>
         genInterpretedPredicate(expression, inputSchema)
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -373,9 +373,8 @@ abstract class SparkPlan extends QueryPlan[SparkPlan] with Logging with Serializ`
`373`	`373`	`try {`
`374`	`374`	`GeneratePredicate.generate(expression, inputSchema)`
`375`	`375`	`} catch {`
`376`		`- case e: JaninoRuntimeException if sqlContext == null \|\| sqlContext.conf.wholeStageFallback =>`
`377`		`- genInterpretedPredicate(expression, inputSchema)`
`378`		`- case e: CompileException if sqlContext == null \|\| sqlContext.conf.wholeStageFallback =>`
	`376`	`+ case e @ (_: JaninoRuntimeException \| _: CompileException)`
	`377`	`+ if sqlContext == null \|\| sqlContext.conf.wholeStageFallback =>`
`379`	`378`	`genInterpretedPredicate(expression, inputSchema)`
`380`	`379`	`}`
`381`	`380`	`}`