Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ object CodeGenUtils {
s"$rowTerm.setNullAt($indexTerm)"
}

if (fieldType.isNullable) {
if (fieldType.isNullable || !fieldExpr.isProvenNotNull) {
s"""
|${fieldExpr.code}
|if (${fieldExpr.nullTerm}) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ case class GeneratedExpression(
*/
def literal: Boolean = literalValue.isDefined

/** Whether this expression is statically proven never to be null at runtime. */
def isProvenNotNull: Boolean = nullTerm == GeneratedExpression.NEVER_NULL

/**
* Copy result term to target term if the reference is changed. Note: We must ensure that the
* target can only be copied out, so that its object is definitely a brand new reference, not the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,14 @@ object JsonGenerateUtils {

val valueNodeTerm = createNodeTerm(ctx, fieldAccessTerm, fieldType)

if (fieldType.isNullable) {
s"""
|$containerTerm.isNullAt($indexTerm) ?
| (${className[JsonNode]}) $nodeFactoryTerm.nullNode() :
| (${className[JsonNode]}) $valueNodeTerm
|""".stripMargin
} else {
valueNodeTerm
}
// The declared type may be NOT NULL while the runtime container still carries null, e.g. a
// delete-by-key tombstone. Always guard on isNullAt so such nulls serialize as JSON null
// instead of reading a primitive default.
s"""
|$containerTerm.isNullAt($indexTerm) ?
| (${className[JsonNode]}) $nodeFactoryTerm.nullNode() :
| (${className[JsonNode]}) $valueNodeTerm
|""".stripMargin
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1226,7 +1226,7 @@ object ScalarOperatorGens {
val tpe = fieldTypes(idx)
if (element.literal) {
""
} else if (tpe.isNullable) {
} else if (tpe.isNullable || !element.isProvenNotNull) {
s"""
|${element.code}
|if (${element.nullTerm}) {
Expand Down Expand Up @@ -1275,7 +1275,7 @@ object ScalarOperatorGens {
.map {
case (element, idx) =>
val tpe = fieldTypes(idx)
if (tpe.isNullable) {
if (tpe.isNullable || !element.isProvenNotNull) {
s"""
|${element.code}
|if (${element.nullTerm}) {
Expand Down Expand Up @@ -1350,7 +1350,7 @@ object ScalarOperatorGens {
case (element, idx) =>
if (element.literal) {
""
} else if (elementType.isNullable) {
} else if (elementType.isNullable || !element.isProvenNotNull) {
s"""
|${element.code}
|if (${element.nullTerm}) {
Expand Down
Loading