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/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -503,6 +503,7 @@ importFrom(tidyselect,one_of)
importFrom(tidyselect,starts_with)
importFrom(tidyselect,vars_pull)
importFrom(utils,capture.output)
importFrom(utils,download.file)
importFrom(utils,getFromNamespace)
importFrom(utils,head)
importFrom(utils,install.packages)
Expand Down
24 changes: 12 additions & 12 deletions r/R/dplyr-funcs-doc.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
#' Functions can be called either as `pkg::fun()` or just `fun()`, i.e. both
#' `str_sub()` and `stringr::str_sub()` work.
#'
#' In addition to these functions, you can call any of Arrow's 246 compute
#' In addition to these functions, you can call any of Arrow's 251 compute
#' functions directly. Arrow has many functions that don't map to an existing R
#' function. In other cases where there is an R function mapping, you can still
#' call the Arrow function directly if you don't want the adaptations that the R
Expand All@@ -99,30 +99,31 @@
#'
#' ## base
#'
#' * [`-`][-()]
#' * [`!`][!()]
#' * [`!=`][!=()]
#' * [`*`][*()]
#' * [`/`][/()]
#' * [`&`][&()]
#' * [`%/%`][%/%()]
#' * [`%%`][%%()]
#' * [`%/%`][%/%()]
#' * [`%in%`][%in%()]
#' * [`^`][^()]
#' * [`&`][&()]
#' * [`*`][*()]
#' * [`+`][+()]
#' * [`-`][-()]
#' * [`/`][/()]
#' * [`<`][<()]
#' * [`<=`][<=()]
#' * [`==`][==()]
#' * [`>`][>()]
#' * [`>=`][>=()]
#' * [`|`][|()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`^`][^()]
#' * [`abs()`][base::abs()]
#' * [`acos()`][base::acos()]
#' * [`all()`][base::all()]
#' * [`any()`][base::any()]
#' * [`as.character()`][base::as.character()]
#' * [`as.Date()`][base::as.Date()]: Multiple `tryFormats` not supported in Arrow.
#' Consider using the lubridate specialised parsing functions `ymd()`, `ymd()`, etc.
#' * [`as.character()`][base::as.character()]
#' * [`as.difftime()`][base::as.difftime()]: only supports `units = "secs"` (the default)
#' * [`as.double()`][base::as.double()]
#' * [`as.integer()`][base::as.integer()]
Expand DownExpand Up@@ -153,8 +154,6 @@
#' * [`is.na()`][base::is.na()]
#' * [`is.nan()`][base::is.nan()]
#' * [`is.numeric()`][base::is.numeric()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`log()`][base::log()]
#' * [`log10()`][base::log10()]
#' * [`log1p()`][base::log1p()]
Expand DownExpand Up@@ -186,6 +185,7 @@
#' * [`tolower()`][base::tolower()]
#' * [`toupper()`][base::toupper()]
#' * [`trunc()`][base::trunc()]
#' * [`|`][|()]
#'
#' ## bit64
#'
Expand DownExpand Up@@ -242,8 +242,8 @@
#' * [`format_ISO8601()`][lubridate::format_ISO8601()]
#' * [`hour()`][lubridate::hour()]
#' * [`is.Date()`][lubridate::is.Date()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.POSIXct()`][lubridate::is.POSIXct()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.timepoint()`][lubridate::is.timepoint()]
#' * [`isoweek()`][lubridate::isoweek()]
#' * [`isoyear()`][lubridate::isoyear()]
Expand Down
1 change: 1 addition & 0 deletions r/R/io.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,6 +232,7 @@ mmap_open <- function(path, mode = c("read", "write", "readwrite")) {
#' @param random_access Logical: whether the result must be a RandomAccessFile
#' @return An `InputStream` or a subclass of one.
#' @keywords internal
#' @importFrom utils download.file
make_readable_file <- function(file, mmap = TRUE, random_access = TRUE) {
if (inherits(file, "SubTreeFileSystem")) {
filesystem <- file$base_fs
Expand Down
4 changes: 0 additions & 4 deletions r/README.md
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
# arrow <img src="https://arrow.apache.org/img/arrow-logo_hex_black-txt_white-bg.png" align="right" alt="" width="120" />

[![cran](https://www.r-pkg.org/badges/version-last-release/arrow)](https://cran.r-project.org/package=arrow)
[![CI](https://github.com/apache/arrow/workflows/R/badge.svg?event=push)](https://github.com/apache/arrow/actions?query=workflow%3AR+branch%3Amain+event%3Apush)
[![conda-forge](https://img.shields.io/conda/vn/conda-forge/r-arrow.svg)](https://anaconda.org/conda-forge/r-arrow)

[Apache Arrow](https://arrow.apache.org/) is a cross-language
development platform for in-memory and larger-than-memory data. It specifies a standardized
language-independent columnar memory format for flat and hierarchical
Expand Down
2 changes: 1 addition & 1 deletion r/inst/build_arrow_static.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_BUILD_TESTS=OFF \
-DARROW_BUILD_SHARED=OFF \
-DARROW_BUILD_STATIC=ON \
-DARROW_ACERO=${ARROW_ACERO:-$ARROW_DEFAULT_PARAM} \
-DARROW_ACERO=${ARROW_ACERO:-ON} \
-DARROW_COMPUTE=ON \
-DARROW_CSV=ON \
-DARROW_DATASET=${ARROW_DATASET:-ON} \
Expand Down
24 changes: 12 additions & 12 deletions r/man/acero.Rd

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

2 changes: 1 addition & 1 deletion r/man/enums.Rd

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

17 changes: 11 additions & 6 deletions r/tests/testthat/test-compute-sort.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,29 +108,34 @@ test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results
})

test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results on floats", {

test_vec <- tbl$dbl
# Arrow sorts NA and NaN differently, but it's not important, so eliminate here
test_vec[is.nan(test_vec)] <- NA_real_

compare_expression(
sort(.input, decreasing = TRUE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = FALSE),
tbl$dbl,
test_vec,
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = FALSE),
tbl$dbl,
test_vec,
)
})

Expand Down
37 changes: 28 additions & 9 deletions r/tests/testthat/test-dplyr-funcs-conditional.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,8 +377,11 @@ test_that("coalesce()", {
y = c(NA_real_, 2.2, 3.3),
z = c(1.1, 2.2, 3.3)
)
compare_dplyr_binding(
.input %>%

# we can't use compare_dplyr_binding here as dplyr silently converts NaN to NA in coalesce()
# see https://github.com/tidyverse/dplyr/issues/6833
expect_identical(
arrow_table(df) %>%
mutate(
cw = coalesce(w),
cz = coalesce(z),
Expand All@@ -387,21 +390,29 @@ test_that("coalesce()", {
cwxyz = coalesce(w, x, y, z)
) %>%
collect(),
df
mutate(
df,
cw = c(NA, NaN, NA),
cz = c(1.1, 2.2, 3.3),
cwx = c(NA, NaN, 3.3),
cwxy = c(NA, 2.2, 3.3),
cwxyz = c(1.1, 2.2, 3.3)
)
)

# NaNs stay NaN and are not converted to NA in the results
# (testing this requires expect_identical())
expect_identical(
df %>% Table$create() %>% mutate(cwx = coalesce(w, x)) %>% collect(),
df %>% mutate(cwx = coalesce(w, x))
df %>% mutate(cwx = c(NA, NaN, 3.3))
)
expect_identical(
df %>% Table$create() %>% transmute(cw = coalesce(w)) %>% collect(),
df %>% transmute(cw = coalesce(w))
df %>% transmute(cw = w)
)
expect_identical(
df %>% Table$create() %>% transmute(cn = coalesce(NaN)) %>% collect(),
df %>% transmute(cn = coalesce(NaN))
df %>% transmute(cn = NaN)
)
# singles stay single
expect_equal(
Expand All@@ -418,8 +429,8 @@ test_that("coalesce()", {
float32()
)
# with R literal values
compare_dplyr_binding(
.input %>%
expect_identical(
arrow_table(df) %>%
mutate(
c1 = coalesce(4.4),
c2 = coalesce(NA_real_),
Expand All@@ -429,7 +440,15 @@ test_that("coalesce()", {
c6 = coalesce(w, x, y, NaN)
) %>%
collect(),
df
mutate(
df,
c1 = 4.4,
c2 = NA_real_,
c3 = NaN,
c4 = c(5.5, 2.2, 3.3),
c5 = c(NA, 2.2, 3.3),
c6 = c(NaN, 2.2, 3.3)
)
)

# no arguments
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/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -503,6 +503,7 @@ importFrom(tidyselect,one_of)
importFrom(tidyselect,starts_with)
importFrom(tidyselect,vars_pull)
importFrom(utils,capture.output)
importFrom(utils,download.file)
importFrom(utils,getFromNamespace)
importFrom(utils,head)
importFrom(utils,install.packages)
Expand Down
24 changes: 12 additions & 12 deletions r/R/dplyr-funcs-doc.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
#' Functions can be called either as `pkg::fun()` or just `fun()`, i.e. both
#' `str_sub()` and `stringr::str_sub()` work.
#'
#' In addition to these functions, you can call any of Arrow's 246 compute
#' In addition to these functions, you can call any of Arrow's 251 compute
#' functions directly. Arrow has many functions that don't map to an existing R
#' function. In other cases where there is an R function mapping, you can still
#' call the Arrow function directly if you don't want the adaptations that the R
Expand All@@ -99,30 +99,31 @@
#'
#' ## base
#'
#' * [`-`][-()]
#' * [`!`][!()]
#' * [`!=`][!=()]
#' * [`*`][*()]
#' * [`/`][/()]
#' * [`&`][&()]
#' * [`%/%`][%/%()]
#' * [`%%`][%%()]
#' * [`%/%`][%/%()]
#' * [`%in%`][%in%()]
#' * [`^`][^()]
#' * [`&`][&()]
#' * [`*`][*()]
#' * [`+`][+()]
#' * [`-`][-()]
#' * [`/`][/()]
#' * [`<`][<()]
#' * [`<=`][<=()]
#' * [`==`][==()]
#' * [`>`][>()]
#' * [`>=`][>=()]
#' * [`|`][|()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`^`][^()]
#' * [`abs()`][base::abs()]
#' * [`acos()`][base::acos()]
#' * [`all()`][base::all()]
#' * [`any()`][base::any()]
#' * [`as.character()`][base::as.character()]
#' * [`as.Date()`][base::as.Date()]: Multiple `tryFormats` not supported in Arrow.
#' Consider using the lubridate specialised parsing functions `ymd()`, `ymd()`, etc.
#' * [`as.character()`][base::as.character()]
#' * [`as.difftime()`][base::as.difftime()]: only supports `units = "secs"` (the default)
#' * [`as.double()`][base::as.double()]
#' * [`as.integer()`][base::as.integer()]
Expand DownExpand Up@@ -153,8 +154,6 @@
#' * [`is.na()`][base::is.na()]
#' * [`is.nan()`][base::is.nan()]
#' * [`is.numeric()`][base::is.numeric()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`log()`][base::log()]
#' * [`log10()`][base::log10()]
#' * [`log1p()`][base::log1p()]
Expand DownExpand Up@@ -186,6 +185,7 @@
#' * [`tolower()`][base::tolower()]
#' * [`toupper()`][base::toupper()]
#' * [`trunc()`][base::trunc()]
#' * [`|`][|()]
#'
#' ## bit64
#'
Expand DownExpand Up@@ -242,8 +242,8 @@
#' * [`format_ISO8601()`][lubridate::format_ISO8601()]
#' * [`hour()`][lubridate::hour()]
#' * [`is.Date()`][lubridate::is.Date()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.POSIXct()`][lubridate::is.POSIXct()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.timepoint()`][lubridate::is.timepoint()]
#' * [`isoweek()`][lubridate::isoweek()]
#' * [`isoyear()`][lubridate::isoyear()]
Expand Down
1 change: 1 addition & 0 deletions r/R/io.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,6 +232,7 @@ mmap_open <- function(path, mode = c("read", "write", "readwrite")) {
#' @param random_access Logical: whether the result must be a RandomAccessFile
#' @return An `InputStream` or a subclass of one.
#' @keywords internal
#' @importFrom utils download.file
make_readable_file <- function(file, mmap = TRUE, random_access = TRUE) {
if (inherits(file, "SubTreeFileSystem")) {
filesystem <- file$base_fs
Expand Down
4 changes: 0 additions & 4 deletions r/README.md
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
# arrow <img src="https://arrow.apache.org/img/arrow-logo_hex_black-txt_white-bg.png" align="right" alt="" width="120" />

[![cran](https://www.r-pkg.org/badges/version-last-release/arrow)](https://cran.r-project.org/package=arrow)
[![CI](https://github.com/apache/arrow/workflows/R/badge.svg?event=push)](https://github.com/apache/arrow/actions?query=workflow%3AR+branch%3Amain+event%3Apush)
[![conda-forge](https://img.shields.io/conda/vn/conda-forge/r-arrow.svg)](https://anaconda.org/conda-forge/r-arrow)

[Apache Arrow](https://arrow.apache.org/) is a cross-language
development platform for in-memory and larger-than-memory data. It specifies a standardized
language-independent columnar memory format for flat and hierarchical
Expand Down
2 changes: 1 addition & 1 deletion r/inst/build_arrow_static.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_BUILD_TESTS=OFF \
-DARROW_BUILD_SHARED=OFF \
-DARROW_BUILD_STATIC=ON \
-DARROW_ACERO=${ARROW_ACERO:-$ARROW_DEFAULT_PARAM} \
-DARROW_ACERO=${ARROW_ACERO:-ON} \
-DARROW_COMPUTE=ON \
-DARROW_CSV=ON \
-DARROW_DATASET=${ARROW_DATASET:-ON} \
Expand Down
24 changes: 12 additions & 12 deletions r/man/acero.Rd

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

2 changes: 1 addition & 1 deletion r/man/enums.Rd

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

17 changes: 11 additions & 6 deletions r/tests/testthat/test-compute-sort.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,29 +108,34 @@ test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results
})

test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results on floats", {

test_vec <- tbl$dbl
# Arrow sorts NA and NaN differently, but it's not important, so eliminate here
test_vec[is.nan(test_vec)] <- NA_real_

compare_expression(
sort(.input, decreasing = TRUE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = FALSE),
tbl$dbl,
test_vec,
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = FALSE),
tbl$dbl,
test_vec,
)
})

Expand Down
37 changes: 28 additions & 9 deletions r/tests/testthat/test-dplyr-funcs-conditional.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,8 +377,11 @@ test_that("coalesce()", {
y = c(NA_real_, 2.2, 3.3),
z = c(1.1, 2.2, 3.3)
)
compare_dplyr_binding(
.input %>%

# we can't use compare_dplyr_binding here as dplyr silently converts NaN to NA in coalesce()
# see https://github.com/tidyverse/dplyr/issues/6833
expect_identical(
arrow_table(df) %>%
mutate(
cw = coalesce(w),
cz = coalesce(z),
Expand All@@ -387,21 +390,29 @@ test_that("coalesce()", {
cwxyz = coalesce(w, x, y, z)
) %>%
collect(),
df
mutate(
df,
cw = c(NA, NaN, NA),
cz = c(1.1, 2.2, 3.3),
cwx = c(NA, NaN, 3.3),
cwxy = c(NA, 2.2, 3.3),
cwxyz = c(1.1, 2.2, 3.3)
)
)

# NaNs stay NaN and are not converted to NA in the results
# (testing this requires expect_identical())
expect_identical(
df %>% Table$create() %>% mutate(cwx = coalesce(w, x)) %>% collect(),
df %>% mutate(cwx = coalesce(w, x))
df %>% mutate(cwx = c(NA, NaN, 3.3))
)
expect_identical(
df %>% Table$create() %>% transmute(cw = coalesce(w)) %>% collect(),
df %>% transmute(cw = coalesce(w))
df %>% transmute(cw = w)
)
expect_identical(
df %>% Table$create() %>% transmute(cn = coalesce(NaN)) %>% collect(),
df %>% transmute(cn = coalesce(NaN))
df %>% transmute(cn = NaN)
)
# singles stay single
expect_equal(
Expand All@@ -418,8 +429,8 @@ test_that("coalesce()", {
float32()
)
# with R literal values
compare_dplyr_binding(
.input %>%
expect_identical(
arrow_table(df) %>%
mutate(
c1 = coalesce(4.4),
c2 = coalesce(NA_real_),
Expand All@@ -429,7 +440,15 @@ test_that("coalesce()", {
c6 = coalesce(w, x, y, NaN)
) %>%
collect(),
df
mutate(
df,
c1 = 4.4,
c2 = NA_real_,
c3 = NaN,
c4 = c(5.5, 2.2, 3.3),
c5 = c(NA, 2.2, 3.3),
c6 = c(NaN, 2.2, 3.3)
)
)

# no arguments
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/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -503,6 +503,7 @@ importFrom(tidyselect,one_of)
importFrom(tidyselect,starts_with)
importFrom(tidyselect,vars_pull)
importFrom(utils,capture.output)
importFrom(utils,download.file)
importFrom(utils,getFromNamespace)
importFrom(utils,head)
importFrom(utils,install.packages)
Expand Down
24 changes: 12 additions & 12 deletions r/R/dplyr-funcs-doc.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
#' Functions can be called either as `pkg::fun()` or just `fun()`, i.e. both
#' `str_sub()` and `stringr::str_sub()` work.
#'
#' In addition to these functions, you can call any of Arrow's 246 compute
#' In addition to these functions, you can call any of Arrow's 251 compute
#' functions directly. Arrow has many functions that don't map to an existing R
#' function. In other cases where there is an R function mapping, you can still
#' call the Arrow function directly if you don't want the adaptations that the R
Expand All@@ -99,30 +99,31 @@
#'
#' ## base
#'
#' * [`-`][-()]
#' * [`!`][!()]
#' * [`!=`][!=()]
#' * [`*`][*()]
#' * [`/`][/()]
#' * [`&`][&()]
#' * [`%/%`][%/%()]
#' * [`%%`][%%()]
#' * [`%/%`][%/%()]
#' * [`%in%`][%in%()]
#' * [`^`][^()]
#' * [`&`][&()]
#' * [`*`][*()]
#' * [`+`][+()]
#' * [`-`][-()]
#' * [`/`][/()]
#' * [`<`][<()]
#' * [`<=`][<=()]
#' * [`==`][==()]
#' * [`>`][>()]
#' * [`>=`][>=()]
#' * [`|`][|()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`^`][^()]
#' * [`abs()`][base::abs()]
#' * [`acos()`][base::acos()]
#' * [`all()`][base::all()]
#' * [`any()`][base::any()]
#' * [`as.character()`][base::as.character()]
#' * [`as.Date()`][base::as.Date()]: Multiple `tryFormats` not supported in Arrow.
#' Consider using the lubridate specialised parsing functions `ymd()`, `ymd()`, etc.
#' * [`as.character()`][base::as.character()]
#' * [`as.difftime()`][base::as.difftime()]: only supports `units = "secs"` (the default)
#' * [`as.double()`][base::as.double()]
#' * [`as.integer()`][base::as.integer()]
Expand DownExpand Up@@ -153,8 +154,6 @@
#' * [`is.na()`][base::is.na()]
#' * [`is.nan()`][base::is.nan()]
#' * [`is.numeric()`][base::is.numeric()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`log()`][base::log()]
#' * [`log10()`][base::log10()]
#' * [`log1p()`][base::log1p()]
Expand DownExpand Up@@ -186,6 +185,7 @@
#' * [`tolower()`][base::tolower()]
#' * [`toupper()`][base::toupper()]
#' * [`trunc()`][base::trunc()]
#' * [`|`][|()]
#'
#' ## bit64
#'
Expand DownExpand Up@@ -242,8 +242,8 @@
#' * [`format_ISO8601()`][lubridate::format_ISO8601()]
#' * [`hour()`][lubridate::hour()]
#' * [`is.Date()`][lubridate::is.Date()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.POSIXct()`][lubridate::is.POSIXct()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.timepoint()`][lubridate::is.timepoint()]
#' * [`isoweek()`][lubridate::isoweek()]
#' * [`isoyear()`][lubridate::isoyear()]
Expand Down
1 change: 1 addition & 0 deletions r/R/io.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,6 +232,7 @@ mmap_open <- function(path, mode = c("read", "write", "readwrite")) {
#' @param random_access Logical: whether the result must be a RandomAccessFile
#' @return An `InputStream` or a subclass of one.
#' @keywords internal
#' @importFrom utils download.file
make_readable_file <- function(file, mmap = TRUE, random_access = TRUE) {
if (inherits(file, "SubTreeFileSystem")) {
filesystem <- file$base_fs
Expand Down
4 changes: 0 additions & 4 deletions r/README.md
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
# arrow <img src="https://arrow.apache.org/img/arrow-logo_hex_black-txt_white-bg.png" align="right" alt="" width="120" />

[![cran](https://www.r-pkg.org/badges/version-last-release/arrow)](https://cran.r-project.org/package=arrow)
[![CI](https://github.com/apache/arrow/workflows/R/badge.svg?event=push)](https://github.com/apache/arrow/actions?query=workflow%3AR+branch%3Amain+event%3Apush)
[![conda-forge](https://img.shields.io/conda/vn/conda-forge/r-arrow.svg)](https://anaconda.org/conda-forge/r-arrow)

[Apache Arrow](https://arrow.apache.org/) is a cross-language
development platform for in-memory and larger-than-memory data. It specifies a standardized
language-independent columnar memory format for flat and hierarchical
Expand Down
2 changes: 1 addition & 1 deletion r/inst/build_arrow_static.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_BUILD_TESTS=OFF \
-DARROW_BUILD_SHARED=OFF \
-DARROW_BUILD_STATIC=ON \
-DARROW_ACERO=${ARROW_ACERO:-$ARROW_DEFAULT_PARAM} \
-DARROW_ACERO=${ARROW_ACERO:-ON} \
-DARROW_COMPUTE=ON \
-DARROW_CSV=ON \
-DARROW_DATASET=${ARROW_DATASET:-ON} \
Expand Down
24 changes: 12 additions & 12 deletions r/man/acero.Rd

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

2 changes: 1 addition & 1 deletion r/man/enums.Rd

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

17 changes: 11 additions & 6 deletions r/tests/testthat/test-compute-sort.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,29 +108,34 @@ test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results
})

test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results on floats", {

test_vec <- tbl$dbl
# Arrow sorts NA and NaN differently, but it's not important, so eliminate here
test_vec[is.nan(test_vec)] <- NA_real_

compare_expression(
sort(.input, decreasing = TRUE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = FALSE),
tbl$dbl,
test_vec,
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = FALSE),
tbl$dbl,
test_vec,
)
})

Expand Down
37 changes: 28 additions & 9 deletions r/tests/testthat/test-dplyr-funcs-conditional.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,8 +377,11 @@ test_that("coalesce()", {
y = c(NA_real_, 2.2, 3.3),
z = c(1.1, 2.2, 3.3)
)
compare_dplyr_binding(
.input %>%

# we can't use compare_dplyr_binding here as dplyr silently converts NaN to NA in coalesce()
# see https://github.com/tidyverse/dplyr/issues/6833
expect_identical(
arrow_table(df) %>%
mutate(
cw = coalesce(w),
cz = coalesce(z),
Expand All@@ -387,21 +390,29 @@ test_that("coalesce()", {
cwxyz = coalesce(w, x, y, z)
) %>%
collect(),
df
mutate(
df,
cw = c(NA, NaN, NA),
cz = c(1.1, 2.2, 3.3),
cwx = c(NA, NaN, 3.3),
cwxy = c(NA, 2.2, 3.3),
cwxyz = c(1.1, 2.2, 3.3)
)
)

# NaNs stay NaN and are not converted to NA in the results
# (testing this requires expect_identical())
expect_identical(
df %>% Table$create() %>% mutate(cwx = coalesce(w, x)) %>% collect(),
df %>% mutate(cwx = coalesce(w, x))
df %>% mutate(cwx = c(NA, NaN, 3.3))
)
expect_identical(
df %>% Table$create() %>% transmute(cw = coalesce(w)) %>% collect(),
df %>% transmute(cw = coalesce(w))
df %>% transmute(cw = w)
)
expect_identical(
df %>% Table$create() %>% transmute(cn = coalesce(NaN)) %>% collect(),
df %>% transmute(cn = coalesce(NaN))
df %>% transmute(cn = NaN)
)
# singles stay single
expect_equal(
Expand All@@ -418,8 +429,8 @@ test_that("coalesce()", {
float32()
)
# with R literal values
compare_dplyr_binding(
.input %>%
expect_identical(
arrow_table(df) %>%
mutate(
c1 = coalesce(4.4),
c2 = coalesce(NA_real_),
Expand All@@ -429,7 +440,15 @@ test_that("coalesce()", {
c6 = coalesce(w, x, y, NaN)
) %>%
collect(),
df
mutate(
df,
c1 = 4.4,
c2 = NA_real_,
c3 = NaN,
c4 = c(5.5, 2.2, 3.3),
c5 = c(NA, 2.2, 3.3),
c6 = c(NaN, 2.2, 3.3)
)
)

# no arguments
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/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -503,6 +503,7 @@ importFrom(tidyselect,one_of)
importFrom(tidyselect,starts_with)
importFrom(tidyselect,vars_pull)
importFrom(utils,capture.output)
importFrom(utils,download.file)
importFrom(utils,getFromNamespace)
importFrom(utils,head)
importFrom(utils,install.packages)
Expand Down
24 changes: 12 additions & 12 deletions r/R/dplyr-funcs-doc.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
#' Functions can be called either as `pkg::fun()` or just `fun()`, i.e. both
#' `str_sub()` and `stringr::str_sub()` work.
#'
#' In addition to these functions, you can call any of Arrow's 246 compute
#' In addition to these functions, you can call any of Arrow's 251 compute
#' functions directly. Arrow has many functions that don't map to an existing R
#' function. In other cases where there is an R function mapping, you can still
#' call the Arrow function directly if you don't want the adaptations that the R
Expand All@@ -99,30 +99,31 @@
#'
#' ## base
#'
#' * [`-`][-()]
#' * [`!`][!()]
#' * [`!=`][!=()]
#' * [`*`][*()]
#' * [`/`][/()]
#' * [`&`][&()]
#' * [`%/%`][%/%()]
#' * [`%%`][%%()]
#' * [`%/%`][%/%()]
#' * [`%in%`][%in%()]
#' * [`^`][^()]
#' * [`&`][&()]
#' * [`*`][*()]
#' * [`+`][+()]
#' * [`-`][-()]
#' * [`/`][/()]
#' * [`<`][<()]
#' * [`<=`][<=()]
#' * [`==`][==()]
#' * [`>`][>()]
#' * [`>=`][>=()]
#' * [`|`][|()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`^`][^()]
#' * [`abs()`][base::abs()]
#' * [`acos()`][base::acos()]
#' * [`all()`][base::all()]
#' * [`any()`][base::any()]
#' * [`as.character()`][base::as.character()]
#' * [`as.Date()`][base::as.Date()]: Multiple `tryFormats` not supported in Arrow.
#' Consider using the lubridate specialised parsing functions `ymd()`, `ymd()`, etc.
#' * [`as.character()`][base::as.character()]
#' * [`as.difftime()`][base::as.difftime()]: only supports `units = "secs"` (the default)
#' * [`as.double()`][base::as.double()]
#' * [`as.integer()`][base::as.integer()]
Expand DownExpand Up@@ -153,8 +154,6 @@
#' * [`is.na()`][base::is.na()]
#' * [`is.nan()`][base::is.nan()]
#' * [`is.numeric()`][base::is.numeric()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`log()`][base::log()]
#' * [`log10()`][base::log10()]
#' * [`log1p()`][base::log1p()]
Expand DownExpand Up@@ -186,6 +185,7 @@
#' * [`tolower()`][base::tolower()]
#' * [`toupper()`][base::toupper()]
#' * [`trunc()`][base::trunc()]
#' * [`|`][|()]
#'
#' ## bit64
#'
Expand DownExpand Up@@ -242,8 +242,8 @@
#' * [`format_ISO8601()`][lubridate::format_ISO8601()]
#' * [`hour()`][lubridate::hour()]
#' * [`is.Date()`][lubridate::is.Date()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.POSIXct()`][lubridate::is.POSIXct()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.timepoint()`][lubridate::is.timepoint()]
#' * [`isoweek()`][lubridate::isoweek()]
#' * [`isoyear()`][lubridate::isoyear()]
Expand Down
1 change: 1 addition & 0 deletions r/R/io.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,6 +232,7 @@ mmap_open <- function(path, mode = c("read", "write", "readwrite")) {
#' @param random_access Logical: whether the result must be a RandomAccessFile
#' @return An `InputStream` or a subclass of one.
#' @keywords internal
#' @importFrom utils download.file
make_readable_file <- function(file, mmap = TRUE, random_access = TRUE) {
if (inherits(file, "SubTreeFileSystem")) {
filesystem <- file$base_fs
Expand Down
4 changes: 0 additions & 4 deletions r/README.md
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
# arrow <img src="https://arrow.apache.org/img/arrow-logo_hex_black-txt_white-bg.png" align="right" alt="" width="120" />

[![cran](https://www.r-pkg.org/badges/version-last-release/arrow)](https://cran.r-project.org/package=arrow)
[![CI](https://github.com/apache/arrow/workflows/R/badge.svg?event=push)](https://github.com/apache/arrow/actions?query=workflow%3AR+branch%3Amain+event%3Apush)
[![conda-forge](https://img.shields.io/conda/vn/conda-forge/r-arrow.svg)](https://anaconda.org/conda-forge/r-arrow)

[Apache Arrow](https://arrow.apache.org/) is a cross-language
development platform for in-memory and larger-than-memory data. It specifies a standardized
language-independent columnar memory format for flat and hierarchical
Expand Down
2 changes: 1 addition & 1 deletion r/inst/build_arrow_static.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_BUILD_TESTS=OFF \
-DARROW_BUILD_SHARED=OFF \
-DARROW_BUILD_STATIC=ON \
-DARROW_ACERO=${ARROW_ACERO:-$ARROW_DEFAULT_PARAM} \
-DARROW_ACERO=${ARROW_ACERO:-ON} \
-DARROW_COMPUTE=ON \
-DARROW_CSV=ON \
-DARROW_DATASET=${ARROW_DATASET:-ON} \
Expand Down
24 changes: 12 additions & 12 deletions r/man/acero.Rd

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

2 changes: 1 addition & 1 deletion r/man/enums.Rd

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

17 changes: 11 additions & 6 deletions r/tests/testthat/test-compute-sort.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,29 +108,34 @@ test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results
})

test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results on floats", {

test_vec <- tbl$dbl
# Arrow sorts NA and NaN differently, but it's not important, so eliminate here
test_vec[is.nan(test_vec)] <- NA_real_

compare_expression(
sort(.input, decreasing = TRUE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = FALSE),
tbl$dbl,
test_vec,
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = FALSE),
tbl$dbl,
test_vec,
)
})

Expand Down
37 changes: 28 additions & 9 deletions r/tests/testthat/test-dplyr-funcs-conditional.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,8 +377,11 @@ test_that("coalesce()", {
y = c(NA_real_, 2.2, 3.3),
z = c(1.1, 2.2, 3.3)
)
compare_dplyr_binding(
.input %>%

# we can't use compare_dplyr_binding here as dplyr silently converts NaN to NA in coalesce()
# see https://github.com/tidyverse/dplyr/issues/6833
expect_identical(
arrow_table(df) %>%
mutate(
cw = coalesce(w),
cz = coalesce(z),
Expand All@@ -387,21 +390,29 @@ test_that("coalesce()", {
cwxyz = coalesce(w, x, y, z)
) %>%
collect(),
df
mutate(
df,
cw = c(NA, NaN, NA),
cz = c(1.1, 2.2, 3.3),
cwx = c(NA, NaN, 3.3),
cwxy = c(NA, 2.2, 3.3),
cwxyz = c(1.1, 2.2, 3.3)
)
)

# NaNs stay NaN and are not converted to NA in the results
# (testing this requires expect_identical())
expect_identical(
df %>% Table$create() %>% mutate(cwx = coalesce(w, x)) %>% collect(),
df %>% mutate(cwx = coalesce(w, x))
df %>% mutate(cwx = c(NA, NaN, 3.3))
)
expect_identical(
df %>% Table$create() %>% transmute(cw = coalesce(w)) %>% collect(),
df %>% transmute(cw = coalesce(w))
df %>% transmute(cw = w)
)
expect_identical(
df %>% Table$create() %>% transmute(cn = coalesce(NaN)) %>% collect(),
df %>% transmute(cn = coalesce(NaN))
df %>% transmute(cn = NaN)
)
# singles stay single
expect_equal(
Expand All@@ -418,8 +429,8 @@ test_that("coalesce()", {
float32()
)
# with R literal values
compare_dplyr_binding(
.input %>%
expect_identical(
arrow_table(df) %>%
mutate(
c1 = coalesce(4.4),
c2 = coalesce(NA_real_),
Expand All@@ -429,7 +440,15 @@ test_that("coalesce()", {
c6 = coalesce(w, x, y, NaN)
) %>%
collect(),
df
mutate(
df,
c1 = 4.4,
c2 = NA_real_,
c3 = NaN,
c4 = c(5.5, 2.2, 3.3),
c5 = c(NA, 2.2, 3.3),
c6 = c(NaN, 2.2, 3.3)
)
)

# no arguments
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/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -503,6 +503,7 @@ importFrom(tidyselect,one_of)
importFrom(tidyselect,starts_with)
importFrom(tidyselect,vars_pull)
importFrom(utils,capture.output)
importFrom(utils,download.file)
importFrom(utils,getFromNamespace)
importFrom(utils,head)
importFrom(utils,install.packages)
Expand Down
24 changes: 12 additions & 12 deletions r/R/dplyr-funcs-doc.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
#' Functions can be called either as `pkg::fun()` or just `fun()`, i.e. both
#' `str_sub()` and `stringr::str_sub()` work.
#'
#' In addition to these functions, you can call any of Arrow's 246 compute
#' In addition to these functions, you can call any of Arrow's 251 compute
#' functions directly. Arrow has many functions that don't map to an existing R
#' function. In other cases where there is an R function mapping, you can still
#' call the Arrow function directly if you don't want the adaptations that the R
Expand All@@ -99,30 +99,31 @@
#'
#' ## base
#'
#' * [`-`][-()]
#' * [`!`][!()]
#' * [`!=`][!=()]
#' * [`*`][*()]
#' * [`/`][/()]
#' * [`&`][&()]
#' * [`%/%`][%/%()]
#' * [`%%`][%%()]
#' * [`%/%`][%/%()]
#' * [`%in%`][%in%()]
#' * [`^`][^()]
#' * [`&`][&()]
#' * [`*`][*()]
#' * [`+`][+()]
#' * [`-`][-()]
#' * [`/`][/()]
#' * [`<`][<()]
#' * [`<=`][<=()]
#' * [`==`][==()]
#' * [`>`][>()]
#' * [`>=`][>=()]
#' * [`|`][|()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`^`][^()]
#' * [`abs()`][base::abs()]
#' * [`acos()`][base::acos()]
#' * [`all()`][base::all()]
#' * [`any()`][base::any()]
#' * [`as.character()`][base::as.character()]
#' * [`as.Date()`][base::as.Date()]: Multiple `tryFormats` not supported in Arrow.
#' Consider using the lubridate specialised parsing functions `ymd()`, `ymd()`, etc.
#' * [`as.character()`][base::as.character()]
#' * [`as.difftime()`][base::as.difftime()]: only supports `units = "secs"` (the default)
#' * [`as.double()`][base::as.double()]
#' * [`as.integer()`][base::as.integer()]
Expand DownExpand Up@@ -153,8 +154,6 @@
#' * [`is.na()`][base::is.na()]
#' * [`is.nan()`][base::is.nan()]
#' * [`is.numeric()`][base::is.numeric()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`log()`][base::log()]
#' * [`log10()`][base::log10()]
#' * [`log1p()`][base::log1p()]
Expand DownExpand Up@@ -186,6 +185,7 @@
#' * [`tolower()`][base::tolower()]
#' * [`toupper()`][base::toupper()]
#' * [`trunc()`][base::trunc()]
#' * [`|`][|()]
#'
#' ## bit64
#'
Expand DownExpand Up@@ -242,8 +242,8 @@
#' * [`format_ISO8601()`][lubridate::format_ISO8601()]
#' * [`hour()`][lubridate::hour()]
#' * [`is.Date()`][lubridate::is.Date()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.POSIXct()`][lubridate::is.POSIXct()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.timepoint()`][lubridate::is.timepoint()]
#' * [`isoweek()`][lubridate::isoweek()]
#' * [`isoyear()`][lubridate::isoyear()]
Expand Down
1 change: 1 addition & 0 deletions r/R/io.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,6 +232,7 @@ mmap_open <- function(path, mode = c("read", "write", "readwrite")) {
#' @param random_access Logical: whether the result must be a RandomAccessFile
#' @return An `InputStream` or a subclass of one.
#' @keywords internal
#' @importFrom utils download.file
make_readable_file <- function(file, mmap = TRUE, random_access = TRUE) {
if (inherits(file, "SubTreeFileSystem")) {
filesystem <- file$base_fs
Expand Down
4 changes: 0 additions & 4 deletions r/README.md
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
# arrow <img src="https://arrow.apache.org/img/arrow-logo_hex_black-txt_white-bg.png" align="right" alt="" width="120" />

[![cran](https://www.r-pkg.org/badges/version-last-release/arrow)](https://cran.r-project.org/package=arrow)
[![CI](https://github.com/apache/arrow/workflows/R/badge.svg?event=push)](https://github.com/apache/arrow/actions?query=workflow%3AR+branch%3Amain+event%3Apush)
[![conda-forge](https://img.shields.io/conda/vn/conda-forge/r-arrow.svg)](https://anaconda.org/conda-forge/r-arrow)

[Apache Arrow](https://arrow.apache.org/) is a cross-language
development platform for in-memory and larger-than-memory data. It specifies a standardized
language-independent columnar memory format for flat and hierarchical
Expand Down
2 changes: 1 addition & 1 deletion r/inst/build_arrow_static.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_BUILD_TESTS=OFF \
-DARROW_BUILD_SHARED=OFF \
-DARROW_BUILD_STATIC=ON \
-DARROW_ACERO=${ARROW_ACERO:-$ARROW_DEFAULT_PARAM} \
-DARROW_ACERO=${ARROW_ACERO:-ON} \
-DARROW_COMPUTE=ON \
-DARROW_CSV=ON \
-DARROW_DATASET=${ARROW_DATASET:-ON} \
Expand Down
24 changes: 12 additions & 12 deletions r/man/acero.Rd

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

2 changes: 1 addition & 1 deletion r/man/enums.Rd

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

17 changes: 11 additions & 6 deletions r/tests/testthat/test-compute-sort.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,29 +108,34 @@ test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results
})

test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results on floats", {

test_vec <- tbl$dbl
# Arrow sorts NA and NaN differently, but it's not important, so eliminate here
test_vec[is.nan(test_vec)] <- NA_real_

compare_expression(
sort(.input, decreasing = TRUE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = FALSE),
tbl$dbl,
test_vec,
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = FALSE),
tbl$dbl,
test_vec,
)
})

Expand Down
37 changes: 28 additions & 9 deletions r/tests/testthat/test-dplyr-funcs-conditional.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,8 +377,11 @@ test_that("coalesce()", {
y = c(NA_real_, 2.2, 3.3),
z = c(1.1, 2.2, 3.3)
)
compare_dplyr_binding(
.input %>%

# we can't use compare_dplyr_binding here as dplyr silently converts NaN to NA in coalesce()
# see https://github.com/tidyverse/dplyr/issues/6833
expect_identical(
arrow_table(df) %>%
mutate(
cw = coalesce(w),
cz = coalesce(z),
Expand All@@ -387,21 +390,29 @@ test_that("coalesce()", {
cwxyz = coalesce(w, x, y, z)
) %>%
collect(),
df
mutate(
df,
cw = c(NA, NaN, NA),
cz = c(1.1, 2.2, 3.3),
cwx = c(NA, NaN, 3.3),
cwxy = c(NA, 2.2, 3.3),
cwxyz = c(1.1, 2.2, 3.3)
)
)

# NaNs stay NaN and are not converted to NA in the results
# (testing this requires expect_identical())
expect_identical(
df %>% Table$create() %>% mutate(cwx = coalesce(w, x)) %>% collect(),
df %>% mutate(cwx = coalesce(w, x))
df %>% mutate(cwx = c(NA, NaN, 3.3))
)
expect_identical(
df %>% Table$create() %>% transmute(cw = coalesce(w)) %>% collect(),
df %>% transmute(cw = coalesce(w))
df %>% transmute(cw = w)
)
expect_identical(
df %>% Table$create() %>% transmute(cn = coalesce(NaN)) %>% collect(),
df %>% transmute(cn = coalesce(NaN))
df %>% transmute(cn = NaN)
)
# singles stay single
expect_equal(
Expand All@@ -418,8 +429,8 @@ test_that("coalesce()", {
float32()
)
# with R literal values
compare_dplyr_binding(
.input %>%
expect_identical(
arrow_table(df) %>%
mutate(
c1 = coalesce(4.4),
c2 = coalesce(NA_real_),
Expand All@@ -429,7 +440,15 @@ test_that("coalesce()", {
c6 = coalesce(w, x, y, NaN)
) %>%
collect(),
df
mutate(
df,
c1 = 4.4,
c2 = NA_real_,
c3 = NaN,
c4 = c(5.5, 2.2, 3.3),
c5 = c(NA, 2.2, 3.3),
c6 = c(NaN, 2.2, 3.3)
)
)

# no arguments
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/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -503,6 +503,7 @@ importFrom(tidyselect,one_of)
importFrom(tidyselect,starts_with)
importFrom(tidyselect,vars_pull)
importFrom(utils,capture.output)
importFrom(utils,download.file)
importFrom(utils,getFromNamespace)
importFrom(utils,head)
importFrom(utils,install.packages)
Expand Down
24 changes: 12 additions & 12 deletions r/R/dplyr-funcs-doc.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
#' Functions can be called either as `pkg::fun()` or just `fun()`, i.e. both
#' `str_sub()` and `stringr::str_sub()` work.
#'
#' In addition to these functions, you can call any of Arrow's 246 compute
#' In addition to these functions, you can call any of Arrow's 251 compute
#' functions directly. Arrow has many functions that don't map to an existing R
#' function. In other cases where there is an R function mapping, you can still
#' call the Arrow function directly if you don't want the adaptations that the R
Expand All@@ -99,30 +99,31 @@
#'
#' ## base
#'
#' * [`-`][-()]
#' * [`!`][!()]
#' * [`!=`][!=()]
#' * [`*`][*()]
#' * [`/`][/()]
#' * [`&`][&()]
#' * [`%/%`][%/%()]
#' * [`%%`][%%()]
#' * [`%/%`][%/%()]
#' * [`%in%`][%in%()]
#' * [`^`][^()]
#' * [`&`][&()]
#' * [`*`][*()]
#' * [`+`][+()]
#' * [`-`][-()]
#' * [`/`][/()]
#' * [`<`][<()]
#' * [`<=`][<=()]
#' * [`==`][==()]
#' * [`>`][>()]
#' * [`>=`][>=()]
#' * [`|`][|()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`^`][^()]
#' * [`abs()`][base::abs()]
#' * [`acos()`][base::acos()]
#' * [`all()`][base::all()]
#' * [`any()`][base::any()]
#' * [`as.character()`][base::as.character()]
#' * [`as.Date()`][base::as.Date()]: Multiple `tryFormats` not supported in Arrow.
#' Consider using the lubridate specialised parsing functions `ymd()`, `ymd()`, etc.
#' * [`as.character()`][base::as.character()]
#' * [`as.difftime()`][base::as.difftime()]: only supports `units = "secs"` (the default)
#' * [`as.double()`][base::as.double()]
#' * [`as.integer()`][base::as.integer()]
Expand DownExpand Up@@ -153,8 +154,6 @@
#' * [`is.na()`][base::is.na()]
#' * [`is.nan()`][base::is.nan()]
#' * [`is.numeric()`][base::is.numeric()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`log()`][base::log()]
#' * [`log10()`][base::log10()]
#' * [`log1p()`][base::log1p()]
Expand DownExpand Up@@ -186,6 +185,7 @@
#' * [`tolower()`][base::tolower()]
#' * [`toupper()`][base::toupper()]
#' * [`trunc()`][base::trunc()]
#' * [`|`][|()]
#'
#' ## bit64
#'
Expand DownExpand Up@@ -242,8 +242,8 @@
#' * [`format_ISO8601()`][lubridate::format_ISO8601()]
#' * [`hour()`][lubridate::hour()]
#' * [`is.Date()`][lubridate::is.Date()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.POSIXct()`][lubridate::is.POSIXct()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.timepoint()`][lubridate::is.timepoint()]
#' * [`isoweek()`][lubridate::isoweek()]
#' * [`isoyear()`][lubridate::isoyear()]
Expand Down
1 change: 1 addition & 0 deletions r/R/io.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,6 +232,7 @@ mmap_open <- function(path, mode = c("read", "write", "readwrite")) {
#' @param random_access Logical: whether the result must be a RandomAccessFile
#' @return An `InputStream` or a subclass of one.
#' @keywords internal
#' @importFrom utils download.file
make_readable_file <- function(file, mmap = TRUE, random_access = TRUE) {
if (inherits(file, "SubTreeFileSystem")) {
filesystem <- file$base_fs
Expand Down
4 changes: 0 additions & 4 deletions r/README.md
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
# arrow <img src="https://arrow.apache.org/img/arrow-logo_hex_black-txt_white-bg.png" align="right" alt="" width="120" />

[![cran](https://www.r-pkg.org/badges/version-last-release/arrow)](https://cran.r-project.org/package=arrow)
[![CI](https://github.com/apache/arrow/workflows/R/badge.svg?event=push)](https://github.com/apache/arrow/actions?query=workflow%3AR+branch%3Amain+event%3Apush)
[![conda-forge](https://img.shields.io/conda/vn/conda-forge/r-arrow.svg)](https://anaconda.org/conda-forge/r-arrow)

[Apache Arrow](https://arrow.apache.org/) is a cross-language
development platform for in-memory and larger-than-memory data. It specifies a standardized
language-independent columnar memory format for flat and hierarchical
Expand Down
2 changes: 1 addition & 1 deletion r/inst/build_arrow_static.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_BUILD_TESTS=OFF \
-DARROW_BUILD_SHARED=OFF \
-DARROW_BUILD_STATIC=ON \
-DARROW_ACERO=${ARROW_ACERO:-$ARROW_DEFAULT_PARAM} \
-DARROW_ACERO=${ARROW_ACERO:-ON} \
-DARROW_COMPUTE=ON \
-DARROW_CSV=ON \
-DARROW_DATASET=${ARROW_DATASET:-ON} \
Expand Down
24 changes: 12 additions & 12 deletions r/man/acero.Rd

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

2 changes: 1 addition & 1 deletion r/man/enums.Rd

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

17 changes: 11 additions & 6 deletions r/tests/testthat/test-compute-sort.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,29 +108,34 @@ test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results
})

test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results on floats", {

test_vec <- tbl$dbl
# Arrow sorts NA and NaN differently, but it's not important, so eliminate here
test_vec[is.nan(test_vec)] <- NA_real_

compare_expression(
sort(.input, decreasing = TRUE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = FALSE),
tbl$dbl,
test_vec,
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = FALSE),
tbl$dbl,
test_vec,
)
})

Expand Down
37 changes: 28 additions & 9 deletions r/tests/testthat/test-dplyr-funcs-conditional.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,8 +377,11 @@ test_that("coalesce()", {
y = c(NA_real_, 2.2, 3.3),
z = c(1.1, 2.2, 3.3)
)
compare_dplyr_binding(
.input %>%

# we can't use compare_dplyr_binding here as dplyr silently converts NaN to NA in coalesce()
# see https://github.com/tidyverse/dplyr/issues/6833
expect_identical(
arrow_table(df) %>%
mutate(
cw = coalesce(w),
cz = coalesce(z),
Expand All@@ -387,21 +390,29 @@ test_that("coalesce()", {
cwxyz = coalesce(w, x, y, z)
) %>%
collect(),
df
mutate(
df,
cw = c(NA, NaN, NA),
cz = c(1.1, 2.2, 3.3),
cwx = c(NA, NaN, 3.3),
cwxy = c(NA, 2.2, 3.3),
cwxyz = c(1.1, 2.2, 3.3)
)
)

# NaNs stay NaN and are not converted to NA in the results
# (testing this requires expect_identical())
expect_identical(
df %>% Table$create() %>% mutate(cwx = coalesce(w, x)) %>% collect(),
df %>% mutate(cwx = coalesce(w, x))
df %>% mutate(cwx = c(NA, NaN, 3.3))
)
expect_identical(
df %>% Table$create() %>% transmute(cw = coalesce(w)) %>% collect(),
df %>% transmute(cw = coalesce(w))
df %>% transmute(cw = w)
)
expect_identical(
df %>% Table$create() %>% transmute(cn = coalesce(NaN)) %>% collect(),
df %>% transmute(cn = coalesce(NaN))
df %>% transmute(cn = NaN)
)
# singles stay single
expect_equal(
Expand All@@ -418,8 +429,8 @@ test_that("coalesce()", {
float32()
)
# with R literal values
compare_dplyr_binding(
.input %>%
expect_identical(
arrow_table(df) %>%
mutate(
c1 = coalesce(4.4),
c2 = coalesce(NA_real_),
Expand All@@ -429,7 +440,15 @@ test_that("coalesce()", {
c6 = coalesce(w, x, y, NaN)
) %>%
collect(),
df
mutate(
df,
c1 = 4.4,
c2 = NA_real_,
c3 = NaN,
c4 = c(5.5, 2.2, 3.3),
c5 = c(NA, 2.2, 3.3),
c6 = c(NaN, 2.2, 3.3)
)
)

# no arguments
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/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -503,6 +503,7 @@ importFrom(tidyselect,one_of)
importFrom(tidyselect,starts_with)
importFrom(tidyselect,vars_pull)
importFrom(utils,capture.output)
importFrom(utils,download.file)
importFrom(utils,getFromNamespace)
importFrom(utils,head)
importFrom(utils,install.packages)
Expand Down
24 changes: 12 additions & 12 deletions r/R/dplyr-funcs-doc.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
#' Functions can be called either as `pkg::fun()` or just `fun()`, i.e. both
#' `str_sub()` and `stringr::str_sub()` work.
#'
#' In addition to these functions, you can call any of Arrow's 246 compute
#' In addition to these functions, you can call any of Arrow's 251 compute
#' functions directly. Arrow has many functions that don't map to an existing R
#' function. In other cases where there is an R function mapping, you can still
#' call the Arrow function directly if you don't want the adaptations that the R
Expand All@@ -99,30 +99,31 @@
#'
#' ## base
#'
#' * [`-`][-()]
#' * [`!`][!()]
#' * [`!=`][!=()]
#' * [`*`][*()]
#' * [`/`][/()]
#' * [`&`][&()]
#' * [`%/%`][%/%()]
#' * [`%%`][%%()]
#' * [`%/%`][%/%()]
#' * [`%in%`][%in%()]
#' * [`^`][^()]
#' * [`&`][&()]
#' * [`*`][*()]
#' * [`+`][+()]
#' * [`-`][-()]
#' * [`/`][/()]
#' * [`<`][<()]
#' * [`<=`][<=()]
#' * [`==`][==()]
#' * [`>`][>()]
#' * [`>=`][>=()]
#' * [`|`][|()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`^`][^()]
#' * [`abs()`][base::abs()]
#' * [`acos()`][base::acos()]
#' * [`all()`][base::all()]
#' * [`any()`][base::any()]
#' * [`as.character()`][base::as.character()]
#' * [`as.Date()`][base::as.Date()]: Multiple `tryFormats` not supported in Arrow.
#' Consider using the lubridate specialised parsing functions `ymd()`, `ymd()`, etc.
#' * [`as.character()`][base::as.character()]
#' * [`as.difftime()`][base::as.difftime()]: only supports `units = "secs"` (the default)
#' * [`as.double()`][base::as.double()]
#' * [`as.integer()`][base::as.integer()]
Expand DownExpand Up@@ -153,8 +154,6 @@
#' * [`is.na()`][base::is.na()]
#' * [`is.nan()`][base::is.nan()]
#' * [`is.numeric()`][base::is.numeric()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`log()`][base::log()]
#' * [`log10()`][base::log10()]
#' * [`log1p()`][base::log1p()]
Expand DownExpand Up@@ -186,6 +185,7 @@
#' * [`tolower()`][base::tolower()]
#' * [`toupper()`][base::toupper()]
#' * [`trunc()`][base::trunc()]
#' * [`|`][|()]
#'
#' ## bit64
#'
Expand DownExpand Up@@ -242,8 +242,8 @@
#' * [`format_ISO8601()`][lubridate::format_ISO8601()]
#' * [`hour()`][lubridate::hour()]
#' * [`is.Date()`][lubridate::is.Date()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.POSIXct()`][lubridate::is.POSIXct()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.timepoint()`][lubridate::is.timepoint()]
#' * [`isoweek()`][lubridate::isoweek()]
#' * [`isoyear()`][lubridate::isoyear()]
Expand Down
1 change: 1 addition & 0 deletions r/R/io.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,6 +232,7 @@ mmap_open <- function(path, mode = c("read", "write", "readwrite")) {
#' @param random_access Logical: whether the result must be a RandomAccessFile
#' @return An `InputStream` or a subclass of one.
#' @keywords internal
#' @importFrom utils download.file
make_readable_file <- function(file, mmap = TRUE, random_access = TRUE) {
if (inherits(file, "SubTreeFileSystem")) {
filesystem <- file$base_fs
Expand Down
4 changes: 0 additions & 4 deletions r/README.md
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
# arrow <img src="https://arrow.apache.org/img/arrow-logo_hex_black-txt_white-bg.png" align="right" alt="" width="120" />

[![cran](https://www.r-pkg.org/badges/version-last-release/arrow)](https://cran.r-project.org/package=arrow)
[![CI](https://github.com/apache/arrow/workflows/R/badge.svg?event=push)](https://github.com/apache/arrow/actions?query=workflow%3AR+branch%3Amain+event%3Apush)
[![conda-forge](https://img.shields.io/conda/vn/conda-forge/r-arrow.svg)](https://anaconda.org/conda-forge/r-arrow)

[Apache Arrow](https://arrow.apache.org/) is a cross-language
development platform for in-memory and larger-than-memory data. It specifies a standardized
language-independent columnar memory format for flat and hierarchical
Expand Down
2 changes: 1 addition & 1 deletion r/inst/build_arrow_static.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_BUILD_TESTS=OFF \
-DARROW_BUILD_SHARED=OFF \
-DARROW_BUILD_STATIC=ON \
-DARROW_ACERO=${ARROW_ACERO:-$ARROW_DEFAULT_PARAM} \
-DARROW_ACERO=${ARROW_ACERO:-ON} \
-DARROW_COMPUTE=ON \
-DARROW_CSV=ON \
-DARROW_DATASET=${ARROW_DATASET:-ON} \
Expand Down
24 changes: 12 additions & 12 deletions r/man/acero.Rd

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

2 changes: 1 addition & 1 deletion r/man/enums.Rd

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

17 changes: 11 additions & 6 deletions r/tests/testthat/test-compute-sort.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,29 +108,34 @@ test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results
})

test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results on floats", {

test_vec <- tbl$dbl
# Arrow sorts NA and NaN differently, but it's not important, so eliminate here
test_vec[is.nan(test_vec)] <- NA_real_

compare_expression(
sort(.input, decreasing = TRUE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = FALSE),
tbl$dbl,
test_vec,
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = FALSE),
tbl$dbl,
test_vec,
)
})

Expand Down
37 changes: 28 additions & 9 deletions r/tests/testthat/test-dplyr-funcs-conditional.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,8 +377,11 @@ test_that("coalesce()", {
y = c(NA_real_, 2.2, 3.3),
z = c(1.1, 2.2, 3.3)
)
compare_dplyr_binding(
.input %>%

# we can't use compare_dplyr_binding here as dplyr silently converts NaN to NA in coalesce()
# see https://github.com/tidyverse/dplyr/issues/6833
expect_identical(
arrow_table(df) %>%
mutate(
cw = coalesce(w),
cz = coalesce(z),
Expand All@@ -387,21 +390,29 @@ test_that("coalesce()", {
cwxyz = coalesce(w, x, y, z)
) %>%
collect(),
df
mutate(
df,
cw = c(NA, NaN, NA),
cz = c(1.1, 2.2, 3.3),
cwx = c(NA, NaN, 3.3),
cwxy = c(NA, 2.2, 3.3),
cwxyz = c(1.1, 2.2, 3.3)
)
)

# NaNs stay NaN and are not converted to NA in the results
# (testing this requires expect_identical())
expect_identical(
df %>% Table$create() %>% mutate(cwx = coalesce(w, x)) %>% collect(),
df %>% mutate(cwx = coalesce(w, x))
df %>% mutate(cwx = c(NA, NaN, 3.3))
)
expect_identical(
df %>% Table$create() %>% transmute(cw = coalesce(w)) %>% collect(),
df %>% transmute(cw = coalesce(w))
df %>% transmute(cw = w)
)
expect_identical(
df %>% Table$create() %>% transmute(cn = coalesce(NaN)) %>% collect(),
df %>% transmute(cn = coalesce(NaN))
df %>% transmute(cn = NaN)
)
# singles stay single
expect_equal(
Expand All@@ -418,8 +429,8 @@ test_that("coalesce()", {
float32()
)
# with R literal values
compare_dplyr_binding(
.input %>%
expect_identical(
arrow_table(df) %>%
mutate(
c1 = coalesce(4.4),
c2 = coalesce(NA_real_),
Expand All@@ -429,7 +440,15 @@ test_that("coalesce()", {
c6 = coalesce(w, x, y, NaN)
) %>%
collect(),
df
mutate(
df,
c1 = 4.4,
c2 = NA_real_,
c3 = NaN,
c4 = c(5.5, 2.2, 3.3),
c5 = c(NA, 2.2, 3.3),
c6 = c(NaN, 2.2, 3.3)
)
)

# no arguments
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/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -503,6 +503,7 @@ importFrom(tidyselect,one_of)
importFrom(tidyselect,starts_with)
importFrom(tidyselect,vars_pull)
importFrom(utils,capture.output)
importFrom(utils,download.file)
importFrom(utils,getFromNamespace)
importFrom(utils,head)
importFrom(utils,install.packages)
Expand Down
24 changes: 12 additions & 12 deletions r/R/dplyr-funcs-doc.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
#' Functions can be called either as `pkg::fun()` or just `fun()`, i.e. both
#' `str_sub()` and `stringr::str_sub()` work.
#'
#' In addition to these functions, you can call any of Arrow's 246 compute
#' In addition to these functions, you can call any of Arrow's 251 compute
#' functions directly. Arrow has many functions that don't map to an existing R
#' function. In other cases where there is an R function mapping, you can still
#' call the Arrow function directly if you don't want the adaptations that the R
Expand All@@ -99,30 +99,31 @@
#'
#' ## base
#'
#' * [`-`][-()]
#' * [`!`][!()]
#' * [`!=`][!=()]
#' * [`*`][*()]
#' * [`/`][/()]
#' * [`&`][&()]
#' * [`%/%`][%/%()]
#' * [`%%`][%%()]
#' * [`%/%`][%/%()]
#' * [`%in%`][%in%()]
#' * [`^`][^()]
#' * [`&`][&()]
#' * [`*`][*()]
#' * [`+`][+()]
#' * [`-`][-()]
#' * [`/`][/()]
#' * [`<`][<()]
#' * [`<=`][<=()]
#' * [`==`][==()]
#' * [`>`][>()]
#' * [`>=`][>=()]
#' * [`|`][|()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`^`][^()]
#' * [`abs()`][base::abs()]
#' * [`acos()`][base::acos()]
#' * [`all()`][base::all()]
#' * [`any()`][base::any()]
#' * [`as.character()`][base::as.character()]
#' * [`as.Date()`][base::as.Date()]: Multiple `tryFormats` not supported in Arrow.
#' Consider using the lubridate specialised parsing functions `ymd()`, `ymd()`, etc.
#' * [`as.character()`][base::as.character()]
#' * [`as.difftime()`][base::as.difftime()]: only supports `units = "secs"` (the default)
#' * [`as.double()`][base::as.double()]
#' * [`as.integer()`][base::as.integer()]
Expand DownExpand Up@@ -153,8 +154,6 @@
#' * [`is.na()`][base::is.na()]
#' * [`is.nan()`][base::is.nan()]
#' * [`is.numeric()`][base::is.numeric()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
#' * [`log()`][base::log()]
#' * [`log10()`][base::log10()]
#' * [`log1p()`][base::log1p()]
Expand DownExpand Up@@ -186,6 +185,7 @@
#' * [`tolower()`][base::tolower()]
#' * [`toupper()`][base::toupper()]
#' * [`trunc()`][base::trunc()]
#' * [`|`][|()]
#'
#' ## bit64
#'
Expand DownExpand Up@@ -242,8 +242,8 @@
#' * [`format_ISO8601()`][lubridate::format_ISO8601()]
#' * [`hour()`][lubridate::hour()]
#' * [`is.Date()`][lubridate::is.Date()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.POSIXct()`][lubridate::is.POSIXct()]
#' * [`is.instant()`][lubridate::is.instant()]
#' * [`is.timepoint()`][lubridate::is.timepoint()]
#' * [`isoweek()`][lubridate::isoweek()]
#' * [`isoyear()`][lubridate::isoyear()]
Expand Down
1 change: 1 addition & 0 deletions r/R/io.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,6 +232,7 @@ mmap_open <- function(path, mode = c("read", "write", "readwrite")) {
#' @param random_access Logical: whether the result must be a RandomAccessFile
#' @return An `InputStream` or a subclass of one.
#' @keywords internal
#' @importFrom utils download.file
make_readable_file <- function(file, mmap = TRUE, random_access = TRUE) {
if (inherits(file, "SubTreeFileSystem")) {
filesystem <- file$base_fs
Expand Down
4 changes: 0 additions & 4 deletions r/README.md
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
# arrow <img src="https://arrow.apache.org/img/arrow-logo_hex_black-txt_white-bg.png" align="right" alt="" width="120" />

[![cran](https://www.r-pkg.org/badges/version-last-release/arrow)](https://cran.r-project.org/package=arrow)
[![CI](https://github.com/apache/arrow/workflows/R/badge.svg?event=push)](https://github.com/apache/arrow/actions?query=workflow%3AR+branch%3Amain+event%3Apush)
[![conda-forge](https://img.shields.io/conda/vn/conda-forge/r-arrow.svg)](https://anaconda.org/conda-forge/r-arrow)

[Apache Arrow](https://arrow.apache.org/) is a cross-language
development platform for in-memory and larger-than-memory data. It specifies a standardized
language-independent columnar memory format for flat and hierarchical
Expand Down
2 changes: 1 addition & 1 deletion r/inst/build_arrow_static.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_BUILD_TESTS=OFF \
-DARROW_BUILD_SHARED=OFF \
-DARROW_BUILD_STATIC=ON \
-DARROW_ACERO=${ARROW_ACERO:-$ARROW_DEFAULT_PARAM} \
-DARROW_ACERO=${ARROW_ACERO:-ON} \
-DARROW_COMPUTE=ON \
-DARROW_CSV=ON \
-DARROW_DATASET=${ARROW_DATASET:-ON} \
Expand Down
24 changes: 12 additions & 12 deletions r/man/acero.Rd

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

2 changes: 1 addition & 1 deletion r/man/enums.Rd

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

17 changes: 11 additions & 6 deletions r/tests/testthat/test-compute-sort.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,29 +108,34 @@ test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results
})

test_that("sort(vector), sort(Array), sort(ChunkedArray) give equivalent results on floats", {

test_vec <- tbl$dbl
# Arrow sorts NA and NaN differently, but it's not important, so eliminate here
test_vec[is.nan(test_vec)] <- NA_real_

compare_expression(
sort(.input, decreasing = TRUE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = TRUE),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = TRUE, na.last = FALSE),
tbl$dbl,
test_vec,
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = NA),
tbl$dbl
test_vec
)
compare_expression(
sort(.input, decreasing = FALSE, na.last = FALSE),
tbl$dbl,
test_vec,
)
})

Expand Down
37 changes: 28 additions & 9 deletions r/tests/testthat/test-dplyr-funcs-conditional.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,8 +377,11 @@ test_that("coalesce()", {
y = c(NA_real_, 2.2, 3.3),
z = c(1.1, 2.2, 3.3)
)
compare_dplyr_binding(
.input %>%

# we can't use compare_dplyr_binding here as dplyr silently converts NaN to NA in coalesce()
# see https://github.com/tidyverse/dplyr/issues/6833
expect_identical(
arrow_table(df) %>%
mutate(
cw = coalesce(w),
cz = coalesce(z),
Expand All@@ -387,21 +390,29 @@ test_that("coalesce()", {
cwxyz = coalesce(w, x, y, z)
) %>%
collect(),
df
mutate(
df,
cw = c(NA, NaN, NA),
cz = c(1.1, 2.2, 3.3),
cwx = c(NA, NaN, 3.3),
cwxy = c(NA, 2.2, 3.3),
cwxyz = c(1.1, 2.2, 3.3)
)
)

# NaNs stay NaN and are not converted to NA in the results
# (testing this requires expect_identical())
expect_identical(
df %>% Table$create() %>% mutate(cwx = coalesce(w, x)) %>% collect(),
df %>% mutate(cwx = coalesce(w, x))
df %>% mutate(cwx = c(NA, NaN, 3.3))
)
expect_identical(
df %>% Table$create() %>% transmute(cw = coalesce(w)) %>% collect(),
df %>% transmute(cw = coalesce(w))
df %>% transmute(cw = w)
)
expect_identical(
df %>% Table$create() %>% transmute(cn = coalesce(NaN)) %>% collect(),
df %>% transmute(cn = coalesce(NaN))
df %>% transmute(cn = NaN)
)
# singles stay single
expect_equal(
Expand All@@ -418,8 +429,8 @@ test_that("coalesce()", {
float32()
)
# with R literal values
compare_dplyr_binding(
.input %>%
expect_identical(
arrow_table(df) %>%
mutate(
c1 = coalesce(4.4),
c2 = coalesce(NA_real_),
Expand All@@ -429,7 +440,15 @@ test_that("coalesce()", {
c6 = coalesce(w, x, y, NaN)
) %>%
collect(),
df
mutate(
df,
c1 = 4.4,
c2 = NA_real_,
c3 = NaN,
c4 = c(5.5, 2.2, 3.3),
c5 = c(NA, 2.2, 3.3),
c6 = c(NaN, 2.2, 3.3)
)
)

# no arguments
Expand Down