Explain get handler logic and fix coding style

miland-db · Aug 12, 2024 · 5389e0c · 5389e0c
1 parent 29f1afb
commit 5389e0c
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/scripting/SqlScriptingExecutionNode.scala b/sql/core/src/main/scala/org/apache/spark/sql/scripting/SqlScriptingExecutionNode.scala
@@ -203,11 +203,13 @@ class CompoundBodyExec(
    */
   private def getHandler(condition: String): Option[ErrorHandlerExec] = {
     conditionHandlerMap.get(condition)
-      .orElse(conditionHandlerMap.get("NOT FOUND") match {
-        case Some(handler) if condition.startsWith("02") => Some(handler)
-        case _ => None
-      })
-      .orElse(conditionHandlerMap.get("SQLEXCEPTION"))
+      .orElse{
+        conditionHandlerMap.get("NOT FOUND") match {
+          // If NOT FOUND handler is defined, use it only for errors with class '02'.
+          case Some(handler) if condition.startsWith("02") => Some(handler)
+          case _ => None
+      }}
+      .orElse{conditionHandlerMap.get("SQLEXCEPTION")}
   }
 
   /**