Merged
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
9 changes: 8 additions & 1 deletion r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,7 @@ cast_options <- function(safe = TRUE, ...) {
#' @return `NULL`, invisibly
#' @export
#'
#' @examplesIf arrow_with_dataset()
#' @examplesIf arrow_with_dataset() && identical(Sys.getenv("NOT_CRAN"), "true")
#' library(dplyr, warn.conflicts = FALSE)
#'
#' some_model <- lm(mpg ~ disp + cyl, data = mtcars)
Expand DownExpand Up@@ -385,6 +385,13 @@ register_scalar_function <- function(name, fun, in_type, out_type,
update_cache = TRUE
)

# User-defined functions require some special handling
# in the query engine which currently require an opt-in using
# the R_ARROW_COLLECT_WITH_UDF environment variable while this
# behaviour is stabilized.
# TODO(ARROW-17178) remove the need for this!
Sys.setenv(R_ARROW_COLLECT_WITH_UDF = "true")

invisible(NULL)
}

Expand Down
9 changes: 8 additions & 1 deletion r/R/table.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -331,5 +331,12 @@ as_arrow_table.arrow_dplyr_query <- function(x, ...) {
# See query-engine.R for ExecPlan/Nodes
plan <- ExecPlan$create()
final_node <- plan$Build(x)
plan$Run(final_node, as_table = TRUE)

run_with_event_loop <- identical(
Sys.getenv("R_ARROW_COLLECT_WITH_UDF", ""),
"true"
)

result <- plan$Run(final_node, as_table = run_with_event_loop)
as_arrow_table(result)
}
2 changes: 1 addition & 1 deletion r/man/register_scalar_function.Rd

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

51 changes: 40 additions & 11 deletions r/tests/testthat/test-compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,14 +81,21 @@ test_that("arrow_scalar_function() works with auto_convert = TRUE", {

test_that("register_scalar_function() adds a compute function to the registry", {
skip_if_not(CanRunWithCapturedR())
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

register_scalar_function(
"times_32",
function(context, x) x * 32.0,
int32(), float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_true("times_32" %in% names(asNamespace("arrow")$.cache$functions))
expect_true("times_32" %in% list_compute_functions())
Expand DownExpand Up@@ -120,9 +127,11 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_array", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_array", Array$create(1L)),
Expand All@@ -135,17 +144,19 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_scalar", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_scalar", Array$create(1L)),
"Expected return Array or Scalar with type 'double'"
)
})

