[SPARK-52519][PS] Enable divide-by-zero for numeric floordiv with ANSI enabled #51209
+17
−3
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
xinrong-meng
force-pushed
the
num_floordiv
branch
from
63561cf to
18ab944
Compare
ueshin
reviewed
Jun 18, 2025
|
|
||
| def floordiv(left: PySparkColumn, right: Any) -> PySparkColumn: | ||
| return F.when(F.lit(right is np.nan), np.nan).otherwise( | ||
| F.when( | ||
| F.lit(right != 0) | F.lit(right).isNull(), | ||
| F.floor(left.__div__(right)), | ||
| ).otherwise(F.lit(np.inf).__div__(left)) | ||
| ).otherwise(F.try_divide(F.lit(np.inf), left)) |
There was a problem hiding this comment.
Don't we need to check the config here?
There was a problem hiding this comment.
Forgot we need to keep the current error, updated thanks!
ueshin
reviewed
Jun 18, 2025
Co-authored-by: Takuya UESHIN <[email protected]>
ueshin
reviewed
Jun 19, 2025
| @@ -369,6 +376,9 @@ def floordiv(self, left: IndexOpsLike, right: Any) -> SeriesOrIndex: | |||
| _sanitize_list_like(right) | |||
| if not is_valid_operand_for_numeric_arithmetic(right): | |||
| raise TypeError("Floor division can not be applied to given types.") | |||
| spark_session = left._internal.spark_frame.sparkSession | |||
| use_try_divide = is_ansi_mode_enabled(spark_session) | |||
| safe_div = F.try_divide if use_try_divide else lambda x, y: x.__div__(y) # type: ignore | |||
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?
Enable divide-by-zero for numeric floordiv with ANSI enabled
Why are the changes needed?
Ensure pandas on Spark works well with ANSI mode on.
Part of https://issues.apache.org/jira/browse/SPARK-52169.
Does this PR introduce any user-facing change?
Yes.
How was this patch tested?
Unit tests.
Was this patch authored or co-authored using generative AI tooling?
No.