-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
ENH: Implement cross method for Merge Operations #37864
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
Changes from 26 commits
71edcce
cc5d779
f573ca4
0acdd00
949185e
2d5ccaa
9098852
60f6b25
0601243
c46eab3
6274120
891785d
1f0a1c8
d7c1156
7c8d37a
651540e
f7cdd4d
a4d24a9
741b4b7
0ff78fc
94316f3
94b1367
77a9e23
4597642
67a67a6
f731081
4fcde78
4589651
d964ef1
a1eeaa4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -803,3 +803,15 @@ def test_join_inner_multiindex_deterministic_order(): | |
index=MultiIndex.from_tuples([(2, 1, 4, 3)], names=("b", "a", "d", "c")), | ||
) | ||
tm.assert_frame_equal(result, expected) | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can you moe to test_cross_merge (same dir) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If I understand you correctly, it is directly below the other cross tests |
||
|
||
@pytest.mark.parametrize( | ||
("input_col", "output_cols"), [("b", ["a", "b"]), ("a", ["a_x", "a_y"])] | ||
) | ||
def test_join_cross(input_col, output_cols): | ||
# GH#5401 | ||
left = DataFrame({"a": [1, 3]}) | ||
right = DataFrame({input_col: [3, 4]}) | ||
result = left.join(right, how="cross", lsuffix="_x", rsuffix="_y") | ||
expected = DataFrame({output_cols[0]: [1, 1, 3, 3], output_cols[1]: [3, 4, 3, 4]}) | ||
tm.assert_frame_equal(result, expected) |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2337,3 +2337,93 @@ def test_merge_join_cols_error_reporting_on_and_index(func, kwargs): | |
) | ||
with pytest.raises(MergeError, match=msg): | ||
getattr(pd, func)(left, right, on="a", **kwargs) | ||
|
||
|
||
@pytest.mark.parametrize( | ||
("input_col", "output_cols"), [("b", ["a", "b"]), ("a", ["a_x", "a_y"])] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. sorry maybe i wasn't clear, can you make a new file called test_merge_cross.py and put these there. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Aaah ok, created the file and moved the tests |
||
) | ||
def test_merge_cross(input_col, output_cols): | ||
# GH#5401 | ||
left = DataFrame({"a": [1, 3]}) | ||
right = DataFrame({input_col: [3, 4]}) | ||
left_copy = left.copy() | ||
right_copy = right.copy() | ||
result = merge(left, right, how="cross") | ||
expected = DataFrame({output_cols[0]: [1, 1, 3, 3], output_cols[1]: [3, 4, 3, 4]}) | ||
tm.assert_frame_equal(result, expected) | ||
tm.assert_frame_equal(left, left_copy) | ||
tm.assert_frame_equal(right, right_copy) | ||
|
||
|
||
@pytest.mark.parametrize( | ||
"kwargs", | ||
jreback marked this conversation as resolved.
Show resolved
Hide resolved
|
||
[ | ||
{"left_index": True}, | ||
{"right_index": True}, | ||
{"on": "a"}, | ||
{"left_on": "a"}, | ||
{"right_on": "b"}, | ||
], | ||
) | ||
def test_merge_cross_error_reporting(kwargs): | ||
# GH#5401 | ||
left = DataFrame({"a": [1, 3]}) | ||
right = DataFrame({"b": [3, 4]}) | ||
msg = ( | ||
"Can not pass on, right_on, left_on or set right_index=True or " | ||
"left_index=True" | ||
) | ||
with pytest.raises(MergeError, match=msg): | ||
merge(left, right, how="cross", **kwargs) | ||
|
||
|
||
def test_merge_cross_mixed_dtypes(): | ||
# GH#5401 | ||
left = DataFrame(["a", "b", "c"], columns=["A"]) | ||
right = DataFrame(range(2), columns=["B"]) | ||
result = merge(left, right, how="cross") | ||
expected = DataFrame({"A": ["a", "a", "b", "b", "c", "c"], "B": [0, 1, 0, 1, 0, 1]}) | ||
tm.assert_frame_equal(result, expected) | ||
|
||
|
||
def test_merge_cross_more_than_one_column(): | ||
# GH#5401 | ||
left = DataFrame({"A": list("ab"), "B": [2, 1]}) | ||
right = DataFrame({"C": range(2), "D": range(4, 6)}) | ||
result = merge(left, right, how="cross") | ||
expected = DataFrame( | ||
{ | ||
"A": ["a", "a", "b", "b"], | ||
"B": [2, 2, 1, 1], | ||
"C": [0, 1, 0, 1], | ||
"D": [4, 5, 4, 5], | ||
} | ||
) | ||
tm.assert_frame_equal(result, expected) | ||
|
||
|
||
def test_merge_cross_null_values(nulls_fixture): | ||
# GH#5401 | ||
left = DataFrame({"a": [1, nulls_fixture]}) | ||
right = DataFrame({"b": ["a", "b"], "c": [1.0, 2.0]}) | ||
result = merge(left, right, how="cross") | ||
expected = DataFrame( | ||
{ | ||
"a": [1, 1, nulls_fixture, nulls_fixture], | ||
"b": ["a", "b", "a", "b"], | ||
"c": [1.0, 2.0, 1.0, 2.0], | ||
} | ||
) | ||
tm.assert_frame_equal(result, expected) | ||
|
||
|
||
def test_join_cross_error_reporting(): | ||
# GH#5401 | ||
left = DataFrame({"a": [1, 3]}) | ||
right = DataFrame({"a": [3, 4]}) | ||
msg = ( | ||
"Can not pass on, right_on, left_on or set right_index=True or " | ||
"left_index=True" | ||
) | ||
with pytest.raises(MergeError, match=msg): | ||
left.join(right, how="cross", on="a") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you add an example of an inner and left merge here (and put them right before this)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done, could you please check if this is similar to what you have in mind?