Skip to content

Commit e12a9bd

Browse files
committed
Revert "Modify to prepare for further optimization."
This reverts commit ebb1241.
1 parent 243888a commit e12a9bd

File tree

1 file changed

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

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,9 @@ case class Invoke(
205205

206206
val evaluateArguments = if (arguments.nonEmpty) {
207207
s"""
208-
if (!${obj.isNull}) {
208+
if (!${ev.isNull}) {
209209
$argCode
210+
${ev.isNull} = $resultIsNull;
210211
}
211212
"""
212213
} else {
@@ -253,8 +254,8 @@ case class Invoke(
253254

254255
val code = s"""
255256
${obj.code}
257+
boolean ${ev.isNull} = ${obj.isNull};
256258
$evaluateArguments
257-
boolean ${ev.isNull} = ${obj.isNull} || $resultIsNull;
258259
$javaType ${ev.value} = ${ctx.defaultValue(dataType)};
259260
if (!${ev.isNull}) {
260261
$evaluate

0 commit comments

Comments
 (0)