Skip to content

Commit

Permalink
test multi-column merge
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitry Chigarev <[email protected]>
  • Loading branch information
dchigarev committed Apr 4, 2024
1 parent 8e79122 commit af7ff88
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions modin/core/dataframe/pandas/dataframe/dataframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -3903,6 +3903,7 @@ def _compute_new_widths():
new_partitions, new_index, new_columns, new_lengths, new_widths, new_dtypes
)

@lazy_metadata_decorator(apply_axis="both")
def _apply_func_to_range_partitioning_broadcast(
self, right, func, key, new_index=None, new_columns=None, new_dtypes=None
):
Expand Down
8 changes: 4 additions & 4 deletions modin/core/storage_formats/pandas/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ def range_partitioning_merge(cls, left, right, kwargs):
on = kwargs.get("on", None)
if on is not None and not isinstance(on, list):
on = [on]
if on is None or len(on) > 1:
raise NotImplementedError(
f"Merging on multiple columns is not yet supported by range-partitioning merge: {on=}"
)
# if on is None or len(on) > 1:
# raise NotImplementedError(
# f"Merging on multiple columns is not yet supported by range-partitioning merge: {on=}"
# )

if any(col not in left.columns or col not in right.columns for col in on):
raise NotImplementedError(
Expand Down

0 comments on commit af7ff88

Please sign in to comment.