Fix np.where logic in table.join #9313
Merged
Conversation
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
astrofrog
reviewed
Oct 4, 2019
astropy/table/operations.py
Outdated
| non_right_mask = ~right_mask | ||
| if np.any(right_mask): | ||
| out[out_name][right_mask] = right[right_name].take(right_out) | ||
| out[out_name] = left[left_name].take(left_out) |
Member
There was a problem hiding this comment.
Why this change? And should this not be an in-place change at least? (with [:])
Member
Author
There was a problem hiding this comment.
indeed, it should use [:]. As for the rest of the changes, I did the fix to follow the very same logic as the np.where above (the issue with that it doesn't understand Quantities for np <1.17 and astropy <4.0):
out[out_name][:] = np.where(right_mask,
left[left_name].take(left_out),
right[right_name].take(right_out))
ffb02e8 to
58b235b
Compare
Member
Author
|
(a rebase has solved the weird appveyor issue, so if we don't see it popping up elsewhere we are good) |
mhvk
approved these changes
Oct 4, 2019
Contributor
mhvk
left a comment
There was a problem hiding this comment.
This looks good with @astrofrog's comment addressed, so approving.
bsipocz
pushed a commit
that referenced
this pull request
Oct 5, 2019
Fix np.where logic in table.join
bsipocz
pushed a commit
that referenced
this pull request
Oct 5, 2019
Fix np.where logic in table.join
bsipocz
pushed a commit
that referenced
this pull request
Oct 7, 2019
Fix np.where logic in table.join
bsipocz
pushed a commit
that referenced
this pull request
Oct 7, 2019
Fix np.where logic in table.join
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This regression was unearthed while doing #9287, and thus be opened as a separate PR to be able to backport the fix.