Skip to content

ARROW-13820: [R] Rename na.min_count to min_count and na.rm to skip_nulls #11079

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

Closed
nealrichardson wants to merge 2 commits into from
+18 −22
Closed

ARROW-13820: [R] Rename na.min_count to min_count and na.rm to skip_nulls #11079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc9f6ef
Rename na.rm, na.min_count in options; wire up na.rm in var and sd
nealrichardson Sep 3, 2021
5c1f0a0
Update r/R/compute.R
nealrichardson Sep 8, 2021
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
4 changes: 2 additions & 2 deletions r/R/compute.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,15 @@ max.ArrowDatum <- function(..., na.rm = FALSE) {
scalar_aggregate("min_max", ..., na.rm = na.rm)$GetFieldByName("max")
}

scalar_aggregate <- function(FUN, ..., na.rm = FALSE, na.min_count = 0) {
scalar_aggregate <- function(FUN, ..., na.rm = FALSE, min_count = 0L) {
a <- collect_arrays_from_dots(list(...))
if (FUN == "min_max" && na.rm && a$null_count == length(a)) {
Array$create(data.frame(min = Inf, max = -Inf))
# If na.rm == TRUE and all values in array are NA, R returns
# Inf/-Inf, which are type double. Since Arrow is type-stable
# and does not do that, we handle this special case here.
} else {
call_function(FUN, a, options = list(na.rm = na.rm, na.min_count = na.min_count))
call_function(FUN, a, options = list(skip_nulls = na.rm, min_count = min_count))
}
}

Expand Down
14 changes: 6 additions & 8 deletions r/R/dplyr-functions.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,44 +784,42 @@ agg_funcs$sum <- function(x, na.rm = FALSE) {
list(
fun = "sum",
data = x,
options = list(na.rm = na.rm, na.min_count = 0L)
options = list(skip_nulls = na.rm, min_count = 0L)
)
}
agg_funcs$any <- function(x, na.rm = FALSE) {
list(
fun = "any",
data = x,
options = list(na.rm = na.rm, na.min_count = 0L)
options = list(skip_nulls = na.rm, min_count = 0L)
)
}
agg_funcs$all <- function(x, na.rm = FALSE) {
list(
fun = "all",
data = x,
options = list(na.rm = na.rm, na.min_count = 0L)
options = list(skip_nulls = na.rm, min_count = 0L)
)
}
agg_funcs$mean <- function(x, na.rm = FALSE) {
list(
fun = "mean",
data = x,
options = list(na.rm = na.rm, na.min_count = 0L)
options = list(skip_nulls = na.rm, min_count = 0L)
)
}
# na.rm not currently passed in due to ARROW-13691
agg_funcs$sd <- function(x, na.rm = FALSE, ddof = 1) {
list(
fun = "stddev",
data = x,
options = list(ddof = ddof)
options = list(skip_nulls = na.rm, min_count = 0L, ddof = ddof)
)
}
# na.rm not currently passed in due to ARROW-13691
agg_funcs$var <- function(x, na.rm = FALSE, ddof = 1) {
list(
fun = "variance",
data = x,
options = list(ddof = ddof)
options = list(skip_nulls = na.rm, min_count = 0L, ddof = ddof)
)
}

Expand Down
20 changes: 10 additions & 10 deletions r/src/compute.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,11 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
func_name == "hash_all") {
using Options = arrow::compute::ScalarAggregateOptions;
auto out = std::make_shared<Options>(Options::Defaults());
if (!Rf_isNull(options["na.min_count"])) {
out->min_count = cpp11::as_cpp<int>(options["na.min_count"]);
if (!Rf_isNull(options["min_count"])) {
out->min_count = cpp11::as_cpp<int>(options["min_count"]);
}
if (!Rf_isNull(options["na.rm"])) {
out->skip_nulls = cpp11::as_cpp<bool>(options["na.rm"]);
if (!Rf_isNull(options["skip_nulls"])) {
out->skip_nulls = cpp11::as_cpp<bool>(options["skip_nulls"]);
}
return out;
}
Expand Down Expand Up @@ -225,11 +225,11 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
cpp11::as_cpp<enum arrow::compute::QuantileOptions::Interpolation>(
interpolation);
}
if (!Rf_isNull(options["na.min_count"])) {
out->min_count = cpp11::as_cpp<int64_t>(options["na.min_count"]);
if (!Rf_isNull(options["min_count"])) {
out->min_count = cpp11::as_cpp<int64_t>(options["min_count"]);
}
if (!Rf_isNull(options["na.rm"])) {
out->skip_nulls = cpp11::as_cpp<int64_t>(options["na.rm"]);
if (!Rf_isNull(options["skip_nulls"])) {
out->skip_nulls = cpp11::as_cpp<int64_t>(options["skip_nulls"]);
}
return out;
}
Expand Down Expand Up @@ -392,8 +392,8 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
if (!Rf_isNull(options["min_count"])) {
out->min_count = cpp11::as_cpp<int64_t>(options["min_count"]);
}
if (!Rf_isNull(options["na.rm"])) {
out->skip_nulls = cpp11::as_cpp<int64_t>(options["na.rm"]);
if (!Rf_isNull(options["skip_nulls"])) {
out->skip_nulls = cpp11::as_cpp<bool>(options["skip_nulls"]);
}
return out;
}
Expand Down
2 changes: 0 additions & 2 deletions r/tests/testthat/test-dplyr-summarize.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ test_that("Group by sd on dataset", {
tbl
)

skip("ARROW-13691 - na.rm not yet implemented for VarianceOptions")
expect_dplyr_equal(
input %>%
group_by(some_grouping) %>%
Expand All @@ -153,7 +152,6 @@ test_that("Group by var on dataset", {
tbl
)

skip("ARROW-13691 - na.rm not yet implemented for VarianceOptions")
expect_dplyr_equal(
input %>%
group_by(some_grouping) %>%
Expand Down