Skip to content
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

Add compatibility for keywords #420

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions dask_expr/_collection.py
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,7 @@ def merge(
suffixes=("_x", "_y"),
indicator=False,
shuffle_backend=None,
**kwargs,
):
"""Merge the DataFrame with another DataFrame

Expand Down Expand Up @@ -720,6 +721,9 @@ def merge(
Shuffle backend to use if shuffling is necessary.
"""

if "shuffle" in kwargs and shuffle_backend is None:
shuffle_backend = kwargs.get("shuffle")

left = self.expr
right = (
right.expr if isinstance(right, FrameBase) else from_pandas(right, 1).expr
Expand Down Expand Up @@ -774,6 +778,7 @@ def join(
lsuffix="",
rsuffix="",
shuffle_backend=None,
**kwargs,
):
if (
not isinstance(other, list)
Expand Down Expand Up @@ -802,6 +807,7 @@ def join(
how=how,
suffixes=(lsuffix, rsuffix),
shuffle_backend=shuffle_backend,
**kwargs,
)

def __setitem__(self, key, value):
Expand Down Expand Up @@ -1315,6 +1321,7 @@ def merge(
suffixes=("_x", "_y"),
indicator=False,
shuffle_backend=None,
**kwargs,
):
return left.merge(
right,
Expand All @@ -1327,6 +1334,7 @@ def merge(
suffixes,
indicator,
shuffle_backend,
**kwargs,
)


Expand Down
Loading