Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions r/DESCRIPTION
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ Imports:
purrr,
R6,
rlang,
stats,
tidyselect,
utils,
vctrs
Expand Down
5 changes: 5 additions & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ S3method(match_arrow,ArrowDatum)
S3method(match_arrow,default)
S3method(max,ArrowDatum)
S3method(mean,ArrowDatum)
S3method(median,ArrowDatum)
S3method(min,ArrowDatum)
S3method(names,Dataset)
S3method(names,FeatherReader)
Expand All@@ -73,6 +74,7 @@ S3method(print,array_expression)
S3method(print,arrow_dplyr_query)
S3method(print,arrow_info)
S3method(print,arrow_r_metadata)
S3method(quantile,ArrowDatum)
S3method(read_message,InputStream)
S3method(read_message,MessageReader)
S3method(read_message,default)
Expand DownExpand Up@@ -152,6 +154,7 @@ export(ParquetFileWriter)
export(ParquetVersionType)
export(ParquetWriterProperties)
export(Partitioning)
export(QuantileInterpolation)
export(RandomAccessFile)
export(ReadableFile)
export(RecordBatchFileReader)
Expand DownExpand Up@@ -308,6 +311,8 @@ importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,quantile)
Comment thread
ianmcook marked this conversation as resolved.
importFrom(tidyselect,contains)
importFrom(tidyselect,ends_with)
importFrom(tidyselect,eval_select)
Expand Down
1 change: 1 addition & 0 deletions r/R/arrow-package.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.

#' @importFrom stats quantile median
#' @importFrom R6 R6Class
#' @importFrom purrr as_mapper map map2 map_chr map_dfr map_int map_lgl keep
#' @importFrom assertthat assert_that is.string
Expand Down
43 changes: 43 additions & 0 deletions r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,49 @@ collect_arrays_from_dots <- function(dots) {
ChunkedArray$create(!!!arrays)
}

#' @export
quantile.ArrowDatum <- function(x,
probs = seq(0, 1, 0.25),
na.rm = FALSE,
type = 7,
interpolation = c("linear", "lower", "higher", "nearest", "midpoint"),
...) {
if (inherits(x, "Scalar")) x <- Array$create(x)
assert_is(probs, c("numeric", "integer"))
assert_that(length(probs) > 0)
assert_that(all(probs >= 0 & probs <= 1))
if (!na.rm && x$null_count > 0) {
stop("Missing values not allowed if 'na.rm' is FALSE", call. = FALSE)
Comment thread
ianmcook marked this conversation as resolved.
}
if (type != 7) {
stop(
"Argument `type` not supported in Arrow. To control the quantile ",
"interpolation algorithm, set argument `interpolation` to one of: ",
"\"linear\" (the default), \"lower\", \"higher\", \"nearest\", or ",
"\"midpoint\".",
call. = FALSE
)
}
interpolation <- QuantileInterpolation[[toupper(match.arg(interpolation))]]
out <- call_function("quantile", x, options = list(q = probs, interpolation = interpolation))
if (length(out) == 0) {
Comment thread
ianmcook marked this conversation as resolved.
# When there are no non-missing values in the data, the Arrow quantile
# function returns an empty Array, but for consistency with the R quantile
# function, we want an Array of NA_real_ with the same length as probs
out <- Array$create(rep(NA_real_, length(probs)))
}
out
}

#' @export
median.ArrowDatum <- function(x, na.rm = FALSE, ...) {
if (!na.rm && x$null_count > 0) {
Scalar$create(NA_real_)
} else {
Scalar$create(quantile(x, probs = 0.5, na.rm = TRUE, ...))
}
}

#' @export
unique.ArrowDatum <- function(x, incomparables = FALSE, ...) {
call_function("unique", x)
Expand Down
6 changes: 6 additions & 0 deletions r/R/enums.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,9 @@ ParquetVersionType <- enum("ParquetVersionType",
MetadataVersion <- enum("MetadataVersion",
V1 = 0L, V2 = 1L, V3 = 2L, V4 = 3L, V5 = 4L
)

#' @export
#' @rdname enums
QuantileInterpolation <- enum("QuantileInterpolation",
LINEAR = 0L, LOWER = 1L, HIGHER = 2L, NEAREST = 3L, MIDPOINT = 4L
)
5 changes: 5 additions & 0 deletions r/man/enums.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions r/src/compute.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,23 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
return out;
}

if (func_name == "quantile") {
using Options = arrow::compute::QuantileOptions;
auto out = std::make_shared<Options>(Options::Defaults());
SEXP q = options["q"];
if (!Rf_isNull(q) && TYPEOF(q) == REALSXP) {
out->q = cpp11::as_cpp<std::vector<double>>(q);
}
SEXP interpolation = options["interpolation"];
if (!Rf_isNull(interpolation) && TYPEOF(interpolation) == INTSXP &&
XLENGTH(interpolation) == 1) {
out->interpolation =
cpp11::as_cpp<enum arrow::compute::QuantileOptions::Interpolation>(
interpolation);
}
return out;
}

if (func_name == "is_in" || func_name == "index_in") {
using Options = arrow::compute::SetLookupOptions;
return std::make_shared<Options>(cpp11::as_cpp<arrow::Datum>(options["value_set"]),
Expand Down
107 changes: 107 additions & 0 deletions r/tests/testthat/test-compute-aggregate.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,113 @@ test_that("Edge cases", {
}
})

test_that("quantile.Array and quantile.ChunkedArray", {
a <- Array$create(c(0, 1, 2, 3))
ca <- ChunkedArray$create(c(0, 1), c(2, 3))
probs <- c(0.49, 0.51)
for(ad in list(a, ca)) {
for (type in c(int32(), uint64(), float64())) {
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "linear"),
Array$create(c(1.47, 1.53))
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "lower"),
Array$create(c(1, 1))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "higher"),
Array$create(c(2, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "nearest"),
Array$create(c(1, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "midpoint"),
Array$create(c(1.5, 1.5))
)
}
}
})

test_that("quantile and median NAs, edge cases, and exceptions", {
expect_equal(
quantile(Array$create(c(1, 2)), probs = c(0, 1)),
Array$create(c(1, 2))
)
expect_error(
quantile(Array$create(c(1, 2, NA))),
"Missing values not allowed if 'na.rm' is FALSE"
)
expect_equal(
quantile(Array$create(numeric(0))),
Array$create(rep(NA_real_, 5))
)
expect_equal(
quantile(Array$create(rep(NA_integer_, 3)), na.rm = TRUE),
Array$create(rep(NA_real_, 5))
)
expect_error(
median(Array$create(c(1, 2)), probs = c(.25, .75))
)
expect_equal(
median(Array$create(c(1, 2)), interpolation = "higher"),
Scalar$create(2)
)
expect_equal(
quantile(Scalar$create(0L)),
Array$create(rep(0, 5))
)
expect_equal(
median(Scalar$create(1L)),
Scalar$create(1)
)
expect_error(
quantile(Array$create(1:3), type = 9),
"not supported"
)
})

