Skip to content

Use dispatch_to_series where possible #22572

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 1 commit into from
Sep 5, 2018

Conversation

jbrockmendel
Copy link
Member

Broken off from #22534, since that ended up surfacing a bug elsewhere.

@codecov
Copy link

codecov bot commented Sep 1, 2018

Codecov Report

Merging #22572 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #22572      +/-   ##
==========================================
+ Coverage   92.04%   92.04%   +<.01%     
==========================================
  Files         169      169              
  Lines       50787    50787              
==========================================
+ Hits        46745    46746       +1     
+ Misses       4042     4041       -1
Flag Coverage Δ
#multiple 90.45% <100%> (ø) ⬆️
#single 42.3% <40%> (ø) ⬆️
Impacted Files Coverage Δ
pandas/core/ops.py 96.9% <100%> (+0.14%) ⬆️
pandas/core/frame.py 97.2% <100%> (-0.01%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 98fb53c...2623904. Read the comment docs.

@gfyoung gfyoung added Internals Related to non-user accessible pandas implementation Clean labels Sep 1, 2018

def _combine_match_index(self, other, func, level=None):
left, right = self.align(other, join='outer', axis=0, level=level,
copy=False)
assert left.index.equals(right.index)
Copy link
Member

Choose a reason for hiding this comment

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

Why do we need these assert statements? Are they tested anywhere?

Copy link
Member Author

Choose a reason for hiding this comment

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

These assertions are always true. I added these so I don't have to keep looking back at core.ops (the only place from which these are called) to double-check what's going on.

Copy link
Member

Choose a reason for hiding this comment

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

So this is just a sanity check really? Perhaps we should comment that then?

Copy link
Member Author

Choose a reason for hiding this comment

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

I think the assertion is self-explanatory, but if adding a comment makes reviewers happy, there’s no real downside.

@@ -1638,6 +1638,7 @@ def dispatch_to_series(left, right, func):
"""
# Note: we use iloc to access columns for compat with cases
# with non-unique columns.
right = lib.item_from_zerodim(right)
Copy link
Contributor

Choose a reason for hiding this comment

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

is there a reason you needed to add this? (e.g. do we actually hit this in the new code path and not in the original)?

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. This PR has DataFrame._combine_const send zero-dim arrays down this path, which without this line don't get handled correctly.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok great

@jreback jreback added this to the 0.24.0 milestone Sep 4, 2018
@jreback jreback merged commit 9df21d8 into pandas-dev:master Sep 5, 2018
@jbrockmendel jbrockmendel deleted the splitops2 branch September 5, 2018 13:43
rhysparry added a commit to rhysparry/pandas that referenced this pull request Sep 5, 2018
* master:
  DOC: Update link and description of the Spyder IDE in Ecosystem docs (pandas-dev#22136)
  BUG: resample with TimedeltaIndex, fenceposts are off (pandas-dev#22488)
  Use dispatch_to_series where possible (pandas-dev#22572)
  BLD: Fix openpyxl to 2.5.5 (pandas-dev#22601)
aeltanawy pushed a commit to aeltanawy/pandas that referenced this pull request Sep 20, 2018
Sup3rGeo pushed a commit to Sup3rGeo/pandas that referenced this pull request Oct 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Clean Internals Related to non-user accessible pandas implementation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants