Skip to content

[SPARK-58341][SQL] Fix wrong results with 5+ positional parameters in sql #57516

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
dongjoon-hyun wants to merge 2 commits into from
Closed

[SPARK-58341][SQL] Fix wrong results with 5+ positional parameters in sql #57516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3eaede
[SPARK-58341][SQL] Fix wrong results with 5+ positional parameters in…
dongjoon-hyun Jul 24, 2026
1dbb8fd
fix linter
dongjoon-hyun Jul 25, 2026
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 ...nect/server/src/main/scala/org/apache/spark/sql/connect/planner/SparkConnectPlanner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,9 @@ class SparkConnectPlanner(
s"_pos_$idx" -> expr
}.toMap
val resolvedParams = session.resolveAndValidateParameters(paramMap)
Some(PositionalParameterContext(resolvedParams.values.toSeq))
// Look up by the positional key instead of relying on `resolvedParams.values`:
// the map does not preserve insertion order for 5+ entries.
Some(PositionalParameterContext(paramList.indices.map(idx => resolvedParams(s"_pos_$idx"))))
} else if (!args.isEmpty) {
// Use named arguments (literals) - already resolved
val paramMap = args.asScala.toMap.transform((_, v) => transformLiteral(v))
Expand Down
12 changes: 12 additions & 0 deletions ...server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectPlannerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,18 @@ class SparkConnectPlannerSuite extends SparkFunSuite with SparkConnectPlanTest {
assert(array(2).toString == InternalRow(3, "kafka", 3, "kafka").toString)
}

test("SPARK-58341: transform SQL with 5 or more positional arguments binds in order") {
val sql = proto.SQL
.newBuilder()
.setQuery("SELECT ?, ?, ?, ?, ?, ?")
(1 to 6).foreach { v =>
sql.addPosArguments(proto.Expression.newBuilder().setLiteral(toLiteralProto(v)))
}

val df = Dataset.ofRows(spark, transform(proto.Relation.newBuilder.setSql(sql).build()))
assert(df.collect() === Array(Row(1, 2, 3, 4, 5, 6)))
}

test("transform UnresolvedStar with target field") {
val rows = (0 until 10).map { i =>
InternalRow(InternalRow(InternalRow(i, i + 1)))
Expand Down
11 changes: 7 additions & 4 deletions sql/core/src/main/scala/org/apache/spark/sql/classic/SparkSession.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,16 +531,19 @@ class SparkSession private(
val parsedPlan = {
// Always parse with parameter context to detect unbound parameter markers.
// Even if args is empty, we need to detect and reject parameter markers in the SQL.
val (paramMap, resolvedParams) = if (args.nonEmpty) {
val resolvedParams = if (args.nonEmpty) {
val pMap = args.zipWithIndex.map { case (arg, idx) =>
s"_pos_$idx" -> lit(arg).expr
}.toMap
(pMap, resolveAndValidateParameters(pMap))
resolveAndValidateParameters(pMap)
} else {
(Map.empty[String, Expression], Map.empty[String, Expression])
Map.empty[String, Expression]
}

val paramContext = PositionalParameterContext(resolvedParams.values.toSeq)
// Look up by the positional key instead of relying on `resolvedParams.values`:
// the map does not preserve insertion order for 5+ entries.
val paramContext =
PositionalParameterContext(args.indices.map(idx => resolvedParams(s"_pos_$idx")))

@peter-toth peter-toth Jul 25, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Finding 1. The fix is correct as written. Just flagging a possible follow-up: the underlying trap is that resolveAndValidateParameters (SparkSession.scala:469) returns a plain immutable Map, which loses insertion order at 5+ entries -- so every caller that wants positional order has to rebuild it from the _pos_<idx> keys (here and in SparkConnectPlanner.buildParameterContext). Fixing it at the source -- return a scala.collection.immutable.ListMap (insertion-order-preserving) or expose a positional Seq -- would make .values.toSeq order-safe for all callers and remove the per-callsite rebuild, protecting future ones from the same bug. Not for this PR: the surgical fix is the safer, easy-to-backport choice; worth a separate follow-up ticket if you agree.

val parsed = sessionState.sqlParser.parsePlanWithParameters(sqlText, paramContext)

// Check for SQL scripting with positional parameters
Expand Down
10 changes: 10 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/ParametersSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,16 @@ class ParametersSuite extends SharedSparkSession {
Row(true))
}

test("SPARK-58341: bind 5 or more positional parameters in order") {
checkAnswer(
spark.sql("SELECT ?, ?, ?, ?, ?, ?", Array(1, 2, 3, 4, 5, 6)),
Row(1, 2, 3, 4, 5, 6))

checkAnswer(
spark.sql("SELECT ? + ?, ? * ?, ? - ?", Array(1, 2, 30, 4, 500, 6)),
Row(3, 120, 494))
}

test("parameter binding is case sensitive") {
checkAnswer(
spark.sql("SELECT :p, :P", Map("p" -> 1, "P" -> 2)),
Expand Down