[SPARK-48414][PYTHON] Fix breaking change in python's fromJson
#46737
Conversation
This file contains 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
HyukjinKwon
reviewed
May 26, 2024
| fieldPath: str, | ||
| collationsMap: Optional[Dict[str, str]], | ||
| fieldPath: str = "", | ||
| collationsMap: Optional[Dict[str, str]] = None, |
There was a problem hiding this comment.
Extensive testing was added in #46280, this change is just so that the API for the fromJson method doesn't change which we missed in the previous PR
HyukjinKwon
reviewed
Jul 2, 2024
python/pyspark/sql/types.py
Outdated
| fieldPath: str, | ||
| collationsMap: Optional[Dict[str, str]], | ||
| fieldPath: str = "", | ||
| collationsMap: Optional[Dict[str, str]] = None, | ||
| ) -> "ArrayType": | ||
| elementType = _parse_datatype_json_value( | ||
| json["elementType"], fieldPath + ".element", collationsMap |
There was a problem hiding this comment.
Seems like it's .element when empty strings are given. Are they expected?
There was a problem hiding this comment.
Yes, if you are deserializing a schema where an array is on the column a the collationsMap would be {"a.element": collation}. So if you just want to deserialize a map that is not a part of the larger schema the collationsMap should be {".element": collation}
Added tests to verify this.
There was a problem hiding this comment.
I feel like it has to be {"element": collation} and {"key": collation}. .element sounds a bit awkward. While I am fine because this JSON format is supposed to be internal-only, is this backward compatible? E.g., can old JSON data types be read? I have seen many tickets related to this, e.g., #43474
There was a problem hiding this comment.
On the second thought I agree with you, it definitely makes more sense to special case this so we don't have this weird dangling dot.
This should be completely backwards compatible; if we don't care about collations and don't pass fieldPath and collationsMap everything will be the same as before.
HyukjinKwon
approved these changes
Jul 24, 2024
|
Merged to master. |
HyukjinKwon
pushed a commit
that referenced
this pull request
Jul 27, 2024
…scala
### What changes were proposed in this pull request?
When deserializing map/array that is not part of the struct field, the key in collation map should just be `{"element": collation}` instead of `{".element": collation}`.
### Why are the changes needed?
To be consistent with the behavior on the pyspark side (#46737).
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Unit tests.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #47497 from stefankandic/complexTypeDeSer.
Authored-by: Stefan Kandic <[email protected]>
Signed-off-by: Hyukjin Kwon <[email protected]>
ilicmarkodb
pushed a commit
to ilicmarkodb/spark
that referenced
this pull request
Jul 29, 2024
### What changes were proposed in this pull request? Fix breaking change in `fromJson` method by having default param values. ### Why are the changes needed? In order to not break clients that don't care about collations. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Existing UTs. ### Was this patch authored or co-authored using generative AI tooling? No. Closes apache#46737 from stefankandic/fromJsonBreakingChange. Authored-by: Stefan Kandic <[email protected]> Signed-off-by: Hyukjin Kwon <[email protected]>
ilicmarkodb
pushed a commit
to ilicmarkodb/spark
that referenced
this pull request
Jul 29, 2024
…scala
### What changes were proposed in this pull request?
When deserializing map/array that is not part of the struct field, the key in collation map should just be `{"element": collation}` instead of `{".element": collation}`.
### Why are the changes needed?
To be consistent with the behavior on the pyspark side (apache#46737).
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Unit tests.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes apache#47497 from stefankandic/complexTypeDeSer.
Authored-by: Stefan Kandic <[email protected]>
Signed-off-by: Hyukjin Kwon <[email protected]>
fusheng-rd
pushed a commit
to fusheng-rd/spark
that referenced
this pull request
Aug 6, 2024
### What changes were proposed in this pull request? Fix breaking change in `fromJson` method by having default param values. ### Why are the changes needed? In order to not break clients that don't care about collations. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Existing UTs. ### Was this patch authored or co-authored using generative AI tooling? No. Closes apache#46737 from stefankandic/fromJsonBreakingChange. Authored-by: Stefan Kandic <[email protected]> Signed-off-by: Hyukjin Kwon <[email protected]>
fusheng-rd
pushed a commit
to fusheng-rd/spark
that referenced
this pull request
Aug 6, 2024
…scala
### What changes were proposed in this pull request?
When deserializing map/array that is not part of the struct field, the key in collation map should just be `{"element": collation}` instead of `{".element": collation}`.
### Why are the changes needed?
To be consistent with the behavior on the pyspark side (apache#46737).
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Unit tests.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes apache#47497 from stefankandic/complexTypeDeSer.
Authored-by: Stefan Kandic <[email protected]>
Signed-off-by: Hyukjin Kwon <[email protected]>
attilapiros
pushed a commit
to attilapiros/spark
that referenced
this pull request
Oct 4, 2024
### What changes were proposed in this pull request? Fix breaking change in `fromJson` method by having default param values. ### Why are the changes needed? In order to not break clients that don't care about collations. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Existing UTs. ### Was this patch authored or co-authored using generative AI tooling? No. Closes apache#46737 from stefankandic/fromJsonBreakingChange. Authored-by: Stefan Kandic <[email protected]> Signed-off-by: Hyukjin Kwon <[email protected]>
attilapiros
pushed a commit
to attilapiros/spark
that referenced
this pull request
Oct 4, 2024
…scala
### What changes were proposed in this pull request?
When deserializing map/array that is not part of the struct field, the key in collation map should just be `{"element": collation}` instead of `{".element": collation}`.
### Why are the changes needed?
To be consistent with the behavior on the pyspark side (apache#46737).
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Unit tests.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes apache#47497 from stefankandic/complexTypeDeSer.
Authored-by: Stefan Kandic <[email protected]>
Signed-off-by: Hyukjin Kwon <[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?
Fix breaking change in
fromJsonmethod by having default param values.Why are the changes needed?
In order to not break clients that don't care about collations.
Does this PR introduce any user-facing change?
No.
How was this patch tested?
Existing UTs.
Was this patch authored or co-authored using generative AI tooling?
No.