Skip to content

BUG: additional keys in groupby indices when NAs are present #38861

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
merged 6 commits into from
Jan 1, 2021
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
1 change: 1 addition & 0 deletions doc/source/whatsnew/v1.3.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ Groupby/resample/rolling
^^^^^^^^^^^^^^^^^^^^^^^^

- Bug in :meth:`SeriesGroupBy.value_counts` where unobserved categories in a grouped categorical series were not tallied (:issue:`38672`)
- Bug in :meth:`.GroupBy.indices` would contain non-existent indices when null values were present in the groupby keys (:issue:`9304`)
-

Reshaping
Expand Down
14 changes: 11 additions & 3 deletions pandas/_libs/lib.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -891,9 +891,17 @@ def indices_fast(ndarray index, const int64_t[:] labels, list keys,
if n == 0:
return result

start = 0
cur = labels[0]
for i in range(1, n):
# Start at the first non-null entry
Copy link
Contributor

Choose a reason for hiding this comment

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

I guess L891 is redundant now?

Copy link
Contributor

Choose a reason for hiding this comment

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

but its fine

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, it is, thanks. Removed.

j = 0
for j in range(0, n):
if labels[j] != -1:
break
else:
return result
cur = labels[j]
start = j

for i in range(j+1, n):
lab = labels[i]

if lab != cur:
Expand Down
3 changes: 1 addition & 2 deletions pandas/core/sorting.py
Original file line number Diff line number Diff line change
Expand Up @@ -542,8 +542,7 @@ def get_indexer_dict(

group_index = get_group_index(label_list, shape, sort=True, xnull=True)
if np.all(group_index == -1):
# When all keys are nan and dropna=True, indices_fast can't handle this
# and the return is empty anyway
# Short-circuit, lib.indices_fast will return the same
return {}
ngroups = (
((group_index.size and group_index.max()) + 1)
Expand Down
9 changes: 9 additions & 0 deletions pandas/tests/groupby/test_missing.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,12 @@ def test_min_count(func, min_count, value):
result = getattr(df.groupby("a"), func)(min_count=min_count)
expected = DataFrame({"b": [value], "c": [np.nan]}, index=Index([1], name="a"))
tm.assert_frame_equal(result, expected)


def test_indicies_with_missing():
# GH 9304
df = DataFrame({"a": [1, 1, np.nan], "b": [2, 3, 4], "c": [5, 6, 7]})
g = df.groupby(["a", "b"])
result = g.indices
expected = {(1.0, 2): np.array([0]), (1.0, 3): np.array([1])}
assert result == expected