-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
BUG: avoid incorrectly inheriting result #27445
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
Closed
Closed
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -143,8 +143,12 @@ def _cython_agg_blocks(self, how, alt=None, numeric_only=True, min_count=-1): | |
new_blocks = [] | ||
new_items = [] | ||
deleted_items = [] | ||
no_result = object() | ||
for block in data.blocks: | ||
|
||
# avoid inheriting result from previous step in loop | ||
result = no_result | ||
|
||
locs = block.mgr_locs.as_array | ||
try: | ||
result, _ = self.grouper.aggregate( | ||
|
@@ -171,15 +175,16 @@ def _cython_agg_blocks(self, how, alt=None, numeric_only=True, min_count=-1): | |
except TypeError: | ||
# we may have an exception in trying to aggregate | ||
# continue and exclude the block | ||
pass | ||
deleted_items.append(locs) | ||
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. do we actually use the deleted_items? 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. yes, down on 195 |
||
continue | ||
|
||
finally: | ||
if result is not no_result: | ||
dtype = block.values.dtype | ||
|
||
dtype = block.values.dtype | ||
|
||
# see if we can cast the block back to the original dtype | ||
result = block._try_coerce_and_cast_result(result, dtype=dtype) | ||
newb = block.make_block(result) | ||
# see if we can cast the block back to the original dtype | ||
result = block._try_coerce_and_cast_result(result, dtype=dtype) | ||
newb = block.make_block(result) | ||
|
||
new_items.append(locs) | ||
new_blocks.append(newb) | ||
|
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.
why don't you just set
result = None
outside the try instead as its more clearThere 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.
because I don't know for sure that
None
won't be the correctresult
produced on line 154