Skip to content

Commit 1baac55

Browse files
committed
Modify generated code of Invoke.
1 parent 501095f commit 1baac55

File tree

1 file changed

+7
-6
lines changed
  • sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects

1 file changed

+7
-6
lines changed

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,15 +242,16 @@ case class Invoke(
242242

243243
val code = s"""
244244
${obj.code}
245+
boolean ${ev.isNull} = true;
246+
$javaType ${ev.value} = ${ctx.defaultValue(dataType)};
245247
if (!${obj.isNull}) {
246248
$argCode
249+
${ev.isNull} = $resultIsNull;
250+
if (!${ev.isNull}) {
251+
$evaluate
252+
}
253+
$postNullCheck
247254
}
248-
boolean ${ev.isNull} = ${obj.isNull} || $resultIsNull;
249-
$javaType ${ev.value} = ${ctx.defaultValue(dataType)};
250-
if (!${ev.isNull}) {
251-
$evaluate
252-
}
253-
$postNullCheck
254255
"""
255256
ev.copy(code = code)
256257
}

0 commit comments

Comments
 (0)