Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions python/pyspark/pandas/data_type_ops/boolean_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,10 @@ def abs(self, operand: IndexOpsLike) -> IndexOpsLike:
return operand

def eq(self, left: IndexOpsLike, right: Any) -> SeriesOrIndex:
_sanitize_list_like(right)
if isinstance(right, str):
return column_op(lambda c: F.lit(False))(left)

if is_ansi_mode_enabled(left._internal.spark_frame.sparkSession):
# Handle bool vs. non-bool numeric comparisons
left_is_bool = _is_boolean_type(left)
Expand All @@ -377,6 +381,12 @@ def eq(self, left: IndexOpsLike, right: Any) -> SeriesOrIndex:

return super().eq(left, right)

def ne(self, left: IndexOpsLike, right: Any) -> SeriesOrIndex:
_sanitize_list_like(right)
if isinstance(right, str):
return column_op(lambda c: F.lit(True))(left)
return super(BooleanOps, self).ne(left, right)

def lt(self, left: IndexOpsLike, right: Any) -> SeriesOrIndex:
_sanitize_list_like(right)
return column_op(PySparkColumn.__lt__)(left, right)
Expand Down
16 changes: 16 additions & 0 deletions python/pyspark/pandas/tests/data_type_ops/test_boolean_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -364,13 +364,21 @@ def test_eq(self):
psser, other_psser = psdf["this"], psdf["that"]
self.assert_eq(pser == other_pser, psser == other_psser)
self.assert_eq(pser == pser, psser == psser)
# SPARK-54665: Comparison between boolean Series and string literals
self.assert_eq(pser == "True", psser == "True")
self.assert_eq(pser == "False", psser == "False")
self.assert_eq(pser == "any string", psser == "any string")

def test_ne(self):
pdf, psdf = self.bool_pdf, self.bool_psdf
pser, other_pser = pdf["this"], pdf["that"]
psser, other_psser = psdf["this"], psdf["that"]
self.assert_eq(pser != other_pser, psser != other_psser)
self.assert_eq(pser != pser, psser != psser)
# SPARK-54665: Comparison between boolean Series and string literals
self.assert_eq(pser != "True", psser != "True")
self.assert_eq(pser != "False", psser != "False")
self.assert_eq(pser != "any string", psser != "any string")

def test_lt(self):
pdf, psdf = self.bool_pdf, self.bool_psdf
Expand Down Expand Up @@ -794,13 +802,21 @@ def test_eq(self):
other_pser, other_psser = pdf["that"], psdf["that"]
self.check_extension(pser == other_pser, psser == other_psser)
self.check_extension(pser == pser, psser == psser)
# SPARK-54665: Comparison between boolean Series and string literals
self.check_extension(pser == "True", psser == "True")
self.check_extension(pser == "False", psser == "False")
self.check_extension(pser == "any string", psser == "any string")

def test_ne(self):
pdf, psdf = self.boolean_pdf, self.boolean_psdf
pser, psser = pdf["this"], psdf["this"]
other_pser, other_psser = pdf["that"], psdf["that"]
self.check_extension(pser != other_pser, psser != other_psser)
self.check_extension(pser != pser, psser != psser)
# SPARK-54665: Comparison between boolean Series and string literals
self.check_extension(pser != "True", psser != "True")
self.check_extension(pser != "False", psser != "False")
self.check_extension(pser != "any string", psser != "any string")

def test_lt(self):
pdf, psdf = self.boolean_pdf, self.boolean_psdf
Expand Down