Skip to content

[SPARK-47927][SQL][FOLLOWUP] fix ScalaUDF output nullability #47081

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.

Sign up for GitHub

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

Closed
cloud-fan wants to merge 2 commits into from
Closed

[SPARK-47927][SQL][FOLLOWUP] fix ScalaUDF output nullability #47081

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd685ee
fix ScalaUDF output nullability
cloud-fan Jun 25, 2024
11ec9b7
fix more
cloud-fan Jun 26, 2024
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
Next Next commit
fix ScalaUDF output nullability
  • Loading branch information
@cloud-fan
cloud-fan committed Jun 25, 2024
commit cd685ee264b9939c8f173c4506f0d7c6902c2345
3 changes: 2 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,10 +344,11 @@ class Analyzer(override val catalogManager: CatalogManager) extends RuleExecutor
new ResolveHints.RemoveAllHints),
Batch("Nondeterministic", Once,
PullOutNondeterministic),
Batch("ScalaUDF", Once,
HandleNullInputsForUDF),
Copy link
Contributor Author

@cloud-fan cloud-fan Jun 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This rule adds null handling for ScalaUDF, so even if the ScalaUDF's nullable is false, the final expression (if-else) can also return null, so we need to run UpdateAttributeNullability after it.

Copy link
Contributor

@eejbyfeldt eejbyfeldt Jun 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But we also need to run it before? Or how could we correctly handle null inputs to a udf if we do not have the correct nullability for the inputs?

Seems to me like one should be able to write a test case involving an outer join that shows that the proposed code will not handle such nullable input correctly.

Batch("UpdateNullability", Once,
UpdateAttributeNullability),
Batch("UDF", Once,
HandleNullInputsForUDF,
ResolveEncodersInUDF),
Batch("Subquery", Once,
UpdateOuterReferences),
Expand Down
11 changes: 11 additions & 0 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/AnalysisSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1796,4 +1796,15 @@ class AnalysisSuite extends AnalysisTest with Matchers {
assert(refs.head.resolved)
assert(refs.head.isStreaming)
}

test("SPARK-47927: ScalaUDF output nullability") {
val udf = ScalaUDF(
function = (i: Int) => i + 1,
dataType = IntegerType,
children = $"a" :: Nil,
nullable = false,
inputEncoders = Seq(Some(ExpressionEncoder[Int]().resolveAndBind())))
val plan = testRelation.select(udf.as("u")).select($"u").analyze
assert(plan.output.head.nullable)
}
}