Skip to content

[SPARK-52791][PS] Fix error when inferring a UDT with a null first element #51475

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
wants to merge 3 commits into from
Closed

[SPARK-52791][PS] Fix error when inferring a UDT with a null first element #51475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
625c2ab
Check first non-null element for infer_pd_series_spark_type
petern48 Jul 14, 2025
9a7e8c0
Use notnull() mask instead of first_valid_index
petern48 Jul 22, 2025
8a3e1de
Add 'test_with_all_null'
petern48 Jul 22, 2025
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
20 changes: 20 additions & 0 deletions python/pyspark/pandas/tests/data_type_ops/test_udt_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,26 @@ def test_from_to_pandas(self):
self.assert_eq(pser, psser._to_pandas())
self.assert_eq(ps.from_pandas(pser), psser)

def test_with_first_null(self):
lst = [None, None, None, SparseVector(1, {0: 0.1})]
pser = pd.Series(lst)
psser = ps.Series(lst)
self.assert_eq(pser, psser._to_pandas())
self.assert_eq(ps.from_pandas(pser), psser)

lst2 = [SparseVector(1, {0: 0.1}), None, None, None]
pdf = pd.DataFrame({"a": lst, "b": lst2})
psdf = ps.DataFrame({"a": lst, "b": lst2})
self.assert_eq(pdf, psdf._to_pandas())
self.assert_eq(ps.from_pandas(pdf), psdf)

def test_with_all_null(self):
lst = [None, None, None, None]
pser = pd.Series(lst, dtype=object)
psser = ps.Series(lst, dtype=object)
self.assert_eq(pser, psser._to_pandas())
self.assert_eq(ps.from_pandas(pser), psser)

def test_isnull(self):
self.assert_eq(self.pser.isnull(), self.psser.isnull())

Expand Down
5 changes: 3 additions & 2 deletions python/pyspark/pandas/typedef/typehints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,9 @@ def infer_pd_series_spark_type(
if dtype == np.dtype("object"):
if len(pser) == 0 or pser.isnull().all():
return types.NullType()
elif hasattr(pser.iloc[0], "__UDT__"):
return pser.iloc[0].__UDT__
notnull = pser[pser.notnull()]
if hasattr(notnull.iloc[0], "__UDT__"):
return notnull.iloc[0].__UDT__
else:
return from_arrow_type(pa.Array.from_pandas(pser).type, prefer_timestamp_ntz)
elif isinstance(dtype, CategoricalDtype):
Expand Down