test_that("register_user_defined_function() can register multiple kernels", {
test_that("register_scalar_function() can register multiple kernels", {
skip_if_not(CanRunWithCapturedR())

register_scalar_function(
Expand All@@ -155,7 +166,11 @@ test_that("register_user_defined_function() can register multiple kernels", {
out_type = function(in_types) in_types[[1]],
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_equal(
call_function("times_32", Scalar$create(1L, int32())),
Expand All@@ -173,7 +188,10 @@ test_that("register_user_defined_function() can register multiple kernels", {
)
})

test_that("register_user_defined_function() errors for unsupported specifications", {
test_that("register_scalar_function() errors for unsupported specifications", {
# TODO(ARROW-17178) remove the need for this!
on.exit(Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF"))

expect_error(
register_scalar_function(
"no_kernels",
Expand DownExpand Up@@ -208,7 +226,10 @@ test_that("register_user_defined_function() errors for unsupported specification
test_that("user-defined functions work during multi-threaded execution", {
skip_if_not(CanRunWithCapturedR())
skip_if_not_available("dataset")
# Snappy has a UBSan issue: https://github.com/google/snappy/pull/148
# Skip on linux devel because:
# TODO(ARROW-17283): Snappy has a UBSan issue that is fixed in the dev version
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

n_rows <- 10000
Expand All@@ -235,7 +256,11 @@ test_that("user-defined functions work during multi-threaded execution", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

# check a regular collect()
result <- open_dataset(tf_dataset) %>%
Expand DownExpand Up@@ -268,7 +293,11 @@ test_that("user-defined error when called from an unsupported context", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

stream_plan_with_udf <- function() {
record_batch(a = 1:1000) %>%
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} 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
Merged
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
9 changes: 8 additions & 1 deletion r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,7 @@ cast_options <- function(safe = TRUE, ...) {
#' @return `NULL`, invisibly
#' @export
#'
#' @examplesIf arrow_with_dataset()
#' @examplesIf arrow_with_dataset() && identical(Sys.getenv("NOT_CRAN"), "true")
#' library(dplyr, warn.conflicts = FALSE)
#'
#' some_model <- lm(mpg ~ disp + cyl, data = mtcars)
Expand DownExpand Up@@ -385,6 +385,13 @@ register_scalar_function <- function(name, fun, in_type, out_type,
update_cache = TRUE
)

# User-defined functions require some special handling
# in the query engine which currently require an opt-in using
# the R_ARROW_COLLECT_WITH_UDF environment variable while this
# behaviour is stabilized.
# TODO(ARROW-17178) remove the need for this!
Sys.setenv(R_ARROW_COLLECT_WITH_UDF = "true")

invisible(NULL)
}

Expand Down
9 changes: 8 additions & 1 deletion r/R/table.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -331,5 +331,12 @@ as_arrow_table.arrow_dplyr_query <- function(x, ...) {
# See query-engine.R for ExecPlan/Nodes
plan <- ExecPlan$create()
final_node <- plan$Build(x)
plan$Run(final_node, as_table = TRUE)

run_with_event_loop <- identical(
Sys.getenv("R_ARROW_COLLECT_WITH_UDF", ""),
"true"
)

result <- plan$Run(final_node, as_table = run_with_event_loop)
as_arrow_table(result)
}
2 changes: 1 addition & 1 deletion r/man/register_scalar_function.Rd

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

51 changes: 40 additions & 11 deletions r/tests/testthat/test-compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,14 +81,21 @@ test_that("arrow_scalar_function() works with auto_convert = TRUE", {

test_that("register_scalar_function() adds a compute function to the registry", {
skip_if_not(CanRunWithCapturedR())
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

register_scalar_function(
"times_32",
function(context, x) x * 32.0,
int32(), float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_true("times_32" %in% names(asNamespace("arrow")$.cache$functions))
expect_true("times_32" %in% list_compute_functions())
Expand DownExpand Up@@ -120,9 +127,11 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_array", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_array", Array$create(1L)),
Expand All@@ -135,17 +144,19 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_scalar", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_scalar", Array$create(1L)),
"Expected return Array or Scalar with type 'double'"
)
})

test_that("register_user_defined_function() can register multiple kernels", {
test_that("register_scalar_function() can register multiple kernels", {
skip_if_not(CanRunWithCapturedR())

register_scalar_function(
Expand All@@ -155,7 +166,11 @@ test_that("register_user_defined_function() can register multiple kernels", {
out_type = function(in_types) in_types[[1]],
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_equal(
call_function("times_32", Scalar$create(1L, int32())),
Expand All@@ -173,7 +188,10 @@ test_that("register_user_defined_function() can register multiple kernels", {
)
})

test_that("register_user_defined_function() errors for unsupported specifications", {
test_that("register_scalar_function() errors for unsupported specifications", {
# TODO(ARROW-17178) remove the need for this!
on.exit(Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF"))

expect_error(
register_scalar_function(
"no_kernels",
Expand DownExpand Up@@ -208,7 +226,10 @@ test_that("register_user_defined_function() errors for unsupported specification
test_that("user-defined functions work during multi-threaded execution", {
skip_if_not(CanRunWithCapturedR())
skip_if_not_available("dataset")
# Snappy has a UBSan issue: https://github.com/google/snappy/pull/148
# Skip on linux devel because:
# TODO(ARROW-17283): Snappy has a UBSan issue that is fixed in the dev version
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

n_rows <- 10000
Expand All@@ -235,7 +256,11 @@ test_that("user-defined functions work during multi-threaded execution", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

# check a regular collect()
result <- open_dataset(tf_dataset) %>%
Expand DownExpand Up@@ -268,7 +293,11 @@ test_that("user-defined error when called from an unsupported context", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

stream_plan_with_udf <- function() {
record_batch(a = 1:1000) %>%
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
9 changes: 8 additions & 1 deletion r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,7 @@ cast_options <- function(safe = TRUE, ...) {
#' @return `NULL`, invisibly
#' @export
#'
#' @examplesIf arrow_with_dataset()
#' @examplesIf arrow_with_dataset() && identical(Sys.getenv("NOT_CRAN"), "true")
#' library(dplyr, warn.conflicts = FALSE)
#'
#' some_model <- lm(mpg ~ disp + cyl, data = mtcars)
Expand DownExpand Up@@ -385,6 +385,13 @@ register_scalar_function <- function(name, fun, in_type, out_type,
update_cache = TRUE
)

# User-defined functions require some special handling
# in the query engine which currently require an opt-in using
# the R_ARROW_COLLECT_WITH_UDF environment variable while this
# behaviour is stabilized.
# TODO(ARROW-17178) remove the need for this!
Sys.setenv(R_ARROW_COLLECT_WITH_UDF = "true")

invisible(NULL)
}

Expand Down
9 changes: 8 additions & 1 deletion r/R/table.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -331,5 +331,12 @@ as_arrow_table.arrow_dplyr_query <- function(x, ...) {
# See query-engine.R for ExecPlan/Nodes
plan <- ExecPlan$create()
final_node <- plan$Build(x)
plan$Run(final_node, as_table = TRUE)

run_with_event_loop <- identical(
Sys.getenv("R_ARROW_COLLECT_WITH_UDF", ""),
"true"
)

result <- plan$Run(final_node, as_table = run_with_event_loop)
as_arrow_table(result)
}
2 changes: 1 addition & 1 deletion r/man/register_scalar_function.Rd

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

51 changes: 40 additions & 11 deletions r/tests/testthat/test-compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,14 +81,21 @@ test_that("arrow_scalar_function() works with auto_convert = TRUE", {

test_that("register_scalar_function() adds a compute function to the registry", {
skip_if_not(CanRunWithCapturedR())
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

register_scalar_function(
"times_32",
function(context, x) x * 32.0,
int32(), float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_true("times_32" %in% names(asNamespace("arrow")$.cache$functions))
expect_true("times_32" %in% list_compute_functions())
Expand DownExpand Up@@ -120,9 +127,11 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_array", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_array", Array$create(1L)),
Expand All@@ -135,17 +144,19 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_scalar", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_scalar", Array$create(1L)),
"Expected return Array or Scalar with type 'double'"
)
})

test_that("register_user_defined_function() can register multiple kernels", {
test_that("register_scalar_function() can register multiple kernels", {
skip_if_not(CanRunWithCapturedR())

register_scalar_function(
Expand All@@ -155,7 +166,11 @@ test_that("register_user_defined_function() can register multiple kernels", {
out_type = function(in_types) in_types[[1]],
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_equal(
call_function("times_32", Scalar$create(1L, int32())),
Expand All@@ -173,7 +188,10 @@ test_that("register_user_defined_function() can register multiple kernels", {
)
})

test_that("register_user_defined_function() errors for unsupported specifications", {
test_that("register_scalar_function() errors for unsupported specifications", {
# TODO(ARROW-17178) remove the need for this!
on.exit(Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF"))

expect_error(
register_scalar_function(
"no_kernels",
Expand DownExpand Up@@ -208,7 +226,10 @@ test_that("register_user_defined_function() errors for unsupported specification
test_that("user-defined functions work during multi-threaded execution", {
skip_if_not(CanRunWithCapturedR())
skip_if_not_available("dataset")
# Snappy has a UBSan issue: https://github.com/google/snappy/pull/148
# Skip on linux devel because:
# TODO(ARROW-17283): Snappy has a UBSan issue that is fixed in the dev version
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

n_rows <- 10000
Expand All@@ -235,7 +256,11 @@ test_that("user-defined functions work during multi-threaded execution", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

# check a regular collect()
result <- open_dataset(tf_dataset) %>%
Expand DownExpand Up@@ -268,7 +293,11 @@ test_that("user-defined error when called from an unsupported context", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

stream_plan_with_udf <- function() {
record_batch(a = 1:1000) %>%
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
9 changes: 8 additions & 1 deletion r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,7 @@ cast_options <- function(safe = TRUE, ...) {
#' @return `NULL`, invisibly
#' @export
#'
#' @examplesIf arrow_with_dataset()
#' @examplesIf arrow_with_dataset() && identical(Sys.getenv("NOT_CRAN"), "true")
#' library(dplyr, warn.conflicts = FALSE)
#'
#' some_model <- lm(mpg ~ disp + cyl, data = mtcars)
Expand DownExpand Up@@ -385,6 +385,13 @@ register_scalar_function <- function(name, fun, in_type, out_type,
update_cache = TRUE
)

# User-defined functions require some special handling
# in the query engine which currently require an opt-in using
# the R_ARROW_COLLECT_WITH_UDF environment variable while this
# behaviour is stabilized.
# TODO(ARROW-17178) remove the need for this!
Sys.setenv(R_ARROW_COLLECT_WITH_UDF = "true")

invisible(NULL)
}

Expand Down
9 changes: 8 additions & 1 deletion r/R/table.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -331,5 +331,12 @@ as_arrow_table.arrow_dplyr_query <- function(x, ...) {
# See query-engine.R for ExecPlan/Nodes
plan <- ExecPlan$create()
final_node <- plan$Build(x)
plan$Run(final_node, as_table = TRUE)

run_with_event_loop <- identical(
Sys.getenv("R_ARROW_COLLECT_WITH_UDF", ""),
"true"
)

result <- plan$Run(final_node, as_table = run_with_event_loop)
as_arrow_table(result)
}
2 changes: 1 addition & 1 deletion r/man/register_scalar_function.Rd

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

51 changes: 40 additions & 11 deletions r/tests/testthat/test-compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,14 +81,21 @@ test_that("arrow_scalar_function() works with auto_convert = TRUE", {

test_that("register_scalar_function() adds a compute function to the registry", {
skip_if_not(CanRunWithCapturedR())
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

register_scalar_function(
"times_32",
function(context, x) x * 32.0,
int32(), float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_true("times_32" %in% names(asNamespace("arrow")$.cache$functions))
expect_true("times_32" %in% list_compute_functions())
Expand DownExpand Up@@ -120,9 +127,11 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_array", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_array", Array$create(1L)),
Expand All@@ -135,17 +144,19 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_scalar", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_scalar", Array$create(1L)),
"Expected return Array or Scalar with type 'double'"
)
})

test_that("register_user_defined_function() can register multiple kernels", {
test_that("register_scalar_function() can register multiple kernels", {
skip_if_not(CanRunWithCapturedR())

register_scalar_function(
Expand All@@ -155,7 +166,11 @@ test_that("register_user_defined_function() can register multiple kernels", {
out_type = function(in_types) in_types[[1]],
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_equal(
call_function("times_32", Scalar$create(1L, int32())),
Expand All@@ -173,7 +188,10 @@ test_that("register_user_defined_function() can register multiple kernels", {
)
})

test_that("register_user_defined_function() errors for unsupported specifications", {
test_that("register_scalar_function() errors for unsupported specifications", {
# TODO(ARROW-17178) remove the need for this!
on.exit(Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF"))

expect_error(
register_scalar_function(
"no_kernels",
Expand DownExpand Up@@ -208,7 +226,10 @@ test_that("register_user_defined_function() errors for unsupported specification
test_that("user-defined functions work during multi-threaded execution", {
skip_if_not(CanRunWithCapturedR())
skip_if_not_available("dataset")
# Snappy has a UBSan issue: https://github.com/google/snappy/pull/148
# Skip on linux devel because:
# TODO(ARROW-17283): Snappy has a UBSan issue that is fixed in the dev version
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

n_rows <- 10000
Expand All@@ -235,7 +256,11 @@ test_that("user-defined functions work during multi-threaded execution", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

# check a regular collect()
result <- open_dataset(tf_dataset) %>%
Expand DownExpand Up@@ -268,7 +293,11 @@ test_that("user-defined error when called from an unsupported context", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

stream_plan_with_udf <- function() {
record_batch(a = 1:1000) %>%
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } 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
Merged
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
9 changes: 8 additions & 1 deletion r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,7 @@ cast_options <- function(safe = TRUE, ...) {
#' @return `NULL`, invisibly
#' @export
#'
#' @examplesIf arrow_with_dataset()
#' @examplesIf arrow_with_dataset() && identical(Sys.getenv("NOT_CRAN"), "true")
#' library(dplyr, warn.conflicts = FALSE)
#'
#' some_model <- lm(mpg ~ disp + cyl, data = mtcars)
Expand DownExpand Up@@ -385,6 +385,13 @@ register_scalar_function <- function(name, fun, in_type, out_type,
update_cache = TRUE
)

# User-defined functions require some special handling
# in the query engine which currently require an opt-in using
# the R_ARROW_COLLECT_WITH_UDF environment variable while this
# behaviour is stabilized.
# TODO(ARROW-17178) remove the need for this!
Sys.setenv(R_ARROW_COLLECT_WITH_UDF = "true")

invisible(NULL)
}

Expand Down
9 changes: 8 additions & 1 deletion r/R/table.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -331,5 +331,12 @@ as_arrow_table.arrow_dplyr_query <- function(x, ...) {
# See query-engine.R for ExecPlan/Nodes
plan <- ExecPlan$create()
final_node <- plan$Build(x)
plan$Run(final_node, as_table = TRUE)

run_with_event_loop <- identical(
Sys.getenv("R_ARROW_COLLECT_WITH_UDF", ""),
"true"
)

result <- plan$Run(final_node, as_table = run_with_event_loop)
as_arrow_table(result)
}
2 changes: 1 addition & 1 deletion r/man/register_scalar_function.Rd

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

51 changes: 40 additions & 11 deletions r/tests/testthat/test-compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,14 +81,21 @@ test_that("arrow_scalar_function() works with auto_convert = TRUE", {

test_that("register_scalar_function() adds a compute function to the registry", {
skip_if_not(CanRunWithCapturedR())
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

register_scalar_function(
"times_32",
function(context, x) x * 32.0,
int32(), float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_true("times_32" %in% names(asNamespace("arrow")$.cache$functions))
expect_true("times_32" %in% list_compute_functions())
Expand DownExpand Up@@ -120,9 +127,11 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_array", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_array", Array$create(1L)),
Expand All@@ -135,17 +144,19 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_scalar", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_scalar", Array$create(1L)),
"Expected return Array or Scalar with type 'double'"
)
})

test_that("register_user_defined_function() can register multiple kernels", {
test_that("register_scalar_function() can register multiple kernels", {
skip_if_not(CanRunWithCapturedR())

register_scalar_function(
Expand All@@ -155,7 +166,11 @@ test_that("register_user_defined_function() can register multiple kernels", {
out_type = function(in_types) in_types[[1]],
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_equal(
call_function("times_32", Scalar$create(1L, int32())),
Expand All@@ -173,7 +188,10 @@ test_that("register_user_defined_function() can register multiple kernels", {
)
})

test_that("register_user_defined_function() errors for unsupported specifications", {
test_that("register_scalar_function() errors for unsupported specifications", {
# TODO(ARROW-17178) remove the need for this!
on.exit(Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF"))

expect_error(
register_scalar_function(
"no_kernels",
Expand DownExpand Up@@ -208,7 +226,10 @@ test_that("register_user_defined_function() errors for unsupported specification
test_that("user-defined functions work during multi-threaded execution", {
skip_if_not(CanRunWithCapturedR())
skip_if_not_available("dataset")
# Snappy has a UBSan issue: https://github.com/google/snappy/pull/148
# Skip on linux devel because:
# TODO(ARROW-17283): Snappy has a UBSan issue that is fixed in the dev version
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

n_rows <- 10000
Expand All@@ -235,7 +256,11 @@ test_that("user-defined functions work during multi-threaded execution", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

# check a regular collect()
result <- open_dataset(tf_dataset) %>%
Expand DownExpand Up@@ -268,7 +293,11 @@ test_that("user-defined error when called from an unsupported context", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

stream_plan_with_udf <- function() {
record_batch(a = 1:1000) %>%
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
9 changes: 8 additions & 1 deletion r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,7 @@ cast_options <- function(safe = TRUE, ...) {
#' @return `NULL`, invisibly
#' @export
#'
#' @examplesIf arrow_with_dataset()
#' @examplesIf arrow_with_dataset() && identical(Sys.getenv("NOT_CRAN"), "true")
#' library(dplyr, warn.conflicts = FALSE)
#'
#' some_model <- lm(mpg ~ disp + cyl, data = mtcars)
Expand DownExpand Up@@ -385,6 +385,13 @@ register_scalar_function <- function(name, fun, in_type, out_type,
update_cache = TRUE
)

# User-defined functions require some special handling
# in the query engine which currently require an opt-in using
# the R_ARROW_COLLECT_WITH_UDF environment variable while this
# behaviour is stabilized.
# TODO(ARROW-17178) remove the need for this!
Sys.setenv(R_ARROW_COLLECT_WITH_UDF = "true")

invisible(NULL)
}

Expand Down
9 changes: 8 additions & 1 deletion r/R/table.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -331,5 +331,12 @@ as_arrow_table.arrow_dplyr_query <- function(x, ...) {
# See query-engine.R for ExecPlan/Nodes
plan <- ExecPlan$create()
final_node <- plan$Build(x)
plan$Run(final_node, as_table = TRUE)

run_with_event_loop <- identical(
Sys.getenv("R_ARROW_COLLECT_WITH_UDF", ""),
"true"
)

result <- plan$Run(final_node, as_table = run_with_event_loop)
as_arrow_table(result)
}
2 changes: 1 addition & 1 deletion r/man/register_scalar_function.Rd

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

51 changes: 40 additions & 11 deletions r/tests/testthat/test-compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,14 +81,21 @@ test_that("arrow_scalar_function() works with auto_convert = TRUE", {

test_that("register_scalar_function() adds a compute function to the registry", {
skip_if_not(CanRunWithCapturedR())
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

register_scalar_function(
"times_32",
function(context, x) x * 32.0,
int32(), float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_true("times_32" %in% names(asNamespace("arrow")$.cache$functions))
expect_true("times_32" %in% list_compute_functions())
Expand DownExpand Up@@ -120,9 +127,11 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_array", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_array", Array$create(1L)),
Expand All@@ -135,17 +144,19 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_scalar", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_scalar", Array$create(1L)),
"Expected return Array or Scalar with type 'double'"
)
})

test_that("register_user_defined_function() can register multiple kernels", {
test_that("register_scalar_function() can register multiple kernels", {
skip_if_not(CanRunWithCapturedR())

register_scalar_function(
Expand All@@ -155,7 +166,11 @@ test_that("register_user_defined_function() can register multiple kernels", {
out_type = function(in_types) in_types[[1]],
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_equal(
call_function("times_32", Scalar$create(1L, int32())),
Expand All@@ -173,7 +188,10 @@ test_that("register_user_defined_function() can register multiple kernels", {
)
})

test_that("register_user_defined_function() errors for unsupported specifications", {
test_that("register_scalar_function() errors for unsupported specifications", {
# TODO(ARROW-17178) remove the need for this!
on.exit(Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF"))

expect_error(
register_scalar_function(
"no_kernels",
Expand DownExpand Up@@ -208,7 +226,10 @@ test_that("register_user_defined_function() errors for unsupported specification
test_that("user-defined functions work during multi-threaded execution", {
skip_if_not(CanRunWithCapturedR())
skip_if_not_available("dataset")
# Snappy has a UBSan issue: https://github.com/google/snappy/pull/148
# Skip on linux devel because:
# TODO(ARROW-17283): Snappy has a UBSan issue that is fixed in the dev version
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

n_rows <- 10000
Expand All@@ -235,7 +256,11 @@ test_that("user-defined functions work during multi-threaded execution", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

# check a regular collect()
result <- open_dataset(tf_dataset) %>%
Expand DownExpand Up@@ -268,7 +293,11 @@ test_that("user-defined error when called from an unsupported context", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

stream_plan_with_udf <- function() {
record_batch(a = 1:1000) %>%
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
9 changes: 8 additions & 1 deletion r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,7 @@ cast_options <- function(safe = TRUE, ...) {
#' @return `NULL`, invisibly
#' @export
#'
#' @examplesIf arrow_with_dataset()
#' @examplesIf arrow_with_dataset() && identical(Sys.getenv("NOT_CRAN"), "true")
#' library(dplyr, warn.conflicts = FALSE)
#'
#' some_model <- lm(mpg ~ disp + cyl, data = mtcars)
Expand DownExpand Up@@ -385,6 +385,13 @@ register_scalar_function <- function(name, fun, in_type, out_type,
update_cache = TRUE
)

# User-defined functions require some special handling
# in the query engine which currently require an opt-in using
# the R_ARROW_COLLECT_WITH_UDF environment variable while this
# behaviour is stabilized.
# TODO(ARROW-17178) remove the need for this!
Sys.setenv(R_ARROW_COLLECT_WITH_UDF = "true")

invisible(NULL)
}

Expand Down
9 changes: 8 additions & 1 deletion r/R/table.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -331,5 +331,12 @@ as_arrow_table.arrow_dplyr_query <- function(x, ...) {
# See query-engine.R for ExecPlan/Nodes
plan <- ExecPlan$create()
final_node <- plan$Build(x)
plan$Run(final_node, as_table = TRUE)

run_with_event_loop <- identical(
Sys.getenv("R_ARROW_COLLECT_WITH_UDF", ""),
"true"
)

result <- plan$Run(final_node, as_table = run_with_event_loop)
as_arrow_table(result)
}
2 changes: 1 addition & 1 deletion r/man/register_scalar_function.Rd

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

51 changes: 40 additions & 11 deletions r/tests/testthat/test-compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,14 +81,21 @@ test_that("arrow_scalar_function() works with auto_convert = TRUE", {

test_that("register_scalar_function() adds a compute function to the registry", {
skip_if_not(CanRunWithCapturedR())
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

register_scalar_function(
"times_32",
function(context, x) x * 32.0,
int32(), float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_true("times_32" %in% names(asNamespace("arrow")$.cache$functions))
expect_true("times_32" %in% list_compute_functions())
Expand DownExpand Up@@ -120,9 +127,11 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_array", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_array", Array$create(1L)),
Expand All@@ -135,17 +144,19 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_scalar", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_scalar", Array$create(1L)),
"Expected return Array or Scalar with type 'double'"
)
})

test_that("register_user_defined_function() can register multiple kernels", {
test_that("register_scalar_function() can register multiple kernels", {
skip_if_not(CanRunWithCapturedR())

register_scalar_function(
Expand All@@ -155,7 +166,11 @@ test_that("register_user_defined_function() can register multiple kernels", {
out_type = function(in_types) in_types[[1]],
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_equal(
call_function("times_32", Scalar$create(1L, int32())),
Expand All@@ -173,7 +188,10 @@ test_that("register_user_defined_function() can register multiple kernels", {
)
})

test_that("register_user_defined_function() errors for unsupported specifications", {
test_that("register_scalar_function() errors for unsupported specifications", {
# TODO(ARROW-17178) remove the need for this!
on.exit(Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF"))

expect_error(
register_scalar_function(
"no_kernels",
Expand DownExpand Up@@ -208,7 +226,10 @@ test_that("register_user_defined_function() errors for unsupported specification
test_that("user-defined functions work during multi-threaded execution", {
skip_if_not(CanRunWithCapturedR())
skip_if_not_available("dataset")
# Snappy has a UBSan issue: https://github.com/google/snappy/pull/148
# Skip on linux devel because:
# TODO(ARROW-17283): Snappy has a UBSan issue that is fixed in the dev version
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

n_rows <- 10000
Expand All@@ -235,7 +256,11 @@ test_that("user-defined functions work during multi-threaded execution", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

# check a regular collect()
result <- open_dataset(tf_dataset) %>%
Expand DownExpand Up@@ -268,7 +293,11 @@ test_that("user-defined error when called from an unsupported context", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

stream_plan_with_udf <- function() {
record_batch(a = 1:1000) %>%
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
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
9 changes: 8 additions & 1 deletion r/R/compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,7 @@ cast_options <- function(safe = TRUE, ...) {
#' @return `NULL`, invisibly
#' @export
#'
#' @examplesIf arrow_with_dataset()
#' @examplesIf arrow_with_dataset() && identical(Sys.getenv("NOT_CRAN"), "true")
#' library(dplyr, warn.conflicts = FALSE)
#'
#' some_model <- lm(mpg ~ disp + cyl, data = mtcars)
Expand DownExpand Up@@ -385,6 +385,13 @@ register_scalar_function <- function(name, fun, in_type, out_type,
update_cache = TRUE
)

# User-defined functions require some special handling
# in the query engine which currently require an opt-in using
# the R_ARROW_COLLECT_WITH_UDF environment variable while this
# behaviour is stabilized.
# TODO(ARROW-17178) remove the need for this!
Sys.setenv(R_ARROW_COLLECT_WITH_UDF = "true")

invisible(NULL)
}

Expand Down
9 changes: 8 additions & 1 deletion r/R/table.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -331,5 +331,12 @@ as_arrow_table.arrow_dplyr_query <- function(x, ...) {
# See query-engine.R for ExecPlan/Nodes
plan <- ExecPlan$create()
final_node <- plan$Build(x)
plan$Run(final_node, as_table = TRUE)

run_with_event_loop <- identical(
Sys.getenv("R_ARROW_COLLECT_WITH_UDF", ""),
"true"
)

result <- plan$Run(final_node, as_table = run_with_event_loop)
as_arrow_table(result)
}
2 changes: 1 addition & 1 deletion r/man/register_scalar_function.Rd

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

51 changes: 40 additions & 11 deletions r/tests/testthat/test-compute.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,14 +81,21 @@ test_that("arrow_scalar_function() works with auto_convert = TRUE", {

test_that("register_scalar_function() adds a compute function to the registry", {
skip_if_not(CanRunWithCapturedR())
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

register_scalar_function(
"times_32",
function(context, x) x * 32.0,
int32(), float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_true("times_32" %in% names(asNamespace("arrow")$.cache$functions))
expect_true("times_32" %in% list_compute_functions())
Expand DownExpand Up@@ -120,9 +127,11 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_array", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_array", Array$create(1L)),
Expand All@@ -135,17 +144,19 @@ test_that("arrow_scalar_function() with bad return type errors", {
int32(),
float64()
)
on.exit(
on.exit({
unregister_binding("times_32_bad_return_type_scalar", update_cache = TRUE)
)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_error(
call_function("times_32_bad_return_type_scalar", Array$create(1L)),
"Expected return Array or Scalar with type 'double'"
)
})

test_that("register_user_defined_function() can register multiple kernels", {
test_that("register_scalar_function() can register multiple kernels", {
skip_if_not(CanRunWithCapturedR())

register_scalar_function(
Expand All@@ -155,7 +166,11 @@ test_that("register_user_defined_function() can register multiple kernels", {
out_type = function(in_types) in_types[[1]],
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

expect_equal(
call_function("times_32", Scalar$create(1L, int32())),
Expand All@@ -173,7 +188,10 @@ test_that("register_user_defined_function() can register multiple kernels", {
)
})

test_that("register_user_defined_function() errors for unsupported specifications", {
test_that("register_scalar_function() errors for unsupported specifications", {
# TODO(ARROW-17178) remove the need for this!
on.exit(Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF"))

expect_error(
register_scalar_function(
"no_kernels",
Expand DownExpand Up@@ -208,7 +226,10 @@ test_that("register_user_defined_function() errors for unsupported specification
test_that("user-defined functions work during multi-threaded execution", {
skip_if_not(CanRunWithCapturedR())
skip_if_not_available("dataset")
# Snappy has a UBSan issue: https://github.com/google/snappy/pull/148
# Skip on linux devel because:
# TODO(ARROW-17283): Snappy has a UBSan issue that is fixed in the dev version
# TODO(ARROW-17178): User-defined function-friendly ExecPlan execution has
# occasional valgrind errors
skip_on_linux_devel()

n_rows <- 10000
Expand All@@ -235,7 +256,11 @@ test_that("user-defined functions work during multi-threaded execution", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

# check a regular collect()
result <- open_dataset(tf_dataset) %>%
Expand DownExpand Up@@ -268,7 +293,11 @@ test_that("user-defined error when called from an unsupported context", {
float64(),
auto_convert = TRUE
)
on.exit(unregister_binding("times_32", update_cache = TRUE))
on.exit({
unregister_binding("times_32", update_cache = TRUE)
# TODO(ARROW-17178) remove the need for this!
Sys.unsetenv("R_ARROW_COLLECT_WITH_UDF")
})

stream_plan_with_udf <- function() {
record_batch(a = 1:1000) %>%
Expand Down