addressed review comments

apache · May 12, 2017 · 1f19c80 · 1f19c80
1 parent 8b6ba75
commit 1f19c80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/...lyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala b/...lyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala
@@ -908,11 +908,7 @@ object CodeGenerator extends Logging {
     // Cache.get() may wrap the original exception. See the following URL
     // http://google.github.io/guava/releases/14.0/api/docs/com/google/common/cache/
     //   Cache.html#get(K,%20java.util.concurrent.Callable)
-    case e : UncheckedExecutionException =>
-      val excChains = ExceptionUtils.getThrowables(e)
-      val exc = if (excChains.length == 1) excChains(0) else excChains(excChains.length - 2)
-      throw exc
-    case e : ExecutionError =>
+    case e @ (_: UncheckedExecutionException | _: ExecutionError) =>
       val excChains = ExceptionUtils.getThrowables(e)
       val exc = if (excChains.length == 1) excChains(0) else excChains(excChains.length - 2)
       throw exc
@@ -973,7 +969,7 @@ object CodeGenerator extends Logging {
       case e: CompileException =>
         val msg = s"failed to compile: $e\n$formatted"
         logError(msg, e)
-        throw new CompileException(msg, e.asInstanceOf[CompileException].getLocation)
+        throw new CompileException(msg, e.getLocation)
     }
     evaluator.getClazz().newInstance().asInstanceOf[GeneratedClass]
   }

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala
@@ -33,8 +33,8 @@ object InterpretedPredicate {
   def create(expression: Expression): InterpretedPredicate = new InterpretedPredicate(expression)
 }
 
-class InterpretedPredicate(expression: Expression) extends BasePredicate {
-  def eval(r: InternalRow): Boolean = expression.eval(r).asInstanceOf[Boolean]
+case class InterpretedPredicate(expression: Expression) extends BasePredicate {
+  override def eval(r: InternalRow): Boolean = expression.eval(r).asInstanceOf[Boolean]
 }
 
 /**