[SPARK-52570][PS] Enable divide-by-zero for numeric rmod with ANSI enabled #51275
+24
−37
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
ueshin
approved these changes
Jun 24, 2025
HyukjinKwon
approved these changes
Jun 25, 2025
| spark_session = left._internal.spark_frame.sparkSession | ||
|
|
||
| def safe_mod(left_col: PySparkColumn, right_val: Any) -> PySparkColumn: | ||
| if is_ansi_mode_enabled(spark_session): |
There was a problem hiding this comment.
Just curious why don't we need to check ansi_mode here anymore?
There was a problem hiding this comment.
Bools are considered numeric and will take num_ops logic if that makes sense
There was a problem hiding this comment.
Merged to unblock prs, please let me know if you have further concerns :)
|
Merged to master, thanks! |
HyukjinKwon
reviewed
Jul 1, 2025
| @@ -225,11 +225,12 @@ def test_binary_operator_floordiv(self): | |||
|
|
|||
| def test_binary_operator_mod(self): | |||
| # Positive | |||
| pdf = pd.DataFrame({"a": [3], "b": [2]}) | |||
| pdf = pd.DataFrame({"a": [3], "b": [2], "c": [0]}) | |||
There was a problem hiding this comment.
Seems like this change broke the non ANSI mode:
======================================================================
ERROR [4.586s]: test_binary_operator_mod (pyspark.pandas.tests.computation.test_binary_ops.FrameBinaryOpsTests.test_binary_operator_mod)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/__w/spark/spark/python/pyspark/pandas/tests/computation/test_binary_ops.py", line 233, in test_binary_operator_mod
self.assert_eq(1 % psdf["c"], 1 % pdf["c"])
~~^~~~~~~~~~~
File "/__w/spark/spark/python/pyspark/pandas/base.py", line 386, in __rmod__
return self._dtype_op.rmod(self, other)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/__w/spark/spark/python/pyspark/pandas/data_type_ops/num_ops.py", line 177, in rmod
return column_op(safe_rmod)(left, right)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/__w/spark/spark/python/pyspark/pandas/base.py", line 222, in wrapper
scol = f(
^^
File "/__w/spark/spark/python/pyspark/pandas/data_type_ops/num_ops.py", line 175, in safe_rmod
return ((right % left) + left) % left
~~~~~~^~~~~~
File "/__w/spark/spark/python/pyspark/pandas/base.py", line 386, in __rmod__
return self._dtype_op.rmod(self, other)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/__w/spark/spark/python/pyspark/pandas/data_type_ops/num_ops.py", line 177, in rmod
return column_op(safe_rmod)(left, right)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/__w/spark/spark/python/pyspark/pandas/base.py", line 222, in wrapper
scol = f(
^^
File "/__w/spark/spark/python/pyspark/pandas/data_type_ops/num_ops.py", line 175, in safe_rmod
return ((right % left) + left) % left
~~~~~~^~~~~~
File "/__w/spark/spark/python/pyspark/pandas/base.py", line 386, in __rmod__
return self._dtype_op.rmod(self, other)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/__w/spark/spark/python/pyspark/pandas/data_type_ops/num_ops.py", line 177, in rmod
return column_op(safe_rmod)(left, right)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/__w/spark/spark/python/pyspark/pandas/base.py", line 222, in wrapper
scol = f(
^^
https://github.com/apache/spark/actions/runs/15987607479/job/45094971366
Let me revert it for now.
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 rmod with ANSI enabled
Why are the changes needed?
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.