Skip to content

Commit 3597bd3

Browse files
authored
Update _collection.py
1 parent 8a32193 commit 3597bd3

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

dask_expr/_collection.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5771,7 +5771,7 @@ def merge_asof(
57715771
del kwargs["on"]
57725772

57735773
for o in [left_on, right_on]:
5774-
if isinstance(o, FrameBase):
5774+
if isinstance(o, _Frame):
57755775
raise NotImplementedError(
57765776
"Dask collections not currently allowed in merge columns"
57775777
)
@@ -6522,3 +6522,8 @@ def _compute_partition_stats(
65226522
return (mins, maxes, lens)
65236523
else:
65246524
return (non_empty_mins, non_empty_maxes, lens)
6525+
6526+
6527+
@get_parallel_type.register(FrameBase)
6528+
def get_parallel_type_frame(o):
6529+
return get_parallel_type(o._meta)

0 commit comments

Comments
 (0)