-
-
Notifications
You must be signed in to change notification settings - Fork 19.3k
BUG: Inconsistent behavior of Groupby with None values with filter (#… #63178
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
Open
koskampt
wants to merge
1
commit into
pandas-dev:main
Choose a base branch
from
koskampt:bug-fix-grouby-with-none-values-with-filter
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+10
−1
Open
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -650,6 +650,8 @@ def get_converter(s): | |
| return lambda key: Timestamp(key) | ||
| elif isinstance(s, np.datetime64): | ||
| return lambda key: Timestamp(key).asm8 | ||
| elif isna(s): | ||
| return lambda key: np.nan | ||
| else: | ||
| return lambda key: key | ||
|
|
||
|
|
@@ -684,11 +686,17 @@ def get_converter(s): | |
| for name in names | ||
| ) | ||
|
|
||
| elif any(isna(k) for k in self.indices.keys()): | ||
| converters = [get_converter(name) for name in names] | ||
| names = (converter(name) for converter, name in zip(converters, names)) | ||
|
|
||
| else: | ||
| converter = get_converter(index_sample) | ||
| names = (converter(name) for name in names) | ||
|
|
||
| return [self.indices.get(name, []) for name in names] | ||
| indices = {np.nan if isna(k) else k: v for k, v in self.indices.items()} | ||
|
Member
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. It seems better to do this on indices cached property directly, and only in the case where there is a NaN value with |
||
|
|
||
| return [indices.get(name, []) for name in names] | ||
|
|
||
| @final | ||
| def _get_index(self, name): | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This check is expensive - this function is only ever called currently with
namesa list of length 1, and the rest of the method is O(1) in terms ofself.indices. It's called from the inner loop ofDataFramGroupBy.fitleras we're iterating over each group. This seems avoidable.I believe we could change this function to just accept a single
name(rather than a list) and then have a special case: