Skip to content

[SPARK-55818][PS] Decimal-float mixed arithmetic should always raise TypeError #54599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devin-petersohn wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −42
Open

[SPARK-55818][PS] Decimal-float mixed arithmetic should always raise TypeError #54599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions python/pyspark/pandas/data_type_ops/num_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ def mul(self, left: IndexOpsLike, right: Any) -> SeriesOrIndex:
raise TypeError("Multiplication can not be applied to given types.")

is_ansi = is_ansi_mode_enabled(left._internal.spark_frame.sparkSession)
if is_ansi and _is_decimal_float_mixed(left, right):
if _is_decimal_float_mixed(left, right):
raise TypeError("Multiplication can not be applied to given types.")
new_right = transform_boolean_operand_to_numeric(right, spark_type=left.spark.data_type)

Expand All @@ -474,8 +474,7 @@ def wrapped_mul(lc: PySparkColumn, rc: Any) -> PySparkColumn:
return column_op(wrapped_mul)(left, new_right)

def mod(self, left: IndexOpsLike, right: Any) -> SeriesOrIndex:
is_ansi = is_ansi_mode_enabled(left._internal.spark_frame.sparkSession)
if is_ansi and _is_decimal_float_mixed(left, right):
if _is_decimal_float_mixed(left, right):
raise TypeError("Modulo can not be applied to given types.")

return super().mod(left, right)
Expand All @@ -485,7 +484,7 @@ def truediv(self, left: IndexOpsLike, right: Any) -> SeriesOrIndex:
if not is_valid_operand_for_numeric_arithmetic(right):
raise TypeError("True division can not be applied to given types.")
is_ansi = is_ansi_mode_enabled(left._internal.spark_frame.sparkSession)
if is_ansi and _is_decimal_float_mixed(left, right):
if _is_decimal_float_mixed(left, right):
raise TypeError("True division can not be applied to given types.")
new_right = transform_boolean_operand_to_numeric(right, spark_type=left.spark.data_type)
left_dtype = left.dtype
Expand Down Expand Up @@ -516,7 +515,7 @@ def floordiv(self, left: IndexOpsLike, right: Any) -> SeriesOrIndex:
if not is_valid_operand_for_numeric_arithmetic(right):
raise TypeError("Floor division can not be applied to given types.")
is_ansi = is_ansi_mode_enabled(left._internal.spark_frame.sparkSession)
if is_ansi and _is_decimal_float_mixed(left, right):
if _is_decimal_float_mixed(left, right):
raise TypeError("Floor division can not be applied to given types.")
left_dtype = left.dtype

Expand Down Expand Up @@ -548,8 +547,7 @@ def rtruediv(self, left: IndexOpsLike, right: Any) -> SeriesOrIndex:
if not isinstance(right, numbers.Number):
raise TypeError("True division can not be applied to given types.")

is_ansi = is_ansi_mode_enabled(left._internal.spark_frame.sparkSession)
if is_ansi and _is_decimal_float_mixed(left, right):
if _is_decimal_float_mixed(left, right):
raise TypeError("True division can not be applied to given types.")

def rtruediv(left: PySparkColumn, right: Any) -> PySparkColumn:
Expand All @@ -565,8 +563,7 @@ def rfloordiv(self, left: IndexOpsLike, right: Any) -> SeriesOrIndex:
if not isinstance(right, numbers.Number):
raise TypeError("Floor division can not be applied to given types.")

is_ansi = is_ansi_mode_enabled(left._internal.spark_frame.sparkSession)
if is_ansi and _is_decimal_float_mixed(left, right):
if _is_decimal_float_mixed(left, right):
raise TypeError("Floor division can not be applied to given types.")

def rfloordiv(left: PySparkColumn, right: Any) -> PySparkColumn:
Expand All @@ -578,14 +575,12 @@ def rfloordiv(left: PySparkColumn, right: Any) -> PySparkColumn:
return numpy_column_op(rfloordiv)(left, right)

def rmul(self, left: IndexOpsLike, right: Any) -> SeriesOrIndex:
is_ansi = is_ansi_mode_enabled(left._internal.spark_frame.sparkSession)
if is_ansi and _is_decimal_float_mixed(left, right):
if _is_decimal_float_mixed(left, right):
raise TypeError("Multiplication can not be applied to given types.")
return super().rmul(left, right)

def rmod(self, left: IndexOpsLike, right: Any) -> SeriesOrIndex:
is_ansi = is_ansi_mode_enabled(left._internal.spark_frame.sparkSession)
if is_ansi and _is_decimal_float_mixed(left, right):
if _is_decimal_float_mixed(left, right):
raise TypeError("Modulo can not be applied to given types.")

return super().rmod(left, right)
Expand Down
53 changes: 24 additions & 29 deletions python/pyspark/pandas/tests/data_type_ops/test_num_mul_div.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import numpy as np

from pyspark import pandas as ps
from pyspark.testing.utils import is_ansi_mode_test
from pyspark.testing.pandasutils import PandasOnSparkTestCase
from pyspark.pandas.tests.data_type_ops.testing_utils import OpsTestBase

Expand Down Expand Up @@ -62,13 +61,12 @@ def test_mul(self):
self.assertRaises(TypeError, lambda: psser * psdf["date"])
self.assertRaises(TypeError, lambda: psser * psdf["categorical"])

if is_ansi_mode_test:
self.assertRaises(TypeError, lambda: psdf["decimal"] * psdf["float"])
self.assertRaises(TypeError, lambda: psdf["float"] * psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] * psdf["float32"])
self.assertRaises(TypeError, lambda: psdf["float32"] * psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] * 0.1)
self.assertRaises(TypeError, lambda: 0.1 * psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] * psdf["float"])
self.assertRaises(TypeError, lambda: psdf["float"] * psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] * psdf["float32"])
self.assertRaises(TypeError, lambda: psdf["float32"] * psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] * 0.1)
self.assertRaises(TypeError, lambda: 0.1 * psdf["decimal"])

def test_truediv(self):
pdf, psdf = self.pdf, self.psdf
Expand All @@ -86,13 +84,12 @@ def test_truediv(self):
else:
self.assertRaises(TypeError, lambda: psser / psdf[n_col])

if is_ansi_mode_test:
self.assertRaises(TypeError, lambda: psdf["decimal"] / psdf["float"])
self.assertRaises(TypeError, lambda: psdf["float"] / psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] / psdf["float32"])
self.assertRaises(TypeError, lambda: psdf["float32"] / psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] / 0.1)
self.assertRaises(TypeError, lambda: 0.1 / psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] / psdf["float"])
self.assertRaises(TypeError, lambda: psdf["float"] / psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] / psdf["float32"])
self.assertRaises(TypeError, lambda: psdf["float32"] / psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] / 0.1)
self.assertRaises(TypeError, lambda: 0.1 / psdf["decimal"])

def test_floordiv(self):
pdf, psdf = self.pdf, self.psdf
Expand All @@ -110,13 +107,12 @@ def test_floordiv(self):
psser = psdf[col]
self.assertRaises(TypeError, lambda: psser // psdf[n_col])

if is_ansi_mode_test:
self.assertRaises(TypeError, lambda: psdf["decimal"] // psdf["float"])
self.assertRaises(TypeError, lambda: psdf["float"] // psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] // psdf["float32"])
self.assertRaises(TypeError, lambda: psdf["float32"] // psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] // 0.1)
self.assertRaises(TypeError, lambda: 0.1 // psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] // psdf["float"])
self.assertRaises(TypeError, lambda: psdf["float"] // psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] // psdf["float32"])
self.assertRaises(TypeError, lambda: psdf["float32"] // psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] // 0.1)
self.assertRaises(TypeError, lambda: 0.1 // psdf["decimal"])

def test_mod(self):
pdf, psdf = self.pdf, self.psdf
Expand All @@ -139,13 +135,12 @@ def test_mod(self):
else:
self.assertRaises(TypeError, lambda: psser % psdf[n_col])

if is_ansi_mode_test:
self.assertRaises(TypeError, lambda: psdf["decimal"] % psdf["float"])
self.assertRaises(TypeError, lambda: psdf["float"] % psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] % psdf["float32"])
self.assertRaises(TypeError, lambda: psdf["float32"] % psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] % 0.1)
self.assertRaises(TypeError, lambda: 0.1 % psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] % psdf["float"])
self.assertRaises(TypeError, lambda: psdf["float"] % psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] % psdf["float32"])
self.assertRaises(TypeError, lambda: psdf["float32"] % psdf["decimal"])
self.assertRaises(TypeError, lambda: psdf["decimal"] % 0.1)
self.assertRaises(TypeError, lambda: 0.1 % psdf["decimal"])


class NumMulDivTests(
Expand Down