[SPARK-48356][FOLLOW UP][SQL] Improve FOR statement's column schema inference #51053
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc @cloud-fan @dejankrak-db @miland-db @dusantism-db please review |
miland-db
approved these changes
May 30, 2025
dusantism-db
approved these changes
May 30, 2025
cloud-fan
reviewed
Jun 2, 2025
| @@ -122,6 +122,8 @@ case class StructType(fields: Array[StructField]) extends DataType with Seq[Stru | |||
| private lazy val nameToIndex: Map[String, Int] = SparkCollectionUtils.toMapWithIndex(fieldNames) | |||
| private lazy val nameToIndexCaseInsensitive: CaseInsensitiveMap[Int] = | |||
| CaseInsensitiveMap[Int](nameToIndex.toMap) | |||
| lazy val nameToDataType: collection.immutable.Map[String, DataType] = | |||
There was a problem hiding this comment.
StructType is a public API, we should only add new methods when we have to. It's also in the Spark Connect side, which means users need to upgrade the client version.
Can we build this map in the caller side?
There was a problem hiding this comment.
Changed. Wasn't aware of it, thanks!
cloud-fan
reviewed
Jun 4, 2025
sql/core/src/main/scala/org/apache/spark/sql/scripting/SqlScriptingExecutionNode.scala
Outdated
Show resolved
Hide resolved
…ptingExecutionNode.scala
|
The linter failure is unrelated, thanks, merging to master! |
cloud-fan
added a commit
that referenced
this pull request
Jun 5, 2025
…nference ### What changes were proposed in this pull request? This pull request changes `FOR` statement to infer column schemas from the query DataFrame, and no longer implicitly infer column schema in SetVariable. This is necessary due to type mismatch errors with complex nested types, e.g. `ARRAY<STRUCT<..>>`. ### Why are the changes needed? Bug fix for FOR statement. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? New unit test that specifically targets problematic case. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #51053 from davidm-db/for_schema_inference. Lead-authored-by: David Milicevic <david.milicevic@databricks.com> Co-authored-by: David Milicevic <163021185+davidm-db@users.noreply.github.com> Co-authored-by: Wenchen Fan <cloud0fan@gmail.com> Signed-off-by: Wenchen Fan <wenchen@databricks.com> (cherry picked from commit 23e6274) Signed-off-by: Wenchen Fan <wenchen@databricks.com>
yhuang-db
pushed a commit
to yhuang-db/spark
that referenced
this pull request
Jun 9, 2025
…nference ### What changes were proposed in this pull request? This pull request changes `FOR` statement to infer column schemas from the query DataFrame, and no longer implicitly infer column schema in SetVariable. This is necessary due to type mismatch errors with complex nested types, e.g. `ARRAY<STRUCT<..>>`. ### Why are the changes needed? Bug fix for FOR statement. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? New unit test that specifically targets problematic case. ### Was this patch authored or co-authored using generative AI tooling? No. Closes apache#51053 from davidm-db/for_schema_inference. Lead-authored-by: David Milicevic <david.milicevic@databricks.com> Co-authored-by: David Milicevic <163021185+davidm-db@users.noreply.github.com> Co-authored-by: Wenchen Fan <cloud0fan@gmail.com> Signed-off-by: Wenchen Fan <wenchen@databricks.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
This pull request changes
FORstatement to infer column schemas from the query DataFrame, and no longer implicitly infer column schema in SetVariable. This is necessary due to type mismatch errors with complex nested types, e.g.ARRAY<STRUCT<..>>.Why are the changes needed?
Bug fix for FOR statement.
Does this PR introduce any user-facing change?
No.
How was this patch tested?
New unit test that specifically targets problematic case.
Was this patch authored or co-authored using generative AI tooling?
No.