test_that("median.Array and median.ChunkedArray", {
expect_vector_equal(
median(input),
1:4
)
expect_vector_equal(
median(input),
1:5
)
expect_vector_equal(
median(input),
numeric(0)
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
})

test_that("unique.Array", {
a <- Array$create(c(1, 4, 3, 1, 1, 3, 4))
expect_equal(unique(a), Array$create(c(1, 4, 3)))
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions r/DESCRIPTION
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ Imports:
purrr,
R6,
rlang,
stats,
tidyselect,
utils,
vctrs
Expand Down
5 changes: 5 additions & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ S3method(match_arrow,ArrowDatum)
S3method(match_arrow,default)
S3method(max,ArrowDatum)
S3method(mean,ArrowDatum)
S3method(median,ArrowDatum)
S3method(min,ArrowDatum)
S3method(names,Dataset)
S3method(names,FeatherReader)
Expand All@@ -73,6 +74,7 @@ S3method(print,array_expression)
S3method(print,arrow_dplyr_query)
S3method(print,arrow_info)
S3method(print,arrow_r_metadata)
S3method(quantile,ArrowDatum)
S3method(read_message,InputStream)
S3method(read_message,MessageReader)
S3method(read_message,default)
Expand DownExpand Up@@ -152,6 +154,7 @@ export(ParquetFileWriter)
export(ParquetVersionType)
export(ParquetWriterProperties)
export(Partitioning)
export(QuantileInterpolation)
export(RandomAccessFile)
export(ReadableFile)
export(RecordBatchFileReader)
Expand DownExpand Up@@ -308,6 +311,8 @@ importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,quantile)
Comment thread
ianmcook marked this conversation as resolved.
importFrom(tidyselect,contains)
importFrom(tidyselect,ends_with)
importFrom(tidyselect,eval_select)
Expand Down
1 change: 1 addition & 0 deletions r/R/arrow-package.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.

#' @importFrom stats quantile median
#' @importFrom R6 R6Class
#' @importFrom purrr as_mapper map map2 map_chr map_dfr map_int map_lgl keep
#' @importFrom assertthat assert_that is.string
Expand Down
43 changes: 43 additions & 0 deletions r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,49 @@ collect_arrays_from_dots <- function(dots) {
ChunkedArray$create(!!!arrays)
}

#' @export
quantile.ArrowDatum <- function(x,
probs = seq(0, 1, 0.25),
na.rm = FALSE,
type = 7,
interpolation = c("linear", "lower", "higher", "nearest", "midpoint"),
...) {
if (inherits(x, "Scalar")) x <- Array$create(x)
assert_is(probs, c("numeric", "integer"))
assert_that(length(probs) > 0)
assert_that(all(probs >= 0 & probs <= 1))
if (!na.rm && x$null_count > 0) {
stop("Missing values not allowed if 'na.rm' is FALSE", call. = FALSE)
Comment thread
ianmcook marked this conversation as resolved.
}
if (type != 7) {
stop(
"Argument `type` not supported in Arrow. To control the quantile ",
"interpolation algorithm, set argument `interpolation` to one of: ",
"\"linear\" (the default), \"lower\", \"higher\", \"nearest\", or ",
"\"midpoint\".",
call. = FALSE
)
}
interpolation <- QuantileInterpolation[[toupper(match.arg(interpolation))]]
out <- call_function("quantile", x, options = list(q = probs, interpolation = interpolation))
if (length(out) == 0) {
Comment thread
ianmcook marked this conversation as resolved.
# When there are no non-missing values in the data, the Arrow quantile
# function returns an empty Array, but for consistency with the R quantile
# function, we want an Array of NA_real_ with the same length as probs
out <- Array$create(rep(NA_real_, length(probs)))
}
out
}

#' @export
median.ArrowDatum <- function(x, na.rm = FALSE, ...) {
if (!na.rm && x$null_count > 0) {
Scalar$create(NA_real_)
} else {
Scalar$create(quantile(x, probs = 0.5, na.rm = TRUE, ...))
}
}

#' @export
unique.ArrowDatum <- function(x, incomparables = FALSE, ...) {
call_function("unique", x)
Expand Down
6 changes: 6 additions & 0 deletions r/R/enums.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,9 @@ ParquetVersionType <- enum("ParquetVersionType",
MetadataVersion <- enum("MetadataVersion",
V1 = 0L, V2 = 1L, V3 = 2L, V4 = 3L, V5 = 4L
)

#' @export
#' @rdname enums
QuantileInterpolation <- enum("QuantileInterpolation",
LINEAR = 0L, LOWER = 1L, HIGHER = 2L, NEAREST = 3L, MIDPOINT = 4L
)
5 changes: 5 additions & 0 deletions r/man/enums.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions r/src/compute.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,23 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
return out;
}

if (func_name == "quantile") {
using Options = arrow::compute::QuantileOptions;
auto out = std::make_shared<Options>(Options::Defaults());
SEXP q = options["q"];
if (!Rf_isNull(q) && TYPEOF(q) == REALSXP) {
out->q = cpp11::as_cpp<std::vector<double>>(q);
}
SEXP interpolation = options["interpolation"];
if (!Rf_isNull(interpolation) && TYPEOF(interpolation) == INTSXP &&
XLENGTH(interpolation) == 1) {
out->interpolation =
cpp11::as_cpp<enum arrow::compute::QuantileOptions::Interpolation>(
interpolation);
}
return out;
}

if (func_name == "is_in" || func_name == "index_in") {
using Options = arrow::compute::SetLookupOptions;
return std::make_shared<Options>(cpp11::as_cpp<arrow::Datum>(options["value_set"]),
Expand Down
107 changes: 107 additions & 0 deletions r/tests/testthat/test-compute-aggregate.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,113 @@ test_that("Edge cases", {
}
})

test_that("quantile.Array and quantile.ChunkedArray", {
a <- Array$create(c(0, 1, 2, 3))
ca <- ChunkedArray$create(c(0, 1), c(2, 3))
probs <- c(0.49, 0.51)
for(ad in list(a, ca)) {
for (type in c(int32(), uint64(), float64())) {
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "linear"),
Array$create(c(1.47, 1.53))
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "lower"),
Array$create(c(1, 1))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "higher"),
Array$create(c(2, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "nearest"),
Array$create(c(1, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "midpoint"),
Array$create(c(1.5, 1.5))
)
}
}
})

test_that("quantile and median NAs, edge cases, and exceptions", {
expect_equal(
quantile(Array$create(c(1, 2)), probs = c(0, 1)),
Array$create(c(1, 2))
)
expect_error(
quantile(Array$create(c(1, 2, NA))),
"Missing values not allowed if 'na.rm' is FALSE"
)
expect_equal(
quantile(Array$create(numeric(0))),
Array$create(rep(NA_real_, 5))
)
expect_equal(
quantile(Array$create(rep(NA_integer_, 3)), na.rm = TRUE),
Array$create(rep(NA_real_, 5))
)
expect_error(
median(Array$create(c(1, 2)), probs = c(.25, .75))
)
expect_equal(
median(Array$create(c(1, 2)), interpolation = "higher"),
Scalar$create(2)
)
expect_equal(
quantile(Scalar$create(0L)),
Array$create(rep(0, 5))
)
expect_equal(
median(Scalar$create(1L)),
Scalar$create(1)
)
expect_error(
quantile(Array$create(1:3), type = 9),
"not supported"
)
})

test_that("median.Array and median.ChunkedArray", {
expect_vector_equal(
median(input),
1:4
)
expect_vector_equal(
median(input),
1:5
)
expect_vector_equal(
median(input),
numeric(0)
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
})

test_that("unique.Array", {
a <- Array$create(c(1, 4, 3, 1, 1, 3, 4))
expect_equal(unique(a), Array$create(c(1, 4, 3)))
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions r/DESCRIPTION
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ Imports:
purrr,
R6,
rlang,
stats,
tidyselect,
utils,
vctrs
Expand Down
5 changes: 5 additions & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ S3method(match_arrow,ArrowDatum)
S3method(match_arrow,default)
S3method(max,ArrowDatum)
S3method(mean,ArrowDatum)
S3method(median,ArrowDatum)
S3method(min,ArrowDatum)
S3method(names,Dataset)
S3method(names,FeatherReader)
Expand All@@ -73,6 +74,7 @@ S3method(print,array_expression)
S3method(print,arrow_dplyr_query)
S3method(print,arrow_info)
S3method(print,arrow_r_metadata)
S3method(quantile,ArrowDatum)
S3method(read_message,InputStream)
S3method(read_message,MessageReader)
S3method(read_message,default)
Expand DownExpand Up@@ -152,6 +154,7 @@ export(ParquetFileWriter)
export(ParquetVersionType)
export(ParquetWriterProperties)
export(Partitioning)
export(QuantileInterpolation)
export(RandomAccessFile)
export(ReadableFile)
export(RecordBatchFileReader)
Expand DownExpand Up@@ -308,6 +311,8 @@ importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,quantile)
Comment thread
ianmcook marked this conversation as resolved.
importFrom(tidyselect,contains)
importFrom(tidyselect,ends_with)
importFrom(tidyselect,eval_select)
Expand Down
1 change: 1 addition & 0 deletions r/R/arrow-package.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.

#' @importFrom stats quantile median
#' @importFrom R6 R6Class
#' @importFrom purrr as_mapper map map2 map_chr map_dfr map_int map_lgl keep
#' @importFrom assertthat assert_that is.string
Expand Down
43 changes: 43 additions & 0 deletions r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,49 @@ collect_arrays_from_dots <- function(dots) {
ChunkedArray$create(!!!arrays)
}

#' @export
quantile.ArrowDatum <- function(x,
probs = seq(0, 1, 0.25),
na.rm = FALSE,
type = 7,
interpolation = c("linear", "lower", "higher", "nearest", "midpoint"),
...) {
if (inherits(x, "Scalar")) x <- Array$create(x)
assert_is(probs, c("numeric", "integer"))
assert_that(length(probs) > 0)
assert_that(all(probs >= 0 & probs <= 1))
if (!na.rm && x$null_count > 0) {
stop("Missing values not allowed if 'na.rm' is FALSE", call. = FALSE)
Comment thread
ianmcook marked this conversation as resolved.
}
if (type != 7) {
stop(
"Argument `type` not supported in Arrow. To control the quantile ",
"interpolation algorithm, set argument `interpolation` to one of: ",
"\"linear\" (the default), \"lower\", \"higher\", \"nearest\", or ",
"\"midpoint\".",
call. = FALSE
)
}
interpolation <- QuantileInterpolation[[toupper(match.arg(interpolation))]]
out <- call_function("quantile", x, options = list(q = probs, interpolation = interpolation))
if (length(out) == 0) {
Comment thread
ianmcook marked this conversation as resolved.
# When there are no non-missing values in the data, the Arrow quantile
# function returns an empty Array, but for consistency with the R quantile
# function, we want an Array of NA_real_ with the same length as probs
out <- Array$create(rep(NA_real_, length(probs)))
}
out
}

#' @export
median.ArrowDatum <- function(x, na.rm = FALSE, ...) {
if (!na.rm && x$null_count > 0) {
Scalar$create(NA_real_)
} else {
Scalar$create(quantile(x, probs = 0.5, na.rm = TRUE, ...))
}
}

#' @export
unique.ArrowDatum <- function(x, incomparables = FALSE, ...) {
call_function("unique", x)
Expand Down
6 changes: 6 additions & 0 deletions r/R/enums.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,9 @@ ParquetVersionType <- enum("ParquetVersionType",
MetadataVersion <- enum("MetadataVersion",
V1 = 0L, V2 = 1L, V3 = 2L, V4 = 3L, V5 = 4L
)

#' @export
#' @rdname enums
QuantileInterpolation <- enum("QuantileInterpolation",
LINEAR = 0L, LOWER = 1L, HIGHER = 2L, NEAREST = 3L, MIDPOINT = 4L
)
5 changes: 5 additions & 0 deletions r/man/enums.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions r/src/compute.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,23 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
return out;
}

if (func_name == "quantile") {
using Options = arrow::compute::QuantileOptions;
auto out = std::make_shared<Options>(Options::Defaults());
SEXP q = options["q"];
if (!Rf_isNull(q) && TYPEOF(q) == REALSXP) {
out->q = cpp11::as_cpp<std::vector<double>>(q);
}
SEXP interpolation = options["interpolation"];
if (!Rf_isNull(interpolation) && TYPEOF(interpolation) == INTSXP &&
XLENGTH(interpolation) == 1) {
out->interpolation =
cpp11::as_cpp<enum arrow::compute::QuantileOptions::Interpolation>(
interpolation);
}
return out;
}

if (func_name == "is_in" || func_name == "index_in") {
using Options = arrow::compute::SetLookupOptions;
return std::make_shared<Options>(cpp11::as_cpp<arrow::Datum>(options["value_set"]),
Expand Down
107 changes: 107 additions & 0 deletions r/tests/testthat/test-compute-aggregate.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,113 @@ test_that("Edge cases", {
}
})

test_that("quantile.Array and quantile.ChunkedArray", {
a <- Array$create(c(0, 1, 2, 3))
ca <- ChunkedArray$create(c(0, 1), c(2, 3))
probs <- c(0.49, 0.51)
for(ad in list(a, ca)) {
for (type in c(int32(), uint64(), float64())) {
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "linear"),
Array$create(c(1.47, 1.53))
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "lower"),
Array$create(c(1, 1))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "higher"),
Array$create(c(2, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "nearest"),
Array$create(c(1, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "midpoint"),
Array$create(c(1.5, 1.5))
)
}
}
})

test_that("quantile and median NAs, edge cases, and exceptions", {
expect_equal(
quantile(Array$create(c(1, 2)), probs = c(0, 1)),
Array$create(c(1, 2))
)
expect_error(
quantile(Array$create(c(1, 2, NA))),
"Missing values not allowed if 'na.rm' is FALSE"
)
expect_equal(
quantile(Array$create(numeric(0))),
Array$create(rep(NA_real_, 5))
)
expect_equal(
quantile(Array$create(rep(NA_integer_, 3)), na.rm = TRUE),
Array$create(rep(NA_real_, 5))
)
expect_error(
median(Array$create(c(1, 2)), probs = c(.25, .75))
)
expect_equal(
median(Array$create(c(1, 2)), interpolation = "higher"),
Scalar$create(2)
)
expect_equal(
quantile(Scalar$create(0L)),
Array$create(rep(0, 5))
)
expect_equal(
median(Scalar$create(1L)),
Scalar$create(1)
)
expect_error(
quantile(Array$create(1:3), type = 9),
"not supported"
)
})

test_that("median.Array and median.ChunkedArray", {
expect_vector_equal(
median(input),
1:4
)
expect_vector_equal(
median(input),
1:5
)
expect_vector_equal(
median(input),
numeric(0)
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
})

test_that("unique.Array", {
a <- Array$create(c(1, 4, 3, 1, 1, 3, 4))
expect_equal(unique(a), Array$create(c(1, 4, 3)))
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions r/DESCRIPTION
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ Imports:
purrr,
R6,
rlang,
stats,
tidyselect,
utils,
vctrs
Expand Down
5 changes: 5 additions & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ S3method(match_arrow,ArrowDatum)
S3method(match_arrow,default)
S3method(max,ArrowDatum)
S3method(mean,ArrowDatum)
S3method(median,ArrowDatum)
S3method(min,ArrowDatum)
S3method(names,Dataset)
S3method(names,FeatherReader)
Expand All@@ -73,6 +74,7 @@ S3method(print,array_expression)
S3method(print,arrow_dplyr_query)
S3method(print,arrow_info)
S3method(print,arrow_r_metadata)
S3method(quantile,ArrowDatum)
S3method(read_message,InputStream)
S3method(read_message,MessageReader)
S3method(read_message,default)
Expand DownExpand Up@@ -152,6 +154,7 @@ export(ParquetFileWriter)
export(ParquetVersionType)
export(ParquetWriterProperties)
export(Partitioning)
export(QuantileInterpolation)
export(RandomAccessFile)
export(ReadableFile)
export(RecordBatchFileReader)
Expand DownExpand Up@@ -308,6 +311,8 @@ importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,quantile)
Comment thread
ianmcook marked this conversation as resolved.
importFrom(tidyselect,contains)
importFrom(tidyselect,ends_with)
importFrom(tidyselect,eval_select)
Expand Down
1 change: 1 addition & 0 deletions r/R/arrow-package.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.

#' @importFrom stats quantile median
#' @importFrom R6 R6Class
#' @importFrom purrr as_mapper map map2 map_chr map_dfr map_int map_lgl keep
#' @importFrom assertthat assert_that is.string
Expand Down
43 changes: 43 additions & 0 deletions r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,49 @@ collect_arrays_from_dots <- function(dots) {
ChunkedArray$create(!!!arrays)
}

#' @export
quantile.ArrowDatum <- function(x,
probs = seq(0, 1, 0.25),
na.rm = FALSE,
type = 7,
interpolation = c("linear", "lower", "higher", "nearest", "midpoint"),
...) {
if (inherits(x, "Scalar")) x <- Array$create(x)
assert_is(probs, c("numeric", "integer"))
assert_that(length(probs) > 0)
assert_that(all(probs >= 0 & probs <= 1))
if (!na.rm && x$null_count > 0) {
stop("Missing values not allowed if 'na.rm' is FALSE", call. = FALSE)
Comment thread
ianmcook marked this conversation as resolved.
}
if (type != 7) {
stop(
"Argument `type` not supported in Arrow. To control the quantile ",
"interpolation algorithm, set argument `interpolation` to one of: ",
"\"linear\" (the default), \"lower\", \"higher\", \"nearest\", or ",
"\"midpoint\".",
call. = FALSE
)
}
interpolation <- QuantileInterpolation[[toupper(match.arg(interpolation))]]
out <- call_function("quantile", x, options = list(q = probs, interpolation = interpolation))
if (length(out) == 0) {
Comment thread
ianmcook marked this conversation as resolved.
# When there are no non-missing values in the data, the Arrow quantile
# function returns an empty Array, but for consistency with the R quantile
# function, we want an Array of NA_real_ with the same length as probs
out <- Array$create(rep(NA_real_, length(probs)))
}
out
}

#' @export
median.ArrowDatum <- function(x, na.rm = FALSE, ...) {
if (!na.rm && x$null_count > 0) {
Scalar$create(NA_real_)
} else {
Scalar$create(quantile(x, probs = 0.5, na.rm = TRUE, ...))
}
}

#' @export
unique.ArrowDatum <- function(x, incomparables = FALSE, ...) {
call_function("unique", x)
Expand Down
6 changes: 6 additions & 0 deletions r/R/enums.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,9 @@ ParquetVersionType <- enum("ParquetVersionType",
MetadataVersion <- enum("MetadataVersion",
V1 = 0L, V2 = 1L, V3 = 2L, V4 = 3L, V5 = 4L
)

#' @export
#' @rdname enums
QuantileInterpolation <- enum("QuantileInterpolation",
LINEAR = 0L, LOWER = 1L, HIGHER = 2L, NEAREST = 3L, MIDPOINT = 4L
)
5 changes: 5 additions & 0 deletions r/man/enums.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions r/src/compute.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,23 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
return out;
}

if (func_name == "quantile") {
using Options = arrow::compute::QuantileOptions;
auto out = std::make_shared<Options>(Options::Defaults());
SEXP q = options["q"];
if (!Rf_isNull(q) && TYPEOF(q) == REALSXP) {
out->q = cpp11::as_cpp<std::vector<double>>(q);
}
SEXP interpolation = options["interpolation"];
if (!Rf_isNull(interpolation) && TYPEOF(interpolation) == INTSXP &&
XLENGTH(interpolation) == 1) {
out->interpolation =
cpp11::as_cpp<enum arrow::compute::QuantileOptions::Interpolation>(
interpolation);
}
return out;
}

if (func_name == "is_in" || func_name == "index_in") {
using Options = arrow::compute::SetLookupOptions;
return std::make_shared<Options>(cpp11::as_cpp<arrow::Datum>(options["value_set"]),
Expand Down
107 changes: 107 additions & 0 deletions r/tests/testthat/test-compute-aggregate.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,113 @@ test_that("Edge cases", {
}
})

test_that("quantile.Array and quantile.ChunkedArray", {
a <- Array$create(c(0, 1, 2, 3))
ca <- ChunkedArray$create(c(0, 1), c(2, 3))
probs <- c(0.49, 0.51)
for(ad in list(a, ca)) {
for (type in c(int32(), uint64(), float64())) {
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "linear"),
Array$create(c(1.47, 1.53))
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "lower"),
Array$create(c(1, 1))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "higher"),
Array$create(c(2, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "nearest"),
Array$create(c(1, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "midpoint"),
Array$create(c(1.5, 1.5))
)
}
}
})

test_that("quantile and median NAs, edge cases, and exceptions", {
expect_equal(
quantile(Array$create(c(1, 2)), probs = c(0, 1)),
Array$create(c(1, 2))
)
expect_error(
quantile(Array$create(c(1, 2, NA))),
"Missing values not allowed if 'na.rm' is FALSE"
)
expect_equal(
quantile(Array$create(numeric(0))),
Array$create(rep(NA_real_, 5))
)
expect_equal(
quantile(Array$create(rep(NA_integer_, 3)), na.rm = TRUE),
Array$create(rep(NA_real_, 5))
)
expect_error(
median(Array$create(c(1, 2)), probs = c(.25, .75))
)
expect_equal(
median(Array$create(c(1, 2)), interpolation = "higher"),
Scalar$create(2)
)
expect_equal(
quantile(Scalar$create(0L)),
Array$create(rep(0, 5))
)
expect_equal(
median(Scalar$create(1L)),
Scalar$create(1)
)
expect_error(
quantile(Array$create(1:3), type = 9),
"not supported"
)
})

test_that("median.Array and median.ChunkedArray", {
expect_vector_equal(
median(input),
1:4
)
expect_vector_equal(
median(input),
1:5
)
expect_vector_equal(
median(input),
numeric(0)
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
})

test_that("unique.Array", {
a <- Array$create(c(1, 4, 3, 1, 1, 3, 4))
expect_equal(unique(a), Array$create(c(1, 4, 3)))
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions r/DESCRIPTION
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ Imports:
purrr,
R6,
rlang,
stats,
tidyselect,
utils,
vctrs
Expand Down
5 changes: 5 additions & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ S3method(match_arrow,ArrowDatum)
S3method(match_arrow,default)
S3method(max,ArrowDatum)
S3method(mean,ArrowDatum)
S3method(median,ArrowDatum)
S3method(min,ArrowDatum)
S3method(names,Dataset)
S3method(names,FeatherReader)
Expand All@@ -73,6 +74,7 @@ S3method(print,array_expression)
S3method(print,arrow_dplyr_query)
S3method(print,arrow_info)
S3method(print,arrow_r_metadata)
S3method(quantile,ArrowDatum)
S3method(read_message,InputStream)
S3method(read_message,MessageReader)
S3method(read_message,default)
Expand DownExpand Up@@ -152,6 +154,7 @@ export(ParquetFileWriter)
export(ParquetVersionType)
export(ParquetWriterProperties)
export(Partitioning)
export(QuantileInterpolation)
export(RandomAccessFile)
export(ReadableFile)
export(RecordBatchFileReader)
Expand DownExpand Up@@ -308,6 +311,8 @@ importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,quantile)
Comment thread
ianmcook marked this conversation as resolved.
importFrom(tidyselect,contains)
importFrom(tidyselect,ends_with)
importFrom(tidyselect,eval_select)
Expand Down
1 change: 1 addition & 0 deletions r/R/arrow-package.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.

#' @importFrom stats quantile median
#' @importFrom R6 R6Class
#' @importFrom purrr as_mapper map map2 map_chr map_dfr map_int map_lgl keep
#' @importFrom assertthat assert_that is.string
Expand Down
43 changes: 43 additions & 0 deletions r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,49 @@ collect_arrays_from_dots <- function(dots) {
ChunkedArray$create(!!!arrays)
}

#' @export
quantile.ArrowDatum <- function(x,
probs = seq(0, 1, 0.25),
na.rm = FALSE,
type = 7,
interpolation = c("linear", "lower", "higher", "nearest", "midpoint"),
...) {
if (inherits(x, "Scalar")) x <- Array$create(x)
assert_is(probs, c("numeric", "integer"))
assert_that(length(probs) > 0)
assert_that(all(probs >= 0 & probs <= 1))
if (!na.rm && x$null_count > 0) {
stop("Missing values not allowed if 'na.rm' is FALSE", call. = FALSE)
Comment thread
ianmcook marked this conversation as resolved.
}
if (type != 7) {
stop(
"Argument `type` not supported in Arrow. To control the quantile ",
"interpolation algorithm, set argument `interpolation` to one of: ",
"\"linear\" (the default), \"lower\", \"higher\", \"nearest\", or ",
"\"midpoint\".",
call. = FALSE
)
}
interpolation <- QuantileInterpolation[[toupper(match.arg(interpolation))]]
out <- call_function("quantile", x, options = list(q = probs, interpolation = interpolation))
if (length(out) == 0) {
Comment thread
ianmcook marked this conversation as resolved.
# When there are no non-missing values in the data, the Arrow quantile
# function returns an empty Array, but for consistency with the R quantile
# function, we want an Array of NA_real_ with the same length as probs
out <- Array$create(rep(NA_real_, length(probs)))
}
out
}

#' @export
median.ArrowDatum <- function(x, na.rm = FALSE, ...) {
if (!na.rm && x$null_count > 0) {
Scalar$create(NA_real_)
} else {
Scalar$create(quantile(x, probs = 0.5, na.rm = TRUE, ...))
}
}

#' @export
unique.ArrowDatum <- function(x, incomparables = FALSE, ...) {
call_function("unique", x)
Expand Down
6 changes: 6 additions & 0 deletions r/R/enums.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,9 @@ ParquetVersionType <- enum("ParquetVersionType",
MetadataVersion <- enum("MetadataVersion",
V1 = 0L, V2 = 1L, V3 = 2L, V4 = 3L, V5 = 4L
)

#' @export
#' @rdname enums
QuantileInterpolation <- enum("QuantileInterpolation",
LINEAR = 0L, LOWER = 1L, HIGHER = 2L, NEAREST = 3L, MIDPOINT = 4L
)
5 changes: 5 additions & 0 deletions r/man/enums.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions r/src/compute.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,23 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
return out;
}

if (func_name == "quantile") {
using Options = arrow::compute::QuantileOptions;
auto out = std::make_shared<Options>(Options::Defaults());
SEXP q = options["q"];
if (!Rf_isNull(q) && TYPEOF(q) == REALSXP) {
out->q = cpp11::as_cpp<std::vector<double>>(q);
}
SEXP interpolation = options["interpolation"];
if (!Rf_isNull(interpolation) && TYPEOF(interpolation) == INTSXP &&
XLENGTH(interpolation) == 1) {
out->interpolation =
cpp11::as_cpp<enum arrow::compute::QuantileOptions::Interpolation>(
interpolation);
}
return out;
}

if (func_name == "is_in" || func_name == "index_in") {
using Options = arrow::compute::SetLookupOptions;
return std::make_shared<Options>(cpp11::as_cpp<arrow::Datum>(options["value_set"]),
Expand Down
107 changes: 107 additions & 0 deletions r/tests/testthat/test-compute-aggregate.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,113 @@ test_that("Edge cases", {
}
})

test_that("quantile.Array and quantile.ChunkedArray", {
a <- Array$create(c(0, 1, 2, 3))
ca <- ChunkedArray$create(c(0, 1), c(2, 3))
probs <- c(0.49, 0.51)
for(ad in list(a, ca)) {
for (type in c(int32(), uint64(), float64())) {
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "linear"),
Array$create(c(1.47, 1.53))
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "lower"),
Array$create(c(1, 1))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "higher"),
Array$create(c(2, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "nearest"),
Array$create(c(1, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "midpoint"),
Array$create(c(1.5, 1.5))
)
}
}
})

test_that("quantile and median NAs, edge cases, and exceptions", {
expect_equal(
quantile(Array$create(c(1, 2)), probs = c(0, 1)),
Array$create(c(1, 2))
)
expect_error(
quantile(Array$create(c(1, 2, NA))),
"Missing values not allowed if 'na.rm' is FALSE"
)
expect_equal(
quantile(Array$create(numeric(0))),
Array$create(rep(NA_real_, 5))
)
expect_equal(
quantile(Array$create(rep(NA_integer_, 3)), na.rm = TRUE),
Array$create(rep(NA_real_, 5))
)
expect_error(
median(Array$create(c(1, 2)), probs = c(.25, .75))
)
expect_equal(
median(Array$create(c(1, 2)), interpolation = "higher"),
Scalar$create(2)
)
expect_equal(
quantile(Scalar$create(0L)),
Array$create(rep(0, 5))
)
expect_equal(
median(Scalar$create(1L)),
Scalar$create(1)
)
expect_error(
quantile(Array$create(1:3), type = 9),
"not supported"
)
})

test_that("median.Array and median.ChunkedArray", {
expect_vector_equal(
median(input),
1:4
)
expect_vector_equal(
median(input),
1:5
)
expect_vector_equal(
median(input),
numeric(0)
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
})

test_that("unique.Array", {
a <- Array$create(c(1, 4, 3, 1, 1, 3, 4))
expect_equal(unique(a), Array$create(c(1, 4, 3)))
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions r/DESCRIPTION
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ Imports:
purrr,
R6,
rlang,
stats,
tidyselect,
utils,
vctrs
Expand Down
5 changes: 5 additions & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ S3method(match_arrow,ArrowDatum)
S3method(match_arrow,default)
S3method(max,ArrowDatum)
S3method(mean,ArrowDatum)
S3method(median,ArrowDatum)
S3method(min,ArrowDatum)
S3method(names,Dataset)
S3method(names,FeatherReader)
Expand All@@ -73,6 +74,7 @@ S3method(print,array_expression)
S3method(print,arrow_dplyr_query)
S3method(print,arrow_info)
S3method(print,arrow_r_metadata)
S3method(quantile,ArrowDatum)
S3method(read_message,InputStream)
S3method(read_message,MessageReader)
S3method(read_message,default)
Expand DownExpand Up@@ -152,6 +154,7 @@ export(ParquetFileWriter)
export(ParquetVersionType)
export(ParquetWriterProperties)
export(Partitioning)
export(QuantileInterpolation)
export(RandomAccessFile)
export(ReadableFile)
export(RecordBatchFileReader)
Expand DownExpand Up@@ -308,6 +311,8 @@ importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,quantile)
Comment thread
ianmcook marked this conversation as resolved.
importFrom(tidyselect,contains)
importFrom(tidyselect,ends_with)
importFrom(tidyselect,eval_select)
Expand Down
1 change: 1 addition & 0 deletions r/R/arrow-package.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.

#' @importFrom stats quantile median
#' @importFrom R6 R6Class
#' @importFrom purrr as_mapper map map2 map_chr map_dfr map_int map_lgl keep
#' @importFrom assertthat assert_that is.string
Expand Down
43 changes: 43 additions & 0 deletions r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,49 @@ collect_arrays_from_dots <- function(dots) {
ChunkedArray$create(!!!arrays)
}

#' @export
quantile.ArrowDatum <- function(x,
probs = seq(0, 1, 0.25),
na.rm = FALSE,
type = 7,
interpolation = c("linear", "lower", "higher", "nearest", "midpoint"),
...) {
if (inherits(x, "Scalar")) x <- Array$create(x)
assert_is(probs, c("numeric", "integer"))
assert_that(length(probs) > 0)
assert_that(all(probs >= 0 & probs <= 1))
if (!na.rm && x$null_count > 0) {
stop("Missing values not allowed if 'na.rm' is FALSE", call. = FALSE)
Comment thread
ianmcook marked this conversation as resolved.
}
if (type != 7) {
stop(
"Argument `type` not supported in Arrow. To control the quantile ",
"interpolation algorithm, set argument `interpolation` to one of: ",
"\"linear\" (the default), \"lower\", \"higher\", \"nearest\", or ",
"\"midpoint\".",
call. = FALSE
)
}
interpolation <- QuantileInterpolation[[toupper(match.arg(interpolation))]]
out <- call_function("quantile", x, options = list(q = probs, interpolation = interpolation))
if (length(out) == 0) {
Comment thread
ianmcook marked this conversation as resolved.
# When there are no non-missing values in the data, the Arrow quantile
# function returns an empty Array, but for consistency with the R quantile
# function, we want an Array of NA_real_ with the same length as probs
out <- Array$create(rep(NA_real_, length(probs)))
}
out
}

#' @export
median.ArrowDatum <- function(x, na.rm = FALSE, ...) {
if (!na.rm && x$null_count > 0) {
Scalar$create(NA_real_)
} else {
Scalar$create(quantile(x, probs = 0.5, na.rm = TRUE, ...))
}
}

#' @export
unique.ArrowDatum <- function(x, incomparables = FALSE, ...) {
call_function("unique", x)
Expand Down
6 changes: 6 additions & 0 deletions r/R/enums.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,9 @@ ParquetVersionType <- enum("ParquetVersionType",
MetadataVersion <- enum("MetadataVersion",
V1 = 0L, V2 = 1L, V3 = 2L, V4 = 3L, V5 = 4L
)

#' @export
#' @rdname enums
QuantileInterpolation <- enum("QuantileInterpolation",
LINEAR = 0L, LOWER = 1L, HIGHER = 2L, NEAREST = 3L, MIDPOINT = 4L
)
5 changes: 5 additions & 0 deletions r/man/enums.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions r/src/compute.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,23 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
return out;
}

if (func_name == "quantile") {
using Options = arrow::compute::QuantileOptions;
auto out = std::make_shared<Options>(Options::Defaults());
SEXP q = options["q"];
if (!Rf_isNull(q) && TYPEOF(q) == REALSXP) {
out->q = cpp11::as_cpp<std::vector<double>>(q);
}
SEXP interpolation = options["interpolation"];
if (!Rf_isNull(interpolation) && TYPEOF(interpolation) == INTSXP &&
XLENGTH(interpolation) == 1) {
out->interpolation =
cpp11::as_cpp<enum arrow::compute::QuantileOptions::Interpolation>(
interpolation);
}
return out;
}

if (func_name == "is_in" || func_name == "index_in") {
using Options = arrow::compute::SetLookupOptions;
return std::make_shared<Options>(cpp11::as_cpp<arrow::Datum>(options["value_set"]),
Expand Down
107 changes: 107 additions & 0 deletions r/tests/testthat/test-compute-aggregate.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,113 @@ test_that("Edge cases", {
}
})

test_that("quantile.Array and quantile.ChunkedArray", {
a <- Array$create(c(0, 1, 2, 3))
ca <- ChunkedArray$create(c(0, 1), c(2, 3))
probs <- c(0.49, 0.51)
for(ad in list(a, ca)) {
for (type in c(int32(), uint64(), float64())) {
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "linear"),
Array$create(c(1.47, 1.53))
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "lower"),
Array$create(c(1, 1))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "higher"),
Array$create(c(2, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "nearest"),
Array$create(c(1, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "midpoint"),
Array$create(c(1.5, 1.5))
)
}
}
})

test_that("quantile and median NAs, edge cases, and exceptions", {
expect_equal(
quantile(Array$create(c(1, 2)), probs = c(0, 1)),
Array$create(c(1, 2))
)
expect_error(
quantile(Array$create(c(1, 2, NA))),
"Missing values not allowed if 'na.rm' is FALSE"
)
expect_equal(
quantile(Array$create(numeric(0))),
Array$create(rep(NA_real_, 5))
)
expect_equal(
quantile(Array$create(rep(NA_integer_, 3)), na.rm = TRUE),
Array$create(rep(NA_real_, 5))
)
expect_error(
median(Array$create(c(1, 2)), probs = c(.25, .75))
)
expect_equal(
median(Array$create(c(1, 2)), interpolation = "higher"),
Scalar$create(2)
)
expect_equal(
quantile(Scalar$create(0L)),
Array$create(rep(0, 5))
)
expect_equal(
median(Scalar$create(1L)),
Scalar$create(1)
)
expect_error(
quantile(Array$create(1:3), type = 9),
"not supported"
)
})

test_that("median.Array and median.ChunkedArray", {
expect_vector_equal(
median(input),
1:4
)
expect_vector_equal(
median(input),
1:5
)
expect_vector_equal(
median(input),
numeric(0)
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
})

test_that("unique.Array", {
a <- Array$create(c(1, 4, 3, 1, 1, 3, 4))
expect_equal(unique(a), Array$create(c(1, 4, 3)))
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions r/DESCRIPTION
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ Imports:
purrr,
R6,
rlang,
stats,
tidyselect,
utils,
vctrs
Expand Down
5 changes: 5 additions & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ S3method(match_arrow,ArrowDatum)
S3method(match_arrow,default)
S3method(max,ArrowDatum)
S3method(mean,ArrowDatum)
S3method(median,ArrowDatum)
S3method(min,ArrowDatum)
S3method(names,Dataset)
S3method(names,FeatherReader)
Expand All@@ -73,6 +74,7 @@ S3method(print,array_expression)
S3method(print,arrow_dplyr_query)
S3method(print,arrow_info)
S3method(print,arrow_r_metadata)
S3method(quantile,ArrowDatum)
S3method(read_message,InputStream)
S3method(read_message,MessageReader)
S3method(read_message,default)
Expand DownExpand Up@@ -152,6 +154,7 @@ export(ParquetFileWriter)
export(ParquetVersionType)
export(ParquetWriterProperties)
export(Partitioning)
export(QuantileInterpolation)
export(RandomAccessFile)
export(ReadableFile)
export(RecordBatchFileReader)
Expand DownExpand Up@@ -308,6 +311,8 @@ importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,quantile)
Comment thread
ianmcook marked this conversation as resolved.
importFrom(tidyselect,contains)
importFrom(tidyselect,ends_with)
importFrom(tidyselect,eval_select)
Expand Down
1 change: 1 addition & 0 deletions r/R/arrow-package.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.

#' @importFrom stats quantile median
#' @importFrom R6 R6Class
#' @importFrom purrr as_mapper map map2 map_chr map_dfr map_int map_lgl keep
#' @importFrom assertthat assert_that is.string
Expand Down
43 changes: 43 additions & 0 deletions r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,49 @@ collect_arrays_from_dots <- function(dots) {
ChunkedArray$create(!!!arrays)
}

#' @export
quantile.ArrowDatum <- function(x,
probs = seq(0, 1, 0.25),
na.rm = FALSE,
type = 7,
interpolation = c("linear", "lower", "higher", "nearest", "midpoint"),
...) {
if (inherits(x, "Scalar")) x <- Array$create(x)
assert_is(probs, c("numeric", "integer"))
assert_that(length(probs) > 0)
assert_that(all(probs >= 0 & probs <= 1))
if (!na.rm && x$null_count > 0) {
stop("Missing values not allowed if 'na.rm' is FALSE", call. = FALSE)
Comment thread
ianmcook marked this conversation as resolved.
}
if (type != 7) {
stop(
"Argument `type` not supported in Arrow. To control the quantile ",
"interpolation algorithm, set argument `interpolation` to one of: ",
"\"linear\" (the default), \"lower\", \"higher\", \"nearest\", or ",
"\"midpoint\".",
call. = FALSE
)
}
interpolation <- QuantileInterpolation[[toupper(match.arg(interpolation))]]
out <- call_function("quantile", x, options = list(q = probs, interpolation = interpolation))
if (length(out) == 0) {
Comment thread
ianmcook marked this conversation as resolved.
# When there are no non-missing values in the data, the Arrow quantile
# function returns an empty Array, but for consistency with the R quantile
# function, we want an Array of NA_real_ with the same length as probs
out <- Array$create(rep(NA_real_, length(probs)))
}
out
}

#' @export
median.ArrowDatum <- function(x, na.rm = FALSE, ...) {
if (!na.rm && x$null_count > 0) {
Scalar$create(NA_real_)
} else {
Scalar$create(quantile(x, probs = 0.5, na.rm = TRUE, ...))
}
}

#' @export
unique.ArrowDatum <- function(x, incomparables = FALSE, ...) {
call_function("unique", x)
Expand Down
6 changes: 6 additions & 0 deletions r/R/enums.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,9 @@ ParquetVersionType <- enum("ParquetVersionType",
MetadataVersion <- enum("MetadataVersion",
V1 = 0L, V2 = 1L, V3 = 2L, V4 = 3L, V5 = 4L
)

#' @export
#' @rdname enums
QuantileInterpolation <- enum("QuantileInterpolation",
LINEAR = 0L, LOWER = 1L, HIGHER = 2L, NEAREST = 3L, MIDPOINT = 4L
)
5 changes: 5 additions & 0 deletions r/man/enums.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions r/src/compute.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,23 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
return out;
}

if (func_name == "quantile") {
using Options = arrow::compute::QuantileOptions;
auto out = std::make_shared<Options>(Options::Defaults());
SEXP q = options["q"];
if (!Rf_isNull(q) && TYPEOF(q) == REALSXP) {
out->q = cpp11::as_cpp<std::vector<double>>(q);
}
SEXP interpolation = options["interpolation"];
if (!Rf_isNull(interpolation) && TYPEOF(interpolation) == INTSXP &&
XLENGTH(interpolation) == 1) {
out->interpolation =
cpp11::as_cpp<enum arrow::compute::QuantileOptions::Interpolation>(
interpolation);
}
return out;
}

if (func_name == "is_in" || func_name == "index_in") {
using Options = arrow::compute::SetLookupOptions;
return std::make_shared<Options>(cpp11::as_cpp<arrow::Datum>(options["value_set"]),
Expand Down
107 changes: 107 additions & 0 deletions r/tests/testthat/test-compute-aggregate.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,113 @@ test_that("Edge cases", {
}
})

test_that("quantile.Array and quantile.ChunkedArray", {
a <- Array$create(c(0, 1, 2, 3))
ca <- ChunkedArray$create(c(0, 1), c(2, 3))
probs <- c(0.49, 0.51)
for(ad in list(a, ca)) {
for (type in c(int32(), uint64(), float64())) {
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "linear"),
Array$create(c(1.47, 1.53))
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "lower"),
Array$create(c(1, 1))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "higher"),
Array$create(c(2, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "nearest"),
Array$create(c(1, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "midpoint"),
Array$create(c(1.5, 1.5))
)
}
}
})

test_that("quantile and median NAs, edge cases, and exceptions", {
expect_equal(
quantile(Array$create(c(1, 2)), probs = c(0, 1)),
Array$create(c(1, 2))
)
expect_error(
quantile(Array$create(c(1, 2, NA))),
"Missing values not allowed if 'na.rm' is FALSE"
)
expect_equal(
quantile(Array$create(numeric(0))),
Array$create(rep(NA_real_, 5))
)
expect_equal(
quantile(Array$create(rep(NA_integer_, 3)), na.rm = TRUE),
Array$create(rep(NA_real_, 5))
)
expect_error(
median(Array$create(c(1, 2)), probs = c(.25, .75))
)
expect_equal(
median(Array$create(c(1, 2)), interpolation = "higher"),
Scalar$create(2)
)
expect_equal(
quantile(Scalar$create(0L)),
Array$create(rep(0, 5))
)
expect_equal(
median(Scalar$create(1L)),
Scalar$create(1)
)
expect_error(
quantile(Array$create(1:3), type = 9),
"not supported"
)
})

test_that("median.Array and median.ChunkedArray", {
expect_vector_equal(
median(input),
1:4
)
expect_vector_equal(
median(input),
1:5
)
expect_vector_equal(
median(input),
numeric(0)
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
})

test_that("unique.Array", {
a <- Array$create(c(1, 4, 3, 1, 1, 3, 4))
expect_equal(unique(a), Array$create(c(1, 4, 3)))
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions r/DESCRIPTION
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ Imports:
purrr,
R6,
rlang,
stats,
tidyselect,
utils,
vctrs
Expand Down
5 changes: 5 additions & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ S3method(match_arrow,ArrowDatum)
S3method(match_arrow,default)
S3method(max,ArrowDatum)
S3method(mean,ArrowDatum)
S3method(median,ArrowDatum)
S3method(min,ArrowDatum)
S3method(names,Dataset)
S3method(names,FeatherReader)
Expand All@@ -73,6 +74,7 @@ S3method(print,array_expression)
S3method(print,arrow_dplyr_query)
S3method(print,arrow_info)
S3method(print,arrow_r_metadata)
S3method(quantile,ArrowDatum)
S3method(read_message,InputStream)
S3method(read_message,MessageReader)
S3method(read_message,default)
Expand DownExpand Up@@ -152,6 +154,7 @@ export(ParquetFileWriter)
export(ParquetVersionType)
export(ParquetWriterProperties)
export(Partitioning)
export(QuantileInterpolation)
export(RandomAccessFile)
export(ReadableFile)
export(RecordBatchFileReader)
Expand DownExpand Up@@ -308,6 +311,8 @@ importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,quantile)
Comment thread
ianmcook marked this conversation as resolved.
importFrom(tidyselect,contains)
importFrom(tidyselect,ends_with)
importFrom(tidyselect,eval_select)
Expand Down
1 change: 1 addition & 0 deletions r/R/arrow-package.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.

#' @importFrom stats quantile median
#' @importFrom R6 R6Class
#' @importFrom purrr as_mapper map map2 map_chr map_dfr map_int map_lgl keep
#' @importFrom assertthat assert_that is.string
Expand Down
43 changes: 43 additions & 0 deletions r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,49 @@ collect_arrays_from_dots <- function(dots) {
ChunkedArray$create(!!!arrays)
}

#' @export
quantile.ArrowDatum <- function(x,
probs = seq(0, 1, 0.25),
na.rm = FALSE,
type = 7,
interpolation = c("linear", "lower", "higher", "nearest", "midpoint"),
...) {
if (inherits(x, "Scalar")) x <- Array$create(x)
assert_is(probs, c("numeric", "integer"))
assert_that(length(probs) > 0)
assert_that(all(probs >= 0 & probs <= 1))
if (!na.rm && x$null_count > 0) {
stop("Missing values not allowed if 'na.rm' is FALSE", call. = FALSE)
Comment thread
ianmcook marked this conversation as resolved.
}
if (type != 7) {
stop(
"Argument `type` not supported in Arrow. To control the quantile ",
"interpolation algorithm, set argument `interpolation` to one of: ",
"\"linear\" (the default), \"lower\", \"higher\", \"nearest\", or ",
"\"midpoint\".",
call. = FALSE
)
}
interpolation <- QuantileInterpolation[[toupper(match.arg(interpolation))]]
out <- call_function("quantile", x, options = list(q = probs, interpolation = interpolation))
if (length(out) == 0) {
Comment thread
ianmcook marked this conversation as resolved.
# When there are no non-missing values in the data, the Arrow quantile
# function returns an empty Array, but for consistency with the R quantile
# function, we want an Array of NA_real_ with the same length as probs
out <- Array$create(rep(NA_real_, length(probs)))
}
out
}

#' @export
median.ArrowDatum <- function(x, na.rm = FALSE, ...) {
if (!na.rm && x$null_count > 0) {
Scalar$create(NA_real_)
} else {
Scalar$create(quantile(x, probs = 0.5, na.rm = TRUE, ...))
}
}

#' @export
unique.ArrowDatum <- function(x, incomparables = FALSE, ...) {
call_function("unique", x)
Expand Down
6 changes: 6 additions & 0 deletions r/R/enums.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -128,3 +128,9 @@ ParquetVersionType <- enum("ParquetVersionType",
MetadataVersion <- enum("MetadataVersion",
V1 = 0L, V2 = 1L, V3 = 2L, V4 = 3L, V5 = 4L
)

#' @export
#' @rdname enums
QuantileInterpolation <- enum("QuantileInterpolation",
LINEAR = 0L, LOWER = 1L, HIGHER = 2L, NEAREST = 3L, MIDPOINT = 4L
)
5 changes: 5 additions & 0 deletions r/man/enums.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions r/src/compute.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,23 @@ std::shared_ptr<arrow::compute::FunctionOptions> make_compute_options(
return out;
}

if (func_name == "quantile") {
using Options = arrow::compute::QuantileOptions;
auto out = std::make_shared<Options>(Options::Defaults());
SEXP q = options["q"];
if (!Rf_isNull(q) && TYPEOF(q) == REALSXP) {
out->q = cpp11::as_cpp<std::vector<double>>(q);
}
SEXP interpolation = options["interpolation"];
if (!Rf_isNull(interpolation) && TYPEOF(interpolation) == INTSXP &&
XLENGTH(interpolation) == 1) {
out->interpolation =
cpp11::as_cpp<enum arrow::compute::QuantileOptions::Interpolation>(
interpolation);
}
return out;
}

if (func_name == "is_in" || func_name == "index_in") {
using Options = arrow::compute::SetLookupOptions;
return std::make_shared<Options>(cpp11::as_cpp<arrow::Datum>(options["value_set"]),
Expand Down
107 changes: 107 additions & 0 deletions r/tests/testthat/test-compute-aggregate.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,113 @@ test_that("Edge cases", {
}
})

test_that("quantile.Array and quantile.ChunkedArray", {
a <- Array$create(c(0, 1, 2, 3))
ca <- ChunkedArray$create(c(0, 1), c(2, 3))
probs <- c(0.49, 0.51)
for(ad in list(a, ca)) {
for (type in c(int32(), uint64(), float64())) {
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "linear"),
Array$create(c(1.47, 1.53))
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "lower"),
Array$create(c(1, 1))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "higher"),
Array$create(c(2, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "nearest"),
Array$create(c(1, 2))$cast(type)
)
expect_equal(
quantile(ad$cast(type), probs = probs, interpolation = "midpoint"),
Array$create(c(1.5, 1.5))
)
}
}
})

test_that("quantile and median NAs, edge cases, and exceptions", {
expect_equal(
quantile(Array$create(c(1, 2)), probs = c(0, 1)),
Array$create(c(1, 2))
)
expect_error(
quantile(Array$create(c(1, 2, NA))),
"Missing values not allowed if 'na.rm' is FALSE"
)
expect_equal(
quantile(Array$create(numeric(0))),
Array$create(rep(NA_real_, 5))
)
expect_equal(
quantile(Array$create(rep(NA_integer_, 3)), na.rm = TRUE),
Array$create(rep(NA_real_, 5))
)
expect_error(
median(Array$create(c(1, 2)), probs = c(.25, .75))
)
expect_equal(
median(Array$create(c(1, 2)), interpolation = "higher"),
Scalar$create(2)
)
expect_equal(
quantile(Scalar$create(0L)),
Array$create(rep(0, 5))
)
expect_equal(
median(Scalar$create(1L)),
Scalar$create(1)
)
expect_error(
quantile(Array$create(1:3), type = 9),
"not supported"
)
})

test_that("median.Array and median.ChunkedArray", {
expect_vector_equal(
median(input),
1:4
)
expect_vector_equal(
median(input),
1:5
)
expect_vector_equal(
median(input),
numeric(0)
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
expect_vector_equal(
median(input, na.rm = FALSE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
c(1, 2, NA)
)
expect_vector_equal(
median(input, na.rm = TRUE),
NA_real_
)
})

test_that("unique.Array", {
a <- Array$create(c(1, 4, 3, 1, 1, 3, 4))
expect_equal(unique(a), Array$create(c(1, 4, 3)))
Expand Down