[SPARK-51119][SQL][FOLLOW-UP] Add fallback to ResolveDefaultColumnsUtil existenceDefaultValues #49962
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
…il.existenceDefaultValues
szehon-ho
force-pushed
the
SPARK-51119-follow-2
branch
from
6f13efb to
64b62ca
Compare
cloud-fan
reviewed
Feb 17, 2025
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/ResolveDefaultColumnsUtil.scala
Outdated
Show resolved
Hide resolved
cloud-fan
reviewed
Feb 17, 2025
| log"with ${MDC(COLUMN_DATA_TYPE_SOURCE, field.dataType)}, " + | ||
| log"falling back to full analysis.") | ||
|
|
||
| field.getExistenceDefaultValue().map { text: String => |
There was a problem hiding this comment.
is this just the passed in defaultSQL?
There was a problem hiding this comment.
You are right, I guess I can re-use it or re-derive the redundant argument, i just changed to re-derive it as its a bit easier to get the method signature, but lmk if you prefer the first.
|
I re-ran the failing test and its green on the build link, but somehow still shows red on the PR. |
cloud-fan
reviewed
Feb 20, 2025
| s" field name: ${field.name}, value: $defaultSQL") | ||
| } | ||
| // sanity check | ||
| if (!literal.resolved) { |
There was a problem hiding this comment.
I think def analyze already did this check?
There was a problem hiding this comment.
Yea the original code for resolving existenceDefaultValues, which called analyze(), went through this check. It's even indicated as extra in the comments.
So I was just keeping the original behavior, do you suggest to remove?
There was a problem hiding this comment.
Removed, lets me know if its better
cloud-fan
approved these changes
Feb 20, 2025
cloud-fan
approved these changes
Feb 21, 2025
|
thanks, merging to master/4.0! |
cloud-fan
pushed a commit
that referenced
this pull request
Feb 21, 2025
…il existenceDefaultValues ### What changes were proposed in this pull request? The original change in #49840 was too optimistic and assumes that all column EXISTS_DEFAULT are already resolved and column folded. However, if there is bad EXISTS_DEFAULT metadata (an unresolved expression is persisted) it will break. Add fallback to use the original logic in that case. ### Why are the changes needed? There are some cases where bad EXISTS_DEFAULT metadata is persisted by external catalogs, due to some bugs such as #49942 or other problems. ### Does this PR introduce _any_ user-facing change? No, it should handle bad metadata better. ### How was this patch tested? Add unit test ### Was this patch authored or co-authored using generative AI tooling? No Closes #49962 from szehon-ho/SPARK-51119-follow-2. Authored-by: Szehon Ho <[email protected]> Signed-off-by: Wenchen Fan <[email protected]> (cherry picked from commit 4ffc398) Signed-off-by: Wenchen Fan <[email protected]>
Pajaraja
pushed a commit
to Pajaraja/spark
that referenced
this pull request
Mar 6, 2025
…il existenceDefaultValues ### What changes were proposed in this pull request? The original change in apache#49840 was too optimistic and assumes that all column EXISTS_DEFAULT are already resolved and column folded. However, if there is bad EXISTS_DEFAULT metadata (an unresolved expression is persisted) it will break. Add fallback to use the original logic in that case. ### Why are the changes needed? There are some cases where bad EXISTS_DEFAULT metadata is persisted by external catalogs, due to some bugs such as apache#49942 or other problems. ### Does this PR introduce _any_ user-facing change? No, it should handle bad metadata better. ### How was this patch tested? Add unit test ### Was this patch authored or co-authored using generative AI tooling? No Closes apache#49962 from szehon-ho/SPARK-51119-follow-2. Authored-by: Szehon Ho <[email protected]> Signed-off-by: Wenchen Fan <[email protected]>
cloud-fan
pushed a commit
that referenced
this pull request
Apr 24, 2025
…orrupt exists_default value ### What changes were proposed in this pull request? Add another fallback for broken (non-resolved) exists_default values for SPARK-51119 original fix. ### Why are the changes needed? #49962 added a fallback in case there were already broken (ie, non-resolved) persisted default values in catalogs. A broken one is something like 'current_database, current_user, current_timestamp' , these are non-deterministic and will bring wrong results in EXISTS_DEFAULT, where user expects the value resolved when they set the default. However, this fallback missed one case when the current_xxx is in a cast. This fixes it. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Add to existing unit test in StructTypeSuite ### Was this patch authored or co-authored using generative AI tooling? No Closes #50685 from szehon-ho/SPARK-51119-follow-3. Authored-by: Szehon Ho <[email protected]> Signed-off-by: Wenchen Fan <[email protected]>
cloud-fan
pushed a commit
that referenced
this pull request
Apr 24, 2025
…orrupt exists_default value ### What changes were proposed in this pull request? Add another fallback for broken (non-resolved) exists_default values for SPARK-51119 original fix. ### Why are the changes needed? #49962 added a fallback in case there were already broken (ie, non-resolved) persisted default values in catalogs. A broken one is something like 'current_database, current_user, current_timestamp' , these are non-deterministic and will bring wrong results in EXISTS_DEFAULT, where user expects the value resolved when they set the default. However, this fallback missed one case when the current_xxx is in a cast. This fixes it. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Add to existing unit test in StructTypeSuite ### Was this patch authored or co-authored using generative AI tooling? No Closes #50685 from szehon-ho/SPARK-51119-follow-3. Authored-by: Szehon Ho <[email protected]> Signed-off-by: Wenchen Fan <[email protected]> (cherry picked from commit 516859f) Signed-off-by: Wenchen Fan <[email protected]>
Kimahriman
pushed a commit
to Kimahriman/spark
that referenced
this pull request
May 13, 2025
…orrupt exists_default value ### What changes were proposed in this pull request? Add another fallback for broken (non-resolved) exists_default values for SPARK-51119 original fix. ### Why are the changes needed? apache#49962 added a fallback in case there were already broken (ie, non-resolved) persisted default values in catalogs. A broken one is something like 'current_database, current_user, current_timestamp' , these are non-deterministic and will bring wrong results in EXISTS_DEFAULT, where user expects the value resolved when they set the default. However, this fallback missed one case when the current_xxx is in a cast. This fixes it. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Add to existing unit test in StructTypeSuite ### Was this patch authored or co-authored using generative AI tooling? No Closes apache#50685 from szehon-ho/SPARK-51119-follow-3. Authored-by: Szehon Ho <[email protected]> Signed-off-by: Wenchen Fan <[email protected]>
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?
The original change in #49840 was too optimistic and assumes that all column EXISTS_DEFAULT are already resolved and column folded. However, if there is bad EXISTS_DEFAULT metadata (an unresolved expression is persisted) it will break. Add fallback to use the original logic in that case.
Why are the changes needed?
There are some cases where bad EXISTS_DEFAULT metadata is persisted by external catalogs, due to some bugs such as #49942 or other problems.
Does this PR introduce any user-facing change?
No, it should handle bad metadata better.
How was this patch tested?
Add unit test
Was this patch authored or co-authored using generative AI tooling?
No