Use ctx.nullSafeExec() to generate nullability checking in MapObjects.

Author: ueshin

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects/objects.scala

@@ -513,23 +513,11 @@ case class MapObjects private(
       case _ => s"$loopIsNull = $loopValue == null;"
     }
 
-    val setValue = if (lambdaFunction.nullable) {
-      s"""
-        if (${genFunction.isNull}) {
-          $convertedArray[$loopIndex] = null;
-        } else {
-          $convertedArray[$loopIndex] = $genFunctionValue;
-        }
-      """
-    } else {
-      s"$convertedArray[$loopIndex] = $genFunctionValue;"
-    }
-
     val code = s"""
       ${genInputData.code}
       ${ctx.javaType(dataType)} ${ev.value} = ${ctx.defaultValue(dataType)};
-
-      if (!${genInputData.isNull}) {
+    """ +
+      ctx.nullSafeExec(inputData.nullable, genInputData.isNull)(s"""
         $determineCollectionType
         $convertedType[] $convertedArray = null;
         int $dataLength = $getLength;
@@ -541,14 +529,15 @@ case class MapObjects private(
           $loopNullCheck
 
           ${genFunction.code}
-          $setValue
-
+        """ +
+        ctx.nullSafeExec(lambdaFunction.nullable, genFunction.isNull)(s"""
+          $convertedArray[$loopIndex] = $genFunctionValue;
+        """) + s"""
           $loopIndex += 1;
         }
 
         ${ev.value} = new ${classOf[GenericArrayData].getName}($convertedArray);
-      }
-    """
+      """)
     ev.copy(code = code, isNull = genInputData.isNull)
   }
 }