From fea717811b1cc7c2ac9222a178c381bb624d76f0 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 6 Jul 2024 20:46:20 -0500 Subject: [PATCH 1/2] fix pull on grouped datasets --- r/R/dplyr-collect.R | 4 ++-- r/tests/testthat/test-dplyr-query.R | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/r/R/dplyr-collect.R b/r/R/dplyr-collect.R index c3232c6ff72..4ef94a78ff3 100644 --- a/r/R/dplyr-collect.R +++ b/r/R/dplyr-collect.R @@ -64,8 +64,8 @@ pull.Dataset <- function(.data, .data <- as_adq(.data) var <- vars_pull(names(.data), !!enquo(var)) .data$selected_columns <- set_names(.data$selected_columns[var], var) - out <- dplyr::compute(.data)[[1]] - handle_pull_as_vector(out, as_vector) + out <- dplyr::compute(.data) + handle_pull_as_vector(out[[var]], as_vector) } pull.RecordBatchReader <- pull.arrow_dplyr_query <- pull.Dataset diff --git a/r/tests/testthat/test-dplyr-query.R b/r/tests/testthat/test-dplyr-query.R index bab81a463e9..7c75a84234b 100644 --- a/r/tests/testthat/test-dplyr-query.R +++ b/r/tests/testthat/test-dplyr-query.R @@ -87,6 +87,7 @@ test_that("pull", { .input %>% filter(int > 4) %>% rename(strng = chr) %>% + group_by(dbl) %>% pull(strng) %>% as.vector(), tbl From 57eb159470aa295263d50b8f6fb96bf4667f7d9e Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sun, 7 Jul 2024 08:41:39 -0500 Subject: [PATCH 2/2] Update r/R/dplyr-collect.R Co-authored-by: Neal Richardson --- r/R/dplyr-collect.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/r/R/dplyr-collect.R b/r/R/dplyr-collect.R index 4ef94a78ff3..08555cd9f3e 100644 --- a/r/R/dplyr-collect.R +++ b/r/R/dplyr-collect.R @@ -64,8 +64,8 @@ pull.Dataset <- function(.data, .data <- as_adq(.data) var <- vars_pull(names(.data), !!enquo(var)) .data$selected_columns <- set_names(.data$selected_columns[var], var) - out <- dplyr::compute(.data) - handle_pull_as_vector(out[[var]], as_vector) + out <- dplyr::compute(.data)[[var]] + handle_pull_as_vector(out, as_vector) } pull.RecordBatchReader <- pull.arrow_dplyr_query <- pull.Dataset