Skip to content

REF: de-duplicate _update_cached_objs #29548

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
merged 2 commits into from
Nov 12, 2019
Merged

REF: de-duplicate _update_cached_objs #29548

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92b50b9
REF: de-duplicate _update_cached_objs
jbrockmendel Nov 11, 2019
abf0d18
dummy to force CI
jbrockmendel Nov 11, 2019
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
46 changes: 21 additions & 25 deletions pandas/_libs/reduction.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,23 @@ cdef class _BaseGrouper:

return values, index

cdef inline _update_cached_objs(self, object cached_typ, object cached_ityp,
Slider islider, Slider vslider, object name):
if cached_typ is None:
cached_ityp = self.ityp(islider.buf)
cached_typ = self.typ(vslider.buf, index=cached_ityp, name=name)
else:
# See the comment in indexes/base.py about _index_data.
# We need this for EA-backed indexes that have a reference
# to a 1-d ndarray like datetime / timedelta / period.
object.__setattr__(cached_ityp, '_index_data', islider.buf)
cached_ityp._engine.clear_mapping()
object.__setattr__(cached_typ._data._block, 'values', vslider.buf)
object.__setattr__(cached_typ, '_index', cached_ityp)
object.__setattr__(cached_typ, 'name', name)

return cached_typ, cached_ityp


cdef class SeriesBinGrouper(_BaseGrouper):
"""
Expand Down Expand Up @@ -265,20 +282,8 @@ cdef class SeriesBinGrouper(_BaseGrouper):
islider.set_length(group_size)
vslider.set_length(group_size)

if cached_typ is None:
cached_ityp = self.ityp(islider.buf)
cached_typ = self.typ(vslider.buf, index=cached_ityp,
name=name)
else:
# See the comment in indexes/base.py about _index_data.
# We need this for EA-backed indexes that have a reference
# to a 1-d ndarray like datetime / timedelta / period.
object.__setattr__(cached_ityp, '_index_data', islider.buf)
cached_ityp._engine.clear_mapping()
object.__setattr__(
cached_typ._data._block, 'values', vslider.buf)
object.__setattr__(cached_typ, '_index', cached_ityp)
object.__setattr__(cached_typ, 'name', name)
cached_typ, cached_ityp = self._update_cached_objs(
cached_typ, cached_ityp, islider, vslider, name)

cached_ityp._engine.clear_mapping()
res = self.f(cached_typ)
Expand Down Expand Up @@ -375,17 +380,8 @@ cdef class SeriesGrouper(_BaseGrouper):
islider.set_length(group_size)
vslider.set_length(group_size)

if cached_typ is None:
cached_ityp = self.ityp(islider.buf)
cached_typ = self.typ(vslider.buf, index=cached_ityp,
name=name)
else:
object.__setattr__(cached_ityp, '_data', islider.buf)
cached_ityp._engine.clear_mapping()
object.__setattr__(
cached_typ._data._block, 'values', vslider.buf)
object.__setattr__(cached_typ, '_index', cached_ityp)
object.__setattr__(cached_typ, 'name', name)
cached_typ, cached_ityp = self._update_cached_objs(
cached_typ, cached_ityp, islider, vslider, name)

cached_ityp._engine.clear_mapping()
res = self.f(cached_typ)
Expand Down