Skip to content

Commit bbf1849

Browse files
committed
BUG: Ignore division by 0 when merging empty dataframes (#17776)
1 parent 5c0b20a commit bbf1849

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

pandas/core/reshape/merge.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1525,7 +1525,8 @@ def _get_join_keys(llab, rlab, shape, sort):
15251525
rkey = stride * rlab[0].astype('i8', subok=False, copy=False)
15261526

15271527
for i in range(1, nlev):
1528-
stride //= shape[i]
1528+
with np.errstate(divide='ignore'):
1529+
stride //= shape[i]
15291530
lkey += llab[i] * stride
15301531
rkey += rlab[i] * stride
15311532

pandas/tests/reshape/test_merge.py

+6
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,12 @@ def test_validation(self):
861861
result = merge(left, right, on=['a', 'b'], validate='1:1')
862862
assert_frame_equal(result, expected_multi)
863863

864+
def test_merge_two_empty_df_no_division_error(self):
865+
# GH17776, PR #17846
866+
a = pd.DataFrame({'a': [], 'b': [], 'c': []})
867+
with np.errstate(divide='raise'):
868+
merge(a, a, on=('a', 'b'))
869+
864870

865871
def _check_merge(x, y):
866872
for how in ['inner', 'left', 'outer']:

0 commit comments

Comments
 (0)