-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
PERF: avoid object conversion in fillna(method=pad|backfill) for masked arrays #39953
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.
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
jreback
merged 11 commits into
pandas-dev:master
from
simonjayhawkins:BaseMaskedArray.fillna
Mar 5, 2021
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
d3ae0cf
PERF: avoid object conversion in fillna(method=pad|backfill) for mask…
simonjayhawkins 0b4d283
revert rogue change
simonjayhawkins c661788
Merge remote-tracking branch 'upstream/master' into BaseMaskedArray.f…
simonjayhawkins 9024d95
always update and return mask
simonjayhawkins 8f4417b
Merge remote-tracking branch 'upstream/master' into BaseMaskedArray.f…
simonjayhawkins 5955dad
post merge fix-up
simonjayhawkins 245d99c
add dt benchmark
simonjayhawkins 9f10cf2
add td benchmark
simonjayhawkins fb26e31
add release note
simonjayhawkins bf1ecab
remove redundant copy
simonjayhawkins 6407fc8
Merge remote-tracking branch 'upstream/master' into BaseMaskedArray.f…
simonjayhawkins File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,6 +28,7 @@ | |
cache_readonly, | ||
doc, | ||
) | ||
from pandas.util._validators import validate_fillna_kwargs | ||
|
||
from pandas.core.dtypes.base import ExtensionDtype | ||
from pandas.core.dtypes.common import ( | ||
|
@@ -38,12 +39,16 @@ | |
is_string_dtype, | ||
pandas_dtype, | ||
) | ||
from pandas.core.dtypes.inference import is_array_like | ||
from pandas.core.dtypes.missing import ( | ||
isna, | ||
notna, | ||
) | ||
|
||
from pandas.core import nanops | ||
from pandas.core import ( | ||
missing, | ||
nanops, | ||
) | ||
from pandas.core.algorithms import ( | ||
factorize_array, | ||
isin, | ||
|
@@ -144,6 +149,39 @@ def __getitem__( | |
|
||
return type(self)(self._data[item], self._mask[item]) | ||
|
||
@doc(ExtensionArray.fillna) | ||
def fillna( | ||
self: BaseMaskedArrayT, value=None, method=None, limit=None | ||
) -> BaseMaskedArrayT: | ||
value, method = validate_fillna_kwargs(value, method) | ||
|
||
mask = self._mask | ||
|
||
if is_array_like(value): | ||
if len(value) != len(self): | ||
raise ValueError( | ||
f"Length of 'value' does not match. Got ({len(value)}) " | ||
f" expected {len(self)}" | ||
) | ||
value = value[mask] | ||
|
||
if mask.any(): | ||
if method is not None: | ||
func = missing.get_fill_func(method) | ||
new_values, new_mask = func( | ||
self._data.copy(), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ExtensionBlock.interpolate creates another copy L1774. if we always copy in EA.fillna then that copy shouldn't be needed. |
||
limit=limit, | ||
mask=mask.copy(), | ||
) | ||
return type(self)(new_values, new_mask.view(np.bool_)) | ||
else: | ||
# fill with value | ||
new_values = self.copy() | ||
new_values[mask] = value | ||
else: | ||
new_values = self.copy() | ||
return new_values | ||
|
||
def _coerce_to_array(self, values) -> Tuple[np.ndarray, np.ndarray]: | ||
raise AbstractMethodError(self) | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.