Skip to content

Revert "[SPARK-48591][PYTHON] Simplify the if-else branches with F.lit" #46985

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

Closed
zhengruifeng wants to merge 1 commit into from
Closed

Revert "[SPARK-48591][PYTHON] Simplify the if-else branches with F.lit" #46985

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
45 changes: 25 additions & 20 deletions python/pyspark/sql/connect/column.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,13 @@
Any,
Union,
Optional,
cast,
)

from pyspark.sql.column import Column as ParentColumn
from pyspark.errors import PySparkTypeError, PySparkAttributeError, PySparkValueError
from pyspark.sql.types import DataType

import pyspark.sql.connect.proto as proto
from pyspark.sql.connect.functions import builtin as F
from pyspark.sql.connect.expressions import (
Expression,
UnresolvedFunction,
Expand Down Expand Up @@ -310,12 +308,14 @@ def when(self, condition: ParentColumn, value: Any) -> ParentColumn:
message_parameters={},
)

return Column(
CaseWhen(
branches=self._expr._branches + [(condition._expr, F.lit(value)._expr)],
else_value=None,
)
)
if isinstance(value, Column):
_value = value._expr
else:
_value = LiteralExpression._from_value(value)

_branches = self._expr._branches + [(condition._expr, _value)]

return Column(CaseWhen(branches=_branches, else_value=None))

def otherwise(self, value: Any) -> ParentColumn:
if not isinstance(self._expr, CaseWhen):
Expand All @@ -328,12 +328,12 @@ def otherwise(self, value: Any) -> ParentColumn:
"otherwise() can only be applied once on a Column previously generated by when()"
)

return Column(
CaseWhen(
branches=self._expr._branches,
else_value=cast(Expression, F.lit(value)._expr),
)
)
if isinstance(value, Column):
_value = value._expr
else:
_value = LiteralExpression._from_value(value)

return Column(CaseWhen(branches=self._expr._branches, else_value=_value))

def like(self: ParentColumn, other: str) -> ParentColumn:
return _bin_op("like", self, other)
Expand Down Expand Up @@ -457,11 +457,14 @@ def isin(self, *cols: Any) -> ParentColumn:
else:
_cols = list(cols)

return Column(
UnresolvedFunction(
"in", [self._expr] + [cast(Expression, F.lit(c)._expr) for c in _cols]
)
)
_exprs = [self._expr]
for c in _cols:
if isinstance(c, Column):
_exprs.append(c._expr)
else:
_exprs.append(LiteralExpression._from_value(c))

return Column(UnresolvedFunction("in", _exprs))

def between(
self,
Expand Down Expand Up @@ -551,8 +554,10 @@ def __getitem__(self, k: Any) -> ParentColumn:
message_parameters={},
)
return self.substr(k.start, k.stop)
elif isinstance(k, Column):
return Column(UnresolvedExtractValue(self._expr, k._expr))
else:
return Column(UnresolvedExtractValue(self._expr, cast(Expression, F.lit(k)._expr)))
return Column(UnresolvedExtractValue(self._expr, LiteralExpression._from_value(k)))

def __iter__(self) -> None:
raise PySparkTypeError(
Expand Down