[SPARK-40353][PS][CONNECT] Fix index nullable mismatch in ps.read_excel
#50323
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
zhengruifeng
changed the title
ps.read_excelps.read_excel
zhengruifeng
commented
Mar 19, 2025
| @@ -266,33 +264,34 @@ def test_read_excel(self): | |||
| pd.read_excel(open(path1, "rb"), index_col=0), | |||
| ) | |||
| self.assert_eq( | |||
| ps.read_excel(open(path1, "rb"), index_col=0, squeeze=True), | |||
There was a problem hiding this comment.
squeeze is dropped at pandas 2.0, so we need to remove it
zhengruifeng
commented
Mar 19, 2025
| @@ -331,30 +321,17 @@ def test_read_excel(self): | |||
| self.assert_eq(psdfs["Sheet_name_1"], pdfs1["Sheet_name_1"]) | |||
| self.assert_eq(psdfs["Sheet_name_2"], pdfs1["Sheet_name_2"]) | |||
|
|
|||
| psdfs = ps.read_excel(tmp, sheet_name=sheet_name, index_col=0, squeeze=True) | |||
There was a problem hiding this comment.
such tests make no sense since squeeze=True is not allowed any more
zhengruifeng
commented
Mar 19, 2025
| @@ -1186,9 +1188,29 @@ def read_excel_on_spark( | |||
| pdf = pdf_or_pser | |||
|
|
|||
| psdf = cast(DataFrame, from_pandas(pdf)) | |||
| return_schema = force_decimal_precision_scale( | |||
| as_nullable_spark_type(psdf._internal.spark_frame.drop(*HIDDEN_COLUMNS).schema) | |||
There was a problem hiding this comment.
as_nullable_spark_type convert all fields (both index and data) to nullable=true, while in InternalFrame it assert the index field should have nullable=false
zhengruifeng
changed the title
ps.read_excelps.read_excel
HyukjinKwon
approved these changes
Mar 24, 2025
|
Merged to master. |
SauronShepherd
pushed a commit
to SauronShepherd/spark
that referenced
this pull request
Mar 25, 2025
…cel` ### What changes were proposed in this pull request? Fix nullable mismatch in `ps.read_excel` ### Why are the changes needed? to re-enable the tests ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? updated ut ### Was this patch authored or co-authored using generative AI tooling? no Closes apache#50323 from zhengruifeng/ps_read_excel. Authored-by: Ruifeng Zheng <ruifengz@apache.org> Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
kazemaksOG
pushed a commit
to kazemaksOG/spark-custom-scheduler
that referenced
this pull request
Mar 27, 2025
…cel` ### What changes were proposed in this pull request? Fix nullable mismatch in `ps.read_excel` ### Why are the changes needed? to re-enable the tests ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? updated ut ### Was this patch authored or co-authored using generative AI tooling? no Closes apache#50323 from zhengruifeng/ps_read_excel. Authored-by: Ruifeng Zheng <ruifengz@apache.org> Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
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 nullable mismatch in
ps.read_excelWhy are the changes needed?
to re-enable the tests
Does this PR introduce any user-facing change?
no
How was this patch tested?
updated ut
Was this patch authored or co-authored using generative AI tooling?
no