This is an automated email from the ASF dual-hosted git repository.
thisisnic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 66e307084f GH-50495: [R] 25.0.0 Release followups (#50786)
66e307084f is described below
commit 66e307084f78f38aee9c3dc77e206b1628511a9d
Author: Nic Crane <[email protected]>
AuthorDate: Mon Aug 3 13:51:43 2026 -0400
GH-50495: [R] 25.0.0 Release followups (#50786)
### Rationale for this change
Changes from release branch need porting to main
### What changes are included in this PR?
Port them to main
### Are these changes tested?
No
### Are there any user-facing changes?
Sure, we removed two defunct funcs
* GitHub Issue: #50495
Authored-by: Nic Crane <[email protected]>
Signed-off-by: Nic Crane <[email protected]>
---
r/NAMESPACE | 2 --
r/R/arrow-info.R | 6 ------
r/R/dataset-format.R | 1 -
r/R/dplyr-funcs-doc.R | 34 +++++++++++++++++-----------------
r/R/filesystem.R | 3 +++
r/R/type.R | 8 --------
r/data-raw/docgen.R | 8 +++++++-
r/man/FileSystem.Rd | 4 ++--
r/man/acero.Rd | 36 ++++++++++++++++++------------------
r/man/arrow_info.Rd | 3 ---
r/man/infer_type.Rd | 5 +----
r/src/type_infer.cpp | 2 +-
r/tests/testthat/test-arrow-info.R | 4 ----
r/tests/testthat/test-type.R | 9 ---------
14 files changed, 49 insertions(+), 76 deletions(-)
diff --git a/r/NAMESPACE b/r/NAMESPACE
index 46c29b3e93..a96b77fdda 100644
--- a/r/NAMESPACE
+++ b/r/NAMESPACE
@@ -279,7 +279,6 @@ export(Type)
export(UnionDataset)
export(all_of)
export(arrow_array)
-export(arrow_available)
export(arrow_info)
export(arrow_table)
export(arrow_with_acero)
@@ -406,7 +405,6 @@ export(time64)
export(timestamp)
export(to_arrow)
export(to_duckdb)
-export(type)
export(uint16)
export(uint32)
export(uint64)
diff --git a/r/R/arrow-info.R b/r/R/arrow-info.R
index 91b46788aa..64d292712d 100644
--- a/r/R/arrow-info.R
+++ b/r/R/arrow-info.R
@@ -74,12 +74,6 @@ arrow_info <- function() {
structure(out, class = "arrow_info")
}
-#' @rdname arrow_info
-#' @export
-arrow_available <- function() {
- .Deprecated(msg = "Arrow C++ is always available as of 7.0.0")
- TRUE
-}
#' @rdname arrow_info
#' @export
diff --git a/r/R/dataset-format.R b/r/R/dataset-format.R
index 4f84d5831e..5119688104 100644
--- a/r/R/dataset-format.R
+++ b/r/R/dataset-format.R
@@ -144,7 +144,6 @@ IpcFileFormat <- R6Class("IpcFileFormat", inherit =
FileFormat)
#' @rdname JsonFileFormat
#' @name JsonFileFormat
#' @seealso [FileFormat]
-#' @examplesIf arrow_with_dataset()
#'
#' @export
JsonFileFormat <- R6Class("JsonFileFormat", inherit = FileFormat)
diff --git a/r/R/dplyr-funcs-doc.R b/r/R/dplyr-funcs-doc.R
index 2f5bbc11b6..1adf23fba1 100644
--- a/r/R/dplyr-funcs-doc.R
+++ b/r/R/dplyr-funcs-doc.R
@@ -100,24 +100,24 @@
#'
#' ## base
#'
-#' * [`!`][!()]
-#' * [`!=`][!=()]
-#' * [`%%`][%%()]
-#' * [`%/%`][%/%()]
-#' * [`%in%`][%in%()]
-#' * [`&`][&()]
-#' * [`*`][*()]
-#' * [`+`][+()]
-#' * [`-`][-()]
-#' * [`/`][/()]
-#' * [`<`][<()]
-#' * [`<=`][<=()]
-#' * [`==`][==()]
-#' * [`>`][>()]
-#' * [`>=`][>=()]
+#' * [`!`][base::!()]
+#' * [`!=`][base::!=()]
+#' * [`%%`][base::%%()]
+#' * [`%/%`][base::%/%()]
+#' * [`%in%`][base::%in%()]
+#' * [`&`][base::&()]
+#' * [`*`][base::*()]
+#' * [`+`][base::+()]
+#' * [`-`][base::-()]
+#' * [`/`][base::/()]
+#' * [`<`][base::<()]
+#' * [`<=`][base::<=()]
+#' * [`==`][base::==()]
+#' * [`>`][base::>()]
+#' * [`>=`][base::>=()]
#' * [`ISOdate()`][base::ISOdate()]
#' * [`ISOdatetime()`][base::ISOdatetime()]
-#' * [`^`][^()]
+#' * [`^`][base::^()]
#' * [`abs()`][base::abs()]
#' * [`acos()`][base::acos()]
#' * [`acosh()`][base::acosh()]
@@ -195,7 +195,7 @@
#' * [`tolower()`][base::tolower()]
#' * [`toupper()`][base::toupper()]
#' * [`trunc()`][base::trunc()]
-#' * [`|`][|()]
+#' * [`|`][base::|()]
#'
#' ## bit64
#'
diff --git a/r/R/filesystem.R b/r/R/filesystem.R
index abbc9cd6c5..3ef5f483e2 100644
--- a/r/R/filesystem.R
+++ b/r/R/filesystem.R
@@ -282,6 +282,9 @@ FileSelector$create <- function(base_dir, allow_not_found =
FALSE, recursive = F
#' `AzureDefaultCredential` for authentication, so that several authentication
#' types are tried until one succeeds.
#'
+#' `AzureFileSystem` is not presently supported on Windows due to upstream
+#' compatibility issues between the Azure C++ SDK and the MinGW toolchain.
+#'
#' @usage NULL
#' @format NULL
#' @docType class
diff --git a/r/R/type.R b/r/R/type.R
index 14a4c8f1d2..da60b027de 100644
--- a/r/R/type.R
+++ b/r/R/type.R
@@ -69,8 +69,6 @@ FLOAT_TYPES <- c("float16", "float32", "float64",
"halffloat", "float", "double"
#' Infer the arrow Array type from an R object
#'
-#' [type()] is deprecated in favor of [infer_type()].
-#'
#' @param x an R object (usually a vector) to be converted to an [Array] or
#' [ChunkedArray].
#' @param ... Passed to S3 methods
@@ -88,12 +86,6 @@ FLOAT_TYPES <- c("float16", "float32", "float64",
"halffloat", "float", "double"
#' @export
infer_type <- function(x, ...) UseMethod("infer_type")
-#' @rdname infer_type
-#' @export
-type <- function(x) {
- .Deprecated("infer_type")
- infer_type(x)
-}
#' @export
infer_type.default <- function(x, ..., from_array_infer_type = FALSE) {
diff --git a/r/data-raw/docgen.R b/r/data-raw/docgen.R
index 13e9195cce..7b577323f2 100644
--- a/r/data-raw/docgen.R
+++ b/r/data-raw/docgen.R
@@ -101,10 +101,16 @@ render_fun <- function(fun, pkg_fun, notes) {
# Make it \code{} for better formatting
fun <- paste0("`", fun, "`")
# Wrap in \link{}
+ # Operators need base:: prefix to disambiguate from other packages (e.g.
bit64)
+ link_target <- ifelse(
+ !not_operators & !grepl("::", pkg_fun),
+ paste0("base::", pkg_fun),
+ pkg_fun
+ )
out <- ifelse(
pkg_fun %in% do_not_link,
fun,
- paste0("[", fun, "][", pkg_fun, "()]")
+ paste0("[", fun, "][", link_target, "()]")
)
# Add notes after :, if exist
has_notes <- nzchar(notes)
diff --git a/r/man/FileSystem.Rd b/r/man/FileSystem.Rd
index 0ecb391549..f21c69c0a5 100644
--- a/r/man/FileSystem.Rd
+++ b/r/man/FileSystem.Rd
@@ -194,7 +194,7 @@ On \code{AzureFileSystem}, passing no arguments for
authentication uses the
\code{AzureDefaultCredential} for authentication, so that several
authentication
types are tried until one succeeds.
-\code{AzureFileSystem} is not presently supported on Windows due to upstream
compatibility
-issues between the Azure C++ SDK and the MinGW toolchain.
+\code{AzureFileSystem} is not presently supported on Windows due to upstream
+compatibility issues between the Azure C++ SDK and the MinGW toolchain.
}
diff --git a/r/man/acero.Rd b/r/man/acero.Rd
index 3821eaef3a..0cd6e284e4 100644
--- a/r/man/acero.Rd
+++ b/r/man/acero.Rd
@@ -72,7 +72,7 @@ can assume that the function works in Acero just as it does
in R.
Functions can be called either as \code{pkg::fun()} or just \code{fun()}, i.e.
both
\code{str_sub()} and \code{stringr::str_sub()} work.
-In addition to these functions, you can call any of Arrow's 281 compute
+In addition to these functions, you can call any of Arrow's 254 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
@@ -89,24 +89,24 @@ as \code{arrow_ascii_is_decimal}.
\subsection{base}{
\itemize{
-\item \code{\link{!}}
-\item \code{\link{!=}}
-\item \code{\link{\%\%}}
-\item \code{\link{\%/\%}}
-\item \code{\link{\%in\%}}
-\item \code{\link{&}}
-\item \code{\link{*}}
-\item \code{\link{+}}
-\item \code{\link{-}}
-\item \code{\link{/}}
-\item \code{\link{<}}
-\item \code{\link{<=}}
-\item \code{\link{==}}
-\item \code{\link{>}}
-\item \code{\link{>=}}
+\item \code{\link[base:!]{!}}
+\item \code{\link[base:!=]{!=}}
+\item \code{\link[base:\%\%]{\%\%}}
+\item \code{\link[base:\%/\%]{\%/\%}}
+\item \code{\link[base:\%in\%]{\%in\%}}
+\item \code{\link[base:&]{&}}
+\item \code{\link[base:*]{*}}
+\item \code{\link[base:+]{+}}
+\item \code{\link[base:-]{-}}
+\item \code{\link[base:/]{/}}
+\item \code{\link[base:<]{<}}
+\item \code{\link[base:<=]{<=}}
+\item \code{\link[base:==]{==}}
+\item \code{\link[base:>]{>}}
+\item \code{\link[base:>=]{>=}}
\item \code{\link[base:ISOdate]{ISOdate()}}
\item \code{\link[base:ISOdatetime]{ISOdatetime()}}
-\item \code{\link{^}}
+\item \code{\link[base:^]{^}}
\item \code{\link[base:abs]{abs()}}
\item \code{\link[base:acos]{acos()}}
\item \code{\link[base:acosh]{acosh()}}
@@ -184,7 +184,7 @@ Valid values are "s", "ms" (default), "us", "ns".
\item \code{\link[base:tolower]{tolower()}}
\item \code{\link[base:toupper]{toupper()}}
\item \code{\link[base:trunc]{trunc()}}
-\item \code{\link{|}}
+\item \code{\link[base:|]{|}}
}
}
diff --git a/r/man/arrow_info.Rd b/r/man/arrow_info.Rd
index 4e6d12c46c..628fd136ec 100644
--- a/r/man/arrow_info.Rd
+++ b/r/man/arrow_info.Rd
@@ -2,7 +2,6 @@
% Please edit documentation in R/arrow-info.R
\name{arrow_info}
\alias{arrow_info}
-\alias{arrow_available}
\alias{arrow_with_acero}
\alias{arrow_with_dataset}
\alias{arrow_with_substrait}
@@ -15,8 +14,6 @@
\usage{
arrow_info()
-arrow_available()
-
arrow_with_acero()
arrow_with_dataset()
diff --git a/r/man/infer_type.Rd b/r/man/infer_type.Rd
index 1bba272556..92c430d415 100644
--- a/r/man/infer_type.Rd
+++ b/r/man/infer_type.Rd
@@ -2,12 +2,9 @@
% Please edit documentation in R/type.R
\name{infer_type}
\alias{infer_type}
-\alias{type}
\title{Infer the arrow Array type from an R object}
\usage{
infer_type(x, ...)
-
-type(x)
}
\arguments{
\item{x}{an R object (usually a vector) to be converted to an \link{Array} or
@@ -19,7 +16,7 @@ type(x)
An arrow \link[=data-type]{data type}
}
\description{
-\code{\link[=type]{type()}} is deprecated in favor of
\code{\link[=infer_type]{infer_type()}}.
+Infer the arrow Array type from an R object
}
\examples{
infer_type(1:10)
diff --git a/r/src/type_infer.cpp b/r/src/type_infer.cpp
index 76a1499305..b492cfde1c 100644
--- a/r/src/type_infer.cpp
+++ b/r/src/type_infer.cpp
@@ -222,7 +222,7 @@ std::shared_ptr<arrow::DataType> InferArrowType(SEXP x) {
cpp11::sexp type_result = cpp11::package("arrow")["infer_type"](
x, cpp11::named_arg("from_array_infer_type") = true);
if (!Rf_inherits(type_result, "DataType")) {
- cpp11::stop("type() did not return an object of type DataType");
+ cpp11::stop("infer_type() did not return an object of type DataType");
}
return cpp11::as_cpp<std::shared_ptr<arrow::DataType>>(type_result);
diff --git a/r/tests/testthat/test-arrow-info.R
b/r/tests/testthat/test-arrow-info.R
index addd3d740c..9eac608148 100644
--- a/r/tests/testthat/test-arrow-info.R
+++ b/r/tests/testthat/test-arrow-info.R
@@ -21,7 +21,3 @@ test_that("arrow_info()", {
options(arrow.foo = FALSE)
expect_output(print(arrow_info()), "arrow.foo")
})
-
-test_that("arrow_available() is deprecated", {
- expect_deprecated(arrow_available(), "always")
-})
diff --git a/r/tests/testthat/test-type.R b/r/tests/testthat/test-type.R
index 74c868faac..e45dd2c051 100644
--- a/r/tests/testthat/test-type.R
+++ b/r/tests/testthat/test-type.R
@@ -327,15 +327,6 @@ test_that("infer_type() infers type for vctrs", {
)
})
-test_that("type() is deprecated", {
- a <- Array$create(1:10)
- expect_deprecated(
- a_type <- type(a),
- "infer_type"
- )
- expect_equal(a_type, a$type)
-})
-
test_that("infer_type() infers type for lists of raw() as binary()", {
expect_equal(
infer_type(list(raw())),
