Skip to content

GH-14907: [R] right_join() function does not produce the expected outcome#15077

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.

Sign up for GitHub

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

Merged
wjones127 merged 8 commits into from
Jan 4, 2023
Merged

GH-14907: [R] right_join() function does not produce the expected outcome #15077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
785ab5f
Keep right join keys initially
thisisnic Dec 22, 2022
816a7c8
Remove for loops from tests
thisisnic Jan 3, 2023
a24c5fe
Run styler
thisisnic Jan 3, 2023
7bbfa75
Ensure join keys don't fully overlap
thisisnic Jan 3, 2023
65275ba
Try with suggestions from code review
thisisnic Jan 3, 2023
2143d45
Add !keep
thisisnic Jan 4, 2023
e79f657
Run styler
thisisnic Jan 4, 2023
f2a3083
Merge branch 'master' into right_join
thisisnic Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions r/R/dplyr-join.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,13 @@ do_join <- function(x,

# For outer joins, we need to output the join keys on both sides so we
# can coalesce them afterwards.
left_output <- names(x)
right_output <- if (keep || join_type == "FULL_OUTER") {
left_output <- if (!keep && join_type == "RIGHT_OUTER") {
setdiff(names(x), by)
} else {
names(x)
}

right_output <- if (keep || join_type %in% c("FULL_OUTER", "RIGHT_OUTER")) {
names(y)
} else {
setdiff(names(y), by)
Expand Down
100 changes: 64 additions & 36 deletions r/tests/testthat/test-dplyr-join.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ left <- example_data
left$some_grouping <- rep(c(1, 2), 5)

to_join <- tibble::tibble(
some_grouping = c(1, 2),
capital_letters = c("A", "B"),
some_grouping = c(1, 2, 3),
capital_letters = c("A", "B", "C"),
another_column = TRUE
)

Expand DownExpand Up@@ -140,42 +140,64 @@ test_that("Error handling", {
# TODO: casting: int and float columns?

test_that("right_join", {
for (keep in c(TRUE, FALSE)) {
compare_dplyr_binding(
.input %>%
right_join(to_join, by = "some_grouping", keep = !!keep) %>%
collect(),
left
)
}
compare_dplyr_binding(
.input %>%
right_join(to_join, by = "some_grouping", keep = TRUE) %>%
collect(),
left
)

compare_dplyr_binding(
.input %>%
right_join(to_join, by = "some_grouping", keep = FALSE) %>%
collect(),
left
)
})

test_that("inner_join", {
for (keep in c(TRUE, FALSE)) {
compare_dplyr_binding(
.input %>%
inner_join(to_join, by = "some_grouping", keep = !!keep) %>%
collect(),
left
)
}
compare_dplyr_binding(
.input %>%
inner_join(to_join, by = "some_grouping", keep = TRUE) %>%
collect(),
left
)

compare_dplyr_binding(
.input %>%
inner_join(to_join, by = "some_grouping", keep = FALSE) %>%
collect(),
left
)
})

test_that("full_join", {
for (keep in c(TRUE, FALSE)) {
compare_dplyr_binding(
.input %>%
full_join(to_join, by = "some_grouping", keep = !!keep) %>%
collect(),
left
)
}
compare_dplyr_binding(
.input %>%
full_join(to_join, by = "some_grouping", keep = TRUE) %>%
collect(),
left
)

compare_dplyr_binding(
.input %>%
full_join(to_join, by = "some_grouping", keep = FALSE) %>%
collect(),
left
)
})

test_that("semi_join", {
compare_dplyr_binding(
.input %>%
semi_join(to_join, by = "some_grouping") %>%
semi_join(to_join, by = "some_grouping", keep = TRUE) %>%
collect(),
left
)

compare_dplyr_binding(
.input %>%
semi_join(to_join, by = "some_grouping", keep = FALSE) %>%
collect(),
left
)
Expand DownExpand Up@@ -358,13 +380,19 @@ test_that("full joins handle keep", {
z = 6:10
)

for (keep in c(TRUE, FALSE)) {
compare_dplyr_binding(
.input %>%
full_join(full_data_df, by = c("y", "x"), keep = !!keep) %>%
arrange(index) %>%
collect(),
small_dataset_df
)
}
compare_dplyr_binding(
.input %>%
full_join(full_data_df, by = c("y", "x"), keep = TRUE) %>%
arrange(index) %>%
collect(),
small_dataset_df
)

compare_dplyr_binding(
.input %>%
full_join(full_data_df, by = c("y", "x"), keep = FALSE) %>%
arrange(index) %>%
collect(),
small_dataset_df
)
})