Skip to content

PERF: Fixes performance regression in DataFrame[bool_indexer] (#33924) #34199

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 28 commits into from
Jun 1, 2020
Merged

PERF: Fixes performance regression in DataFrame[bool_indexer] (#33924) #34199

Changes from 4 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c94b45e
PERF: Remove unnecessary copies in sorting functions
mproszewska May 15, 2020
4ba7472
PERF: Create array from list with given dtype=bool
mproszewska May 15, 2020
509f74a
Run black
mproszewska May 15, 2020
0ab450b
Run tests
mproszewska May 16, 2020
54c7304
Run tests
mproszewska May 16, 2020
c7de90b
Run tests
mproszewska May 16, 2020
0e75426
Fix imports
mproszewska May 16, 2020
6d72a34
Add asv
mproszewska May 22, 2020
5ba54a6
Run black
mproszewska May 22, 2020
2766270
Remove asv
mproszewska May 22, 2020
cb1312c
Add requested changes
mproszewska May 22, 2020
202f409
Merge branch 'master' into perf-bool
mproszewska May 23, 2020
74cb449
Run black
mproszewska May 23, 2020
6440281
Merge branch 'perf-bool' of https://github.com/mproszewska/pandas int…
mproszewska May 23, 2020
915dec8
Delete newline
mproszewska May 23, 2020
6925c29
Fix whatsnew
mproszewska May 23, 2020
91176ca
Merge branch 'perf'
mproszewska May 24, 2020
0734a87
Add requested changes
mproszewska May 28, 2020
2def933
Merge branch 'master' into perf-bool
mproszewska May 28, 2020
70a266c
Fix
mproszewska May 28, 2020
8bed9b5
Fix
mproszewska May 28, 2020
cfa6b9e
Fix typo
mproszewska May 28, 2020
013495d
Merge branch 'master' into perf-bool
mproszewska May 28, 2020
8707be4
Fix
mproszewska May 28, 2020
f748b78
Merge remote-tracking branch 'upstream/master'
mproszewska May 28, 2020
5b9fe28
Conflict resolve
mproszewska May 28, 2020
e0a34f8
Merge branch 'perf-bool' of https://github.com/mproszewska/pandas int…
mproszewska May 28, 2020
2ce27c8
Update asv
mproszewska May 31, 2020
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
6 changes: 5 additions & 1 deletion pandas/core/indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from pandas.util._decorators import doc

from pandas.core.dtypes.common import (
is_array_like,
is_hashable,
is_integer,
is_iterator,
Expand All @@ -22,6 +23,7 @@
from pandas.core.dtypes.missing import _infer_fill_value, isna

import pandas.core.common as com
from pandas.core.construction import array as pd_array
from pandas.core.indexers import (
check_array_indexer,
is_list_like_indexer,
Expand Down Expand Up @@ -2167,8 +2169,10 @@ def check_bool_indexer(index: Index, key) -> np.ndarray:
result = np.asarray(result, dtype=bool)
result = check_array_indexer(index, result)
else:
if not is_array_like(result):
# GH 33924
result = pd_array(result, dtype=bool)
Copy link
Member

@jbrockmendel jbrockmendel May 15, 2020

Choose a reason for hiding this comment

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

Why not just np.array?

Copy link
Contributor Author

@mproszewska mproszewska May 16, 2020

Choose a reason for hiding this comment

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

because of nullable input

Copy link
Member

@jbrockmendel jbrockmendel May 16, 2020

Choose a reason for hiding this comment

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

if the input is nullable, wouldn't not is_array_like(result) be False?

Copy link
Contributor Author

@mproszewska mproszewska May 17, 2020

Choose a reason for hiding this comment

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

I meant that this array/list can have nullable elements.

result = check_array_indexer(index, result)

return result


Expand Down