Skip to content

[WIP][SPARK-53855][SQL] Fix PlanID preservation in ResolveSQLFunctions with UDFs #52546

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[WIP][SPARK-53855][SQL] Fix PlanID preservation in ResolveSQLFunctions with UDFs #52546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
397be38
Initial commit
uros-db Oct 8, 2025
cd7f5e8
Fix scalastyle
uros-db Oct 9, 2025
ec1607a
Update
uros-db Oct 9, 2025
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
4 changes: 3 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 @@ -2706,12 +2706,14 @@ class Analyzer(override val catalogManager: CatalogManager) extends RuleExecutor
val newChild = rewrite(p.child)
val projectList = ArrayBuffer.empty[NamedExpression]
val newPList = p.projectList.map(rewriteSQLFunctions(_, projectList))
if (newPList != newChild.output) {
val newProj = if (newPList != newChild.output) {
p.copy(newPList, Project(newChild.output ++ projectList, newChild))
} else {
assert(projectList.isEmpty)
p.copy(child = newChild)
}
newProj.copyTagsFrom(p)
newProj

case f: Filter if f.resolved && hasSQLFunctionExpression(f.expressions) =>
val newChild = rewrite(f.child)
Expand Down
11 changes: 11 additions & 0 deletions ...t/client/jvm/src/test/scala/org/apache/spark/sql/DataFrameTableValuedFunctionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@ import org.apache.spark.sql.functions._
class DataFrameTableValuedFunctionsSuite extends QueryTest with RemoteSparkSession {
import testImplicits._

test("preserve plan ID in ResolveSQLFunctions with UDF") {
// Create a simple SQL function / UDF for testing purposes.
spark.sql("""CREATE OR REPLACE FUNCTION funct(x INT) RETURNS STRING RETURN
Copy link
Contributor

Choose a reason for hiding this comment

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

let's wrap the test with withUserDefinedFunction

CASE WHEN x >= 0 THEN 'foo' ELSE 'bar' END""")
val df = spark
.sql("SELECT * FROM VALUES (0, 1)")
.select(expr("funct(col1)").alias("col2"))
// Now use the UDF in a query that will initiate plan rewrite by ResolveSQLFunctions.
df.groupBy("col2").agg(count("*")).explain(true)
Copy link
Contributor

Choose a reason for hiding this comment

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

can we use checkAnswer?

}

test("explode") {
val actual1 = spark.tvf.explode(array(lit(1), lit(2)))
val expected1 = spark.sql("SELECT * FROM explode(array(1, 2))")
Expand Down