[SPARK-48308][CORE][3.5] Unify getting data schema without partition columns in FileSourceStrategy #47483
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
…columns in FileSourceStrategy Compute the schema of the data without partition columns only once in FileSourceStrategy. In FileSourceStrategy, the schema of the data excluding partition columns is computed 2 times in a slightly different way, using an AttributeSet (`partitionSet`) and using the attributes directly (`partitionColumns`) These don't have the exact same semantics, AttributeSet will only use expression ids for comparison while comparing with the actual attributes will use the name, type, nullability and metadata. We want to use the former here. No Existing tests No Closes apache#46619 from johanl-db/reuse-schema-without-partition-columns. Authored-by: Johan Lasperas <[email protected]> Signed-off-by: Wenchen Fan <[email protected]>
cloud-fan
approved these changes
Jul 25, 2024
Contributor
|
This fixes a regression caused by https://github.com/apache/spark/pull/46565/files#diff-fbc6da30b8372e4f9aeb35ccf0d39eb796715d192c7eaeab109376584de0790eR121 , and make Delta Lake pass all tests. I think we should include it in 3.5.2. cc @yaooqinn |
yaooqinn
approved these changes
Jul 25, 2024
Member
|
Do we need this for branch 3.4? |
yaooqinn
pushed a commit
that referenced
this pull request
Jul 25, 2024
…columns in FileSourceStrategy ### What changes were proposed in this pull request? (Cherry-pick of 57948c8 to branch-3.5) Compute the schema of the data without partition columns only once in FileSourceStrategy. ### Why are the changes needed? In FileSourceStrategy, the schema of the data excluding partition columns is computed 2 times in a slightly different way, using an AttributeSet (`partitionSet`) and using the attributes directly (`partitionColumns`) These don't have the exact same semantics, AttributeSet will only use expression ids for comparison while comparing with the actual attributes will use the name, type, nullability and metadata. We want to use the former here. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Existing tests ### Was this patch authored or co-authored using generative AI tooling? No Authored-by: Johan Lasperas <johan.lasperasdatabricks.com> Closes #47483 from vkorukanti/partitionCols. Authored-by: Johan Lasperas <[email protected]> Signed-off-by: Kent Yao <[email protected]>
Member
|
Merged to branch-3.5, thank you all |
Contributor
|
It's fine to skip 3.4 as #46565 was not merged to 3.4 either. |
Member
|
Thank you @cloud-fan |
Member
dongjoon-hyun
left a comment
dongjoon-hyun
left a comment
There was a problem hiding this comment.
It's great to find and fix this during RC2 vote period. Thank you, @vkorukanti , @cloud-fan , @yaooqinn .
turboFei
pushed a commit
to turboFei/spark
that referenced
this pull request
Nov 6, 2025
…columns in FileSourceStrategy (apache#538) ### What changes were proposed in this pull request? (Cherry-pick of 57948c8 to branch-3.5) Compute the schema of the data without partition columns only once in FileSourceStrategy. ### Why are the changes needed? In FileSourceStrategy, the schema of the data excluding partition columns is computed 2 times in a slightly different way, using an AttributeSet (`partitionSet`) and using the attributes directly (`partitionColumns`) These don't have the exact same semantics, AttributeSet will only use expression ids for comparison while comparing with the actual attributes will use the name, type, nullability and metadata. We want to use the former here. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Existing tests ### Was this patch authored or co-authored using generative AI tooling? No Authored-by: Johan Lasperas <johan.lasperasdatabricks.com> Closes apache#47483 from vkorukanti/partitionCols. Authored-by: Johan Lasperas <[email protected]> Signed-off-by: Kent Yao <[email protected]> Co-authored-by: Johan Lasperas <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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?
(Cherry-pick of 57948c8 to branch-3.5)
Compute the schema of the data without partition columns only once in FileSourceStrategy.
Why are the changes needed?
In FileSourceStrategy, the schema of the data excluding partition columns is computed 2 times in a slightly different way, using an AttributeSet (
partitionSet) and using the attributes directly (partitionColumns) These don't have the exact same semantics, AttributeSet will only use expression ids for comparison while comparing with the actual attributes will use the name, type, nullability and metadata. We want to use the former here.Does this PR introduce any user-facing change?
No
How was this patch tested?
Existing tests
Was this patch authored or co-authored using generative AI tooling?
No
Authored-by: Johan Lasperas [email protected]