Skip to content

CLN: unused code in reshape.merge #32509

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.

Sign up for GitHub

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
Mar 10, 2020
Merged

CLN: unused code in reshape.merge #32509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 10 additions & 39 deletions pandas/core/reshape/merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,21 +92,17 @@ def merge(
merge.__doc__ = _merge_doc % "\nleft : DataFrame"


def _groupby_and_merge(
by, on, left, right: "DataFrame", _merge_pieces, check_duplicates: bool = True
):
def _groupby_and_merge(by, on, left: "DataFrame", right: "DataFrame", merge_pieces):
"""
groupby & merge; we are always performing a left-by type operation

Parameters
----------
by: field to group
on: duplicates field
left: left frame
right: right frame
_merge_pieces: function for merging
check_duplicates: bool, default True
should we check & clean duplicates
left: DataFrame
right: DataFrame
merge_pieces: function for merging
"""
pieces = []
if not isinstance(by, (list, tuple)):
Expand All @@ -118,18 +114,6 @@ def _groupby_and_merge(
# if we can groupby the rhs
# then we can get vastly better perf

# we will check & remove duplicates if indicated
if check_duplicates:
if on is None:
on = []
elif not isinstance(on, (list, tuple)):
on = [on]

if right.duplicated(by + on).any():
_right = right.drop_duplicates(by + on, keep="last")
# TODO: use overload to refine return type of drop_duplicates
assert _right is not None # needed for mypy
right = _right
try:
rby = right.groupby(by, sort=False)
except KeyError:
Expand All @@ -151,16 +135,13 @@ def _groupby_and_merge(
pieces.append(merged)
continue

merged = _merge_pieces(lhs, rhs)
merged = merge_pieces(lhs, rhs)

# make sure join keys are in the merged
# TODO, should _merge_pieces do this?
# TODO, should merge_pieces do this?
for k in by:
try:
if k in merged:
merged[k] = key
except KeyError:
pass
if k in merged:
merged[k] = key

pieces.append(merged)

Expand Down Expand Up @@ -287,16 +268,11 @@ def _merger(x, y):
raise ValueError("Can only group either left or right frames")
elif left_by is not None:
result, _ = _groupby_and_merge(
left_by, on, left, right, lambda x, y: _merger(x, y), check_duplicates=False
left_by, on, left, right, lambda x, y: _merger(x, y)
)
elif right_by is not None:
result, _ = _groupby_and_merge(
right_by,
on,
right,
left,
lambda x, y: _merger(y, x),
check_duplicates=False,
right_by, on, right, left, lambda x, y: _merger(y, x)
)
else:
result = _merger(left, right)
Expand Down Expand Up @@ -1605,11 +1581,6 @@ def _validate_specification(self):
if self.direction not in ["backward", "forward", "nearest"]:
raise MergeError(f"direction invalid: {self.direction}")

@property
def _asof_key(self):
""" This is our asof key, the 'on' """
return self.left_on[-1]

def _get_merge_keys(self):

# note this function has side effects
Expand Down