Skip to content

Commit ccbf927

Browse files
committed
Rebase BUG: Ignore division by 0 when merging empty dataframes (#17776)
1 parent 3c964a4 commit ccbf927

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

pandas/core/reshape/merge.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1514,6 +1514,7 @@ def _sort_labels(uniques, left, right):
15141514

15151515

15161516
def _get_join_keys(llab, rlab, shape, sort):
1517+
np.seterr(divide='ignore')
15171518

15181519
# how many levels can be done without overflow
15191520
pred = lambda i: not is_int64_overflow_possible(shape[:i])
@@ -1525,9 +1526,11 @@ def _get_join_keys(llab, rlab, shape, sort):
15251526
rkey = stride * rlab[0].astype('i8', subok=False, copy=False)
15261527

15271528
for i in range(1, nlev):
1528-
stride //= shape[i]
1529+
with np.errstate(divide='ignore'):
1530+
stride //= shape[i]
15291531
lkey += llab[i] * stride
15301532
rkey += rlab[i] * stride
1533+
np.seterr(divide='warn')
15311534

15321535
if nlev == len(shape): # all done!
15331536
return lkey, rkey

pandas/tests/reshape/test_merge.py

+8
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,14 @@ 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+
import warnings
867+
a = pd.DataFrame({'a': [], 'b': [], 'c': []})
868+
with warnings.catch_warnings(record=True) as record:
869+
merge(a, a, on=('a', 'b'))
870+
assert len(record) == 0
871+
864872

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

0 commit comments

Comments
 (0)