Skip to content

Work around astype with columns in Pandas < 0.19.0 #7

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

Merged
cloud-fan merged 2 commits into from
Jun 22, 2017
Merged

Work around astype with columns in Pandas < 0.19.0 #7

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e903cd2
Work around astype with columns in Pandas < 0.19.0
HyukjinKwon Jun 22, 2017
6702ad1
No copy
HyukjinKwon Jun 22, 2017
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
9 changes: 6 additions & 3 deletions python/pyspark/sql/dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1725,11 +1725,14 @@ def toPandas(self):
dtype = {}
for field in self.schema:
pandas_type = _to_corrected_pandas_type(field.dataType)
if (pandas_type):
if pandas_type is not None:
dtype[field.name] = pandas_type

df = pd.DataFrame.from_records(self.collect(), columns=self.columns)
return df.astype(dtype, copy=False)
pdf = pd.DataFrame.from_records(self.collect(), columns=self.columns)

for f, t in dtype.items():
pdf[f] = pdf[f].astype(t)
Copy link

@viirya viirya Jun 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we don't need copying data?

Copy link
Author

@HyukjinKwon HyukjinKwon Jun 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doh!

return pdf

##########################################################################################
# Pandas compatibility
Expand Down