-
Notifications
You must be signed in to change notification settings - Fork 28.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[SPARK-20253][SQL] Remove unnecessary nullchecks of a return value from Spark runtime routines in generated Java code #17569
Changes from 8 commits
4482e1c
ae5e232
fc6caac
41c96ab
a39803a
895a3be
3080ac2
510fb53
10cf4be
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -225,25 +225,26 @@ case class Invoke( | |
getFuncResult(ev.value, s"${obj.value}.$functionName($argString)") | ||
} else { | ||
val funcResult = ctx.freshName("funcResult") | ||
// If the function can return null, we do an extra check to make sure our null bit is still | ||
// set correctly. | ||
val postNullCheckAndAssign = if (!returnNullable) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. how about just There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. +1 |
||
s"${ev.value} = (${ctx.boxedType(javaType)}) $funcResult;" | ||
} else { | ||
s""" | ||
if ($funcResult != null) { | ||
${ev.value} = (${ctx.boxedType(javaType)}) $funcResult; | ||
} else { | ||
${ev.isNull} = true; | ||
} | ||
""" | ||
} | ||
s""" | ||
Object $funcResult = null; | ||
${getFuncResult(funcResult, s"${obj.value}.$functionName($argString)")} | ||
if ($funcResult == null) { | ||
${ev.isNull} = true; | ||
} else { | ||
${ev.value} = (${ctx.boxedType(javaType)}) $funcResult; | ||
} | ||
$postNullCheckAndAssign | ||
""" | ||
} | ||
|
||
// If the function can return null, we do an extra check to make sure our null bit is still set | ||
// correctly. | ||
val postNullCheck = if (ctx.defaultValue(dataType) == "null") { | ||
s"${ev.isNull} = ${ev.value} == null;" | ||
} else { | ||
"" | ||
} | ||
|
||
val code = s""" | ||
${obj.code} | ||
boolean ${ev.isNull} = true; | ||
|
@@ -254,7 +255,6 @@ case class Invoke( | |
if (!${ev.isNull}) { | ||
$evaluate | ||
} | ||
$postNullCheck | ||
} | ||
""" | ||
ev.copy(code = code) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -96,6 +96,16 @@ class DatasetPrimitiveSuite extends QueryTest with SharedSQLContext { | |
checkDataset(dsBoolean.map(e => !e), false, true) | ||
} | ||
|
||
test("mapPrimitiveArray") { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do these tests fail before this PR? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No, I have just added to confirm this check works well. |
||
val dsInt = Seq(Array(1, 2), Array(3, 4)).toDS() | ||
checkDataset(dsInt.map(e => e), Array(1, 2), Array(3, 4)) | ||
checkDataset(dsInt.map(e => null: Array[Int]), null, null) | ||
|
||
val dsDouble = Seq(Array(1D, 2D), Array(3D, 4D)).toDS() | ||
checkDataset(dsDouble.map(e => e), Array(1D, 2D), Array(3D, 4D)) | ||
checkDataset(dsDouble.map(e => null: Array[Double]), null, null) | ||
} | ||
|
||
test("filter") { | ||
val ds = Seq(1, 2, 3, 4).toDS() | ||
checkDataset( | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we check how many places we set
returnNullable
to true? If it's only a few, we can change the default value ofreturnNullable
to false.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here is statistics for 59 call sites of
Invoke()
.18:
dataType
is primitive type21:
returnNullable
is true (no specification at call site, as default)19:
returnNullable
is false1: set a variable to `returnNullable
What do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok let's keep the default value unchanged