From 4aa3754fe9190263b13a95bb564798b283b0cf13 Mon Sep 17 00:00:00 2001 From: Nic Crane Date: Mon, 16 Jan 2023 11:21:08 +0000 Subject: [PATCH 1/4] Fix failing semi-join tests --- r/tests/testthat/test-dplyr-join.R | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/r/tests/testthat/test-dplyr-join.R b/r/tests/testthat/test-dplyr-join.R index 3470a886b3834..9e6053cb175e1 100644 --- a/r/tests/testthat/test-dplyr-join.R +++ b/r/tests/testthat/test-dplyr-join.R @@ -240,17 +240,11 @@ test_that("full_join", { test_that("semi_join", { compare_dplyr_binding( .input %>% - semi_join(to_join, by = "some_grouping", keep = TRUE) %>% + semi_join(to_join, by = "some_grouping") %>% collect(), left ) - compare_dplyr_binding( - .input %>% - semi_join(to_join, by = "some_grouping", keep = FALSE) %>% - collect(), - left - ) }) test_that("anti_join", { From 1ba06e234fb93cae792bd7925958bcc83d51b098 Mon Sep 17 00:00:00 2001 From: Nic Crane Date: Mon, 16 Jan 2023 11:22:52 +0000 Subject: [PATCH 2/4] Remove other extraneous argument from semi_join --- r/R/dplyr-join.R | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/r/R/dplyr-join.R b/r/R/dplyr-join.R index 2ba3c307c110b..25888f6753fa2 100644 --- a/r/R/dplyr-join.R +++ b/r/R/dplyr-join.R @@ -116,9 +116,8 @@ semi_join.arrow_dplyr_query <- function(x, y, by = NULL, copy = FALSE, - suffix = c(".x", ".y"), ...) { - do_join(x, y, by, copy, suffix, ..., join_type = "LEFT_SEMI") + do_join(x, y, by, copy, ..., join_type = "LEFT_SEMI") } semi_join.Dataset <- semi_join.ArrowTabular <- semi_join.RecordBatchReader <- semi_join.arrow_dplyr_query From d8822cbfb0eaab7b1b78cbc2ee582009f0f0935d Mon Sep 17 00:00:00 2001 From: Nic Crane Date: Mon, 16 Jan 2023 11:46:06 +0000 Subject: [PATCH 3/4] Run styler --- r/tests/testthat/test-dplyr-join.R | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/r/tests/testthat/test-dplyr-join.R b/r/tests/testthat/test-dplyr-join.R index 9e6053cb175e1..2520d561cfd1b 100644 --- a/r/tests/testthat/test-dplyr-join.R +++ b/r/tests/testthat/test-dplyr-join.R @@ -82,7 +82,7 @@ test_that("left_join with join_by", { left_join( to_join %>% rename(the_grouping = some_grouping), - join_by(some_grouping == the_grouping) + join_by(some_grouping == the_grouping) ) %>% collect(), left @@ -244,7 +244,6 @@ test_that("semi_join", { collect(), left ) - }) test_that("anti_join", { From fb0e3c15bf3a63f9e04433ac047d59ebcb728a45 Mon Sep 17 00:00:00 2001 From: Nic Crane Date: Mon, 16 Jan 2023 20:44:12 +0000 Subject: [PATCH 4/4] Revert change --- r/R/dplyr-join.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/r/R/dplyr-join.R b/r/R/dplyr-join.R index 25888f6753fa2..2ba3c307c110b 100644 --- a/r/R/dplyr-join.R +++ b/r/R/dplyr-join.R @@ -116,8 +116,9 @@ semi_join.arrow_dplyr_query <- function(x, y, by = NULL, copy = FALSE, + suffix = c(".x", ".y"), ...) { - do_join(x, y, by, copy, ..., join_type = "LEFT_SEMI") + do_join(x, y, by, copy, suffix, ..., join_type = "LEFT_SEMI") } semi_join.Dataset <- semi_join.ArrowTabular <- semi_join.RecordBatchReader <- semi_join.arrow_dplyr_query