WIP: [R] Verify CRAN release 19.0.1.1#46036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
amoeba wants to merge 8 commits into from
Closed

WIP: [R] Verify CRAN release 19.0.1.1 #46036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cd80a87
GH-45850: Fix r-devel note about symbols in .a libs (#45870)
nealrichardson Mar 20, 2025
7dd6d01
MINOR: [R] Don't print that we're cleaning up static libs (#45958)
nealrichardson Mar 28, 2025
453c1f4
GH-45949: [R] Fix CRAN warnings for 19.0.1 about compiled code (#45951)
jonkeane Apr 5, 2025
709d70f
GH-45987: [C++] Set CMAKE_POLICY_VERSION_MINIMUM=3.5 for bundled depe…
assignUser Apr 1, 2025
8333cf2
GH-45499: [CI] Bump actions/cache version on GHA (#45500)
pitrou Feb 11, 2025
6e49131
Update NEWS.md
amoeba Apr 7, 2025
aba40f5
19.0.1.1
amoeba Apr 7, 2025
b60cb1f
Move Version out from inside of Authors@R
jonkeane Apr 7, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/cpp.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ jobs:
fetch-depth: 0
submodules: recursive
- name: Cache Docker Volumes
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
uses: actions/cache@v4
with:
path: .docker
key: ${{ matrix.image }}-${{ hashFiles('cpp/**') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ jobs:
run: |
ci/scripts/util_free_space.sh
- name: Cache Docker Volumes
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
uses: actions/cache@v4
with:
path: .docker
key: debian-docs-${{ hashFiles('cpp/**') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs_light.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
with:
fetch-depth: 0
- name: Cache Docker Volumes
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
uses: actions/cache@v4
with:
path: .docker
key: conda-docs-${{ hashFiles('cpp/**') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ jobs:
run: |
ci/scripts/util_free_space.sh
- name: Cache Docker Volumes
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
uses: actions/cache@v4
with:
path: .docker
key: conda-${{ hashFiles('cpp/**') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
fetch-depth: 0
submodules: recursive
- name: Cache Docker Volumes
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
uses: actions/cache@v4
with:
path: .docker
key: ${{ matrix.cache }}-${{ hashFiles('cpp/**') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/r.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ jobs:
run: |
ci/scripts/util_free_space.sh
- name: Cache Docker Volumes
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
uses: actions/cache@v4
with:
path: .docker
# As this key is identical on both matrix builds only one will be able to successfully cache,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/r_nightly.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ jobs:
exit 1
fi
- name: Cache Repo
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
uses: actions/cache@v4
with:
path: repo
key: r-nightly-${{ github.run_id }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ jobs:
fetch-depth: 0
submodules: recursive
- name: Cache Docker Volumes
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
uses: actions/cache@v4
with:
path: .docker
key: ubuntu-${{ matrix.ubuntu }}-ruby-${{ hashFiles('cpp/**') }}
Expand Down
5 changes: 4 additions & 1 deletion cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -967,7 +967,8 @@ set(EP_COMMON_CMAKE_ARGS
-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}
-DCMAKE_INSTALL_LIBDIR=lib
-DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE})
-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
-DCMAKE_POLICY_VERSION_MINIMUM=3.5)

# if building with a toolchain file, pass that through
if(CMAKE_TOOLCHAIN_FILE)
Expand DownExpand Up@@ -1033,6 +1034,8 @@ macro(prepare_fetchcontent)
set(CMAKE_COMPILE_WARNING_AS_ERROR FALSE)
set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY TRUE)
set(CMAKE_MACOSX_RPATH ${ARROW_INSTALL_NAME_RPATH})
set(CMAKE_POLICY_VERSION_MINIMUM 3.5)

if(MSVC)
string(REPLACE "/WX" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
string(REPLACE "/WX" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
Expand Down
2 changes: 1 addition & 1 deletion r/DESCRIPTION
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 19.0.1
Version: 19.0.1.1
Authors@R: c(
person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down
7 changes: 7 additions & 0 deletions r/NEWS.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
under the License.
-->

# arrow 19.0.1.1

## Minor improvements and fixes

- Updated internal code to comply with new CRAN requirements on non-API calls ([#45949](https://github.com/apache/arrow/issues/45949))
- Enable building the bundled third-party libraries under CMake 4.0 ([#45987](https://github.com/apache/arrow/issues/45987))
Comment on lines +22 to +25

@jonkeanejonkeaneApr 7, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for these! Good summary


# arrow 19.0.1

This release primarily updates the underlying Arrow C++ version used by the
Expand Down
5 changes: 5 additions & 0 deletions r/src/Makevars.in
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,3 +27,8 @@ PKG_CPPFLAGS=@cflags@
# PKG_CXXFLAGS=$(CXX_VISIBILITY)
CXX_STD=CXX17
PKG_LIBS=@libs@

all: $(SHLIB) purify

purify: $(SHLIB)
@rm -rf ../libarrow || true
52 changes: 35 additions & 17 deletions r/src/altrep.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ const std::shared_ptr<ChunkedArray>& GetChunkedArray(SEXP alt) {
// materialization is needed.
// data2: starts as NULL, and becomes a standard R vector with the same
// data if necessary: if materialization is needed, e.g. if we need
// to access its data pointer, with DATAPTR().
// to access its data pointer, with INTEGER(), REAL(), etc.
template <typename Impl>
struct AltrepVectorBase {
// store the Array as an external pointer in data1, mark as immutable
Expand DownExpand Up@@ -220,7 +220,14 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
SEXP copy = PROTECT(Rf_allocVector(sexp_type, size));

// copy the data from the array, through Get_region
Get_region(alt, 0, size, reinterpret_cast<c_type*>(DATAPTR(copy)));
if constexpr (std::is_same_v<c_type, double>) {
Get_region(alt, 0, size, REAL(copy));
} else if constexpr (std::is_same_v<c_type, int>) {
Get_region(alt, 0, size, INTEGER(copy));
} else {
static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
"ALTREP not implemented for this c_type");
}

// store as data2, this is now considered materialized
SetRepresentation(alt, copy);
Expand DownExpand Up@@ -269,13 +276,27 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
}

// Otherwise we have to materialize and hand the pointer to data2
return DATAPTR(Materialize(alt));
if constexpr (std::is_same_v<c_type, double>) {
return REAL(Materialize(alt));
} else if constexpr (std::is_same_v<c_type, int>) {
return INTEGER(Materialize(alt));
} else {
static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
"ALTREP not implemented for this c_type");
}
}

// The value at position i
static c_type Elt(SEXP alt, R_xlen_t i) {
if (IsMaterialized(alt)) {
return reinterpret_cast<c_type*>(DATAPTR(Representation(alt)))[i];
if constexpr (std::is_same_v<c_type, double>) {
return REAL(Representation(alt))[i];
} else if constexpr (std::is_same_v<c_type, int>) {
return INTEGER(Representation(alt))[i];
} else {
static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
"ALTREP not implemented for this c_type");
}
}

auto altrep_data =
Expand DownExpand Up@@ -531,7 +552,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
SEXP copy = PROTECT(Rf_allocVector(INTSXP, size));

// copy the data from the array, through Get_region
Get_region(alt, 0, size, reinterpret_cast<int*>(DATAPTR(copy)));
Get_region(alt, 0, size, INTEGER(copy));

// store as data2, this is now considered materialized
SetRepresentation(alt, copy);
Expand All@@ -552,7 +573,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
return nullptr;
}

static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
static void* Dataptr(SEXP alt, Rboolean writeable) { return INTEGER(Materialize(alt)); }

static SEXP Duplicate(SEXP alt, Rboolean /* deep */) {
// the representation integer vector
Expand DownExpand Up@@ -892,7 +913,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
return s;
}

static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
static void* Dataptr(SEXP alt, Rboolean writeable) {
return const_cast<void*>(DATAPTR_RO(Materialize(alt)));
}

static SEXP Materialize(SEXP alt) {
if (Base::IsMaterialized(alt)) {
Expand DownExpand Up@@ -931,7 +954,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
}

static const void* Dataptr_or_null(SEXP alt) {
if (Base::IsMaterialized(alt)) return DATAPTR(Representation(alt));
if (Base::IsMaterialized(alt)) {
return DATAPTR_RO(alt);
}

// otherwise give up
return nullptr;
Expand DownExpand Up@@ -1267,21 +1292,14 @@ sexp test_arrow_altrep_copy_by_dataptr(sexp x) {

if (TYPEOF(x) == INTSXP) {
cpp11::writable::integers out(Rf_xlength(x));
int* ptr = reinterpret_cast<int*>(DATAPTR(x));
int* ptr = INTEGER(x);
for (R_xlen_t i = 0; i < n; i++) {
out[i] = ptr[i];
}
return out;
} else if (TYPEOF(x) == REALSXP) {
cpp11::writable::doubles out(Rf_xlength(x));
double* ptr = reinterpret_cast<double*>(DATAPTR(x));
for (R_xlen_t i = 0; i < n; i++) {
out[i] = ptr[i];
}
return out;
} else if (TYPEOF(x) == STRSXP) {
cpp11::writable::strings out(Rf_xlength(x));
SEXP* ptr = reinterpret_cast<SEXP*>(DATAPTR(x));
double* ptr = REAL(x);
for (R_xlen_t i = 0; i < n; i++) {
out[i] = ptr[i];
}
Expand Down
20 changes: 19 additions & 1 deletion r/src/arrow_types.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,14 +173,32 @@ template <typename RVector>
class RBuffer : public MutableBuffer {
public:
explicit RBuffer(RVector vec)
: MutableBuffer(reinterpret_cast<uint8_t*>(DATAPTR(vec)),
: MutableBuffer(reinterpret_cast<uint8_t*>(getDataPointer(vec)),
vec.size() * sizeof(typename RVector::value_type),
arrow::CPUDevice::memory_manager(gc_memory_pool())),
vec_(vec) {}

private:
// vec_ holds the memory
RVector vec_;

static void* getDataPointer(RVector& vec) {
if (TYPEOF(vec) == LGLSXP) {
return LOGICAL(vec);
} else if (TYPEOF(vec) == INTSXP) {
return INTEGER(vec);
} else if (TYPEOF(vec) == REALSXP) {
return REAL(vec);
} else if (TYPEOF(vec) == CPLXSXP) {
return COMPLEX(vec);
} else if (TYPEOF(vec) == STRSXP) {
// We don't want to expose the string data here, so we error
cpp11::stop("Operation not supported for string vectors.");
} else {
// raw
return RAW(vec);
}
}
};

std::shared_ptr<arrow::DataType> InferArrowTypeFromFactor(SEXP);
Expand Down
12 changes: 6 additions & 6 deletions r/src/r_to_arrow.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1214,11 +1214,11 @@ bool can_reuse_memory(SEXP x, const std::shared_ptr<arrow::DataType>& type) {
// because MakeSimpleArray below will force materialization
switch (type->id()) {
case Type::INT32:
return TYPEOF(x) == INTSXP && !OBJECT(x);
return TYPEOF(x) == INTSXP && !Rf_isObject(x);
case Type::DOUBLE:
return TYPEOF(x) == REALSXP && !OBJECT(x);
return TYPEOF(x) == REALSXP && !Rf_isObject(x);
case Type::INT8:
return TYPEOF(x) == RAWSXP && !OBJECT(x);
return TYPEOF(x) == RAWSXP && !Rf_isObject(x);
case Type::INT64:
return TYPEOF(x) == REALSXP && Rf_inherits(x, "integer64");
default:
Expand DownExpand Up@@ -1412,17 +1412,17 @@ bool vector_from_r_memory(SEXP x, const std::shared_ptr<DataType>& type,

switch (type->id()) {
case Type::INT32:
return TYPEOF(x) == INTSXP && !OBJECT(x) &&
return TYPEOF(x) == INTSXP && !Rf_isObject(x) &&
vector_from_r_memory_impl<cpp11::integers, Int32Type>(x, type, columns, j,
tasks);

case Type::DOUBLE:
return TYPEOF(x) == REALSXP && !OBJECT(x) &&
return TYPEOF(x) == REALSXP && !Rf_isObject(x) &&
vector_from_r_memory_impl<cpp11::doubles, DoubleType>(x, type, columns, j,
tasks);

case Type::UINT8:
return TYPEOF(x) == RAWSXP && !OBJECT(x) &&
return TYPEOF(x) == RAWSXP && !Rf_isObject(x) &&
vector_from_r_memory_impl<cpp11::raws, UInt8Type>(x, type, columns, j,
tasks);

Expand Down
14 changes: 6 additions & 8 deletions r/tests/testthat/test-altrep.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ test_that("element access methods for int32 ALTREP with nulls", {
expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
expect_false(test_arrow_altrep_is_materialized(altrep))

# because there are no nulls, DATAPTR() does not materialize
# because there are nulls, DATAPTR() does materialize
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
expect_true(test_arrow_altrep_is_materialized(altrep))

Expand All@@ -193,7 +193,7 @@ test_that("element access methods for double ALTREP with nulls", {
expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
expect_false(test_arrow_altrep_is_materialized(altrep))

# because there are no nulls, DATAPTR() does not materialize
# because there are nulls, DATAPTR() does materialize
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
expect_true(test_arrow_altrep_is_materialized(altrep))

Expand DownExpand Up@@ -244,14 +244,13 @@ test_that("element access methods for character ALTREP", {
expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
expect_false(test_arrow_altrep_is_materialized(altrep))

# DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
# match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
expect_true(test_arrow_altrep_is_materialized(altrep))

# test element access after materialization
expect_true(test_arrow_altrep_is_materialized(altrep))
expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("element access methods for character ALTREP from large_utf8()", {
Expand All@@ -265,14 +264,13 @@ test_that("element access methods for character ALTREP from large_utf8()", {
expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
expect_false(test_arrow_altrep_is_materialized(altrep))

# DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
# match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
expect_true(test_arrow_altrep_is_materialized(altrep))

# test element access after materialization
expect_true(test_arrow_altrep_is_materialized(altrep))
expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("empty vectors are not altrep", {
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
WIP: [R] Verify CRAN release 19.0.1.1#46036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

amoeba
wants to merge
8
commits into

from

 Closed


WIP: [R] Verify CRAN release 19.0.1.1
#46036
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
cd80a87

GH-45850: Fix r-devel note about symbols in .a libs (#45870)


nealrichardson Mar 20, 2025
7dd6d01

MINOR: [R] Don't print that we're cleaning up static libs (#45958)


nealrichardson Mar 28, 2025
453c1f4

GH-45949: [R] Fix CRAN warnings for 19.0.1 about compiled code (#45951)


jonkeane Apr 5, 2025
709d70f

GH-45987: [C++] Set CMAKE_POLICY_VERSION_MINIMUM=3.5 for bundled depe…


assignUser Apr 1, 2025
8333cf2

GH-45499: [CI] Bump actions/cache version on GHA (#45500)


pitrou Feb 11, 2025
6e49131

Update NEWS.md


amoeba Apr 7, 2025
aba40f5

19.0.1.1


amoeba Apr 7, 2025
b60cb1f

Move Version out from inside of Authors@R


jonkeane Apr 7, 2025

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


2 changes: 1 addition & 1 deletion
.github/workflows/cpp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ${{ matrix.image }}-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/docs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: debian-docs-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/docs_light.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
 with:
 fetch-depth: 0
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: conda-docs-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: conda-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/python.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ${{ matrix.cache }}-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/r.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 # As this key is identical on both matrix builds only one will be able to successfully cache,
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/r_nightly.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ jobs:
 exit 1
 fi
 - name: Cache Repo
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: repo
 key: r-nightly-${{ github.run_id }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/ruby.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ubuntu-${{ matrix.ubuntu }}-ruby-${{ hashFiles('cpp/**') }}
Expand Down

5 changes: 4 additions & 1 deletion
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -967,7 +967,8 @@ set(EP_COMMON_CMAKE_ARGS
 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}
 -DCMAKE_INSTALL_LIBDIR=lib
 -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
 -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE})
 -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
 -DCMAKE_POLICY_VERSION_MINIMUM=3.5)

# if building with a toolchain file, pass that through
if(CMAKE_TOOLCHAIN_FILE)
Expand DownExpand Up@@ -1033,6 +1034,8 @@ macro(prepare_fetchcontent)
 set(CMAKE_COMPILE_WARNING_AS_ERROR FALSE)
 set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY TRUE)
 set(CMAKE_MACOSX_RPATH ${ARROW_INSTALL_NAME_RPATH})
 set(CMAKE_POLICY_VERSION_MINIMUM 3.5)

 if(MSVC)
 string(REPLACE "/WX" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 string(REPLACE "/WX" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
Expand Down

2 changes: 1 addition & 1 deletion
r/DESCRIPTION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 19.0.1
Version: 19.0.1.1
Authors@R: c(
 person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
 person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down

7 changes: 7 additions & 0 deletions
r/NEWS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
 under the License.
-->

# arrow 19.0.1.1

## Minor improvements and fixes

- Updated internal code to comply with new CRAN requirements on non-API calls ([#45949](https://github.com/apache/arrow/issues/45949))
- Enable building the bundled third-party libraries under CMake 4.0 ([#45987](https://github.com/apache/arrow/issues/45987))

Comment on lines

+22
 to 
+25

@jonkeanejonkeaneApr 7, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for these! Good summary

# arrow 19.0.1

This release primarily updates the underlying Arrow C++ version used by the
Expand Down

5 changes: 5 additions & 0 deletions
r/src/Makevars.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,3 +27,8 @@ PKG_CPPFLAGS=@cflags@
# PKG_CXXFLAGS=$(CXX_VISIBILITY)
CXX_STD=CXX17
PKG_LIBS=@libs@

all: $(SHLIB) purify

purify: $(SHLIB)
	@rm -rf ../libarrow || true

52 changes: 35 additions & 17 deletions
r/src/altrep.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ const std::shared_ptr<ChunkedArray>& GetChunkedArray(SEXP alt) {
// materialization is needed.
// data2: starts as NULL, and becomes a standard R vector with the same
// data if necessary: if materialization is needed, e.g. if we need
// to access its data pointer, with DATAPTR().
// to access its data pointer, with INTEGER(), REAL(), etc.
template <typename Impl>
struct AltrepVectorBase {
 // store the Array as an external pointer in data1, mark as immutable
Expand DownExpand Up@@ -220,7 +220,14 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
 SEXP copy = PROTECT(Rf_allocVector(sexp_type, size));

 // copy the data from the array, through Get_region
 Get_region(alt, 0, size, reinterpret_cast<c_type*>(DATAPTR(copy)));
 if constexpr (std::is_same_v<c_type, double>) {
 Get_region(alt, 0, size, REAL(copy));
 } else if constexpr (std::is_same_v<c_type, int>) {
 Get_region(alt, 0, size, INTEGER(copy));
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }

 // store as data2, this is now considered materialized
 SetRepresentation(alt, copy);
Expand DownExpand Up@@ -269,13 +276,27 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
 }

 // Otherwise we have to materialize and hand the pointer to data2
 return DATAPTR(Materialize(alt));
 if constexpr (std::is_same_v<c_type, double>) {
 return REAL(Materialize(alt));
 } else if constexpr (std::is_same_v<c_type, int>) {
 return INTEGER(Materialize(alt));
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }
 }

 // The value at position i
 static c_type Elt(SEXP alt, R_xlen_t i) {
 if (IsMaterialized(alt)) {
 return reinterpret_cast<c_type*>(DATAPTR(Representation(alt)))[i];
 if constexpr (std::is_same_v<c_type, double>) {
 return REAL(Representation(alt))[i];
 } else if constexpr (std::is_same_v<c_type, int>) {
 return INTEGER(Representation(alt))[i];
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }
 }

 auto altrep_data =
Expand DownExpand Up@@ -531,7 +552,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
 SEXP copy = PROTECT(Rf_allocVector(INTSXP, size));

 // copy the data from the array, through Get_region
 Get_region(alt, 0, size, reinterpret_cast<int*>(DATAPTR(copy)));
 Get_region(alt, 0, size, INTEGER(copy));

 // store as data2, this is now considered materialized
 SetRepresentation(alt, copy);
Expand All@@ -552,7 +573,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
 return nullptr;
 }

 static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
 static void* Dataptr(SEXP alt, Rboolean writeable) { return INTEGER(Materialize(alt)); }

 static SEXP Duplicate(SEXP alt, Rboolean /* deep */) {
 // the representation integer vector
Expand DownExpand Up@@ -892,7 +913,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
 return s;
 }

 static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
 static void* Dataptr(SEXP alt, Rboolean writeable) {
 return const_cast<void*>(DATAPTR_RO(Materialize(alt)));
 }

 static SEXP Materialize(SEXP alt) {
 if (Base::IsMaterialized(alt)) {
Expand DownExpand Up@@ -931,7 +954,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
 }

 static const void* Dataptr_or_null(SEXP alt) {
 if (Base::IsMaterialized(alt)) return DATAPTR(Representation(alt));
 if (Base::IsMaterialized(alt)) {
 return DATAPTR_RO(alt);
 }

 // otherwise give up
 return nullptr;
Expand DownExpand Up@@ -1267,21 +1292,14 @@ sexp test_arrow_altrep_copy_by_dataptr(sexp x) {

 if (TYPEOF(x) == INTSXP) {
 cpp11::writable::integers out(Rf_xlength(x));
 int* ptr = reinterpret_cast<int*>(DATAPTR(x));
 int* ptr = INTEGER(x);
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
 return out;
 } else if (TYPEOF(x) == REALSXP) {
 cpp11::writable::doubles out(Rf_xlength(x));
 double* ptr = reinterpret_cast<double*>(DATAPTR(x));
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
 return out;
 } else if (TYPEOF(x) == STRSXP) {
 cpp11::writable::strings out(Rf_xlength(x));
 SEXP* ptr = reinterpret_cast<SEXP*>(DATAPTR(x));
 double* ptr = REAL(x);
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
Expand Down

20 changes: 19 additions & 1 deletion
r/src/arrow_types.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,14 +173,32 @@ template <typename RVector>
class RBuffer : public MutableBuffer {
 public:
 explicit RBuffer(RVector vec)
 : MutableBuffer(reinterpret_cast<uint8_t*>(DATAPTR(vec)),
 : MutableBuffer(reinterpret_cast<uint8_t*>(getDataPointer(vec)),
 vec.size() * sizeof(typename RVector::value_type),
 arrow::CPUDevice::memory_manager(gc_memory_pool())),
 vec_(vec) {}

 private:
 // vec_ holds the memory
 RVector vec_;

 static void* getDataPointer(RVector& vec) {
 if (TYPEOF(vec) == LGLSXP) {
 return LOGICAL(vec);
 } else if (TYPEOF(vec) == INTSXP) {
 return INTEGER(vec);
 } else if (TYPEOF(vec) == REALSXP) {
 return REAL(vec);
 } else if (TYPEOF(vec) == CPLXSXP) {
 return COMPLEX(vec);
 } else if (TYPEOF(vec) == STRSXP) {
 // We don't want to expose the string data here, so we error
 cpp11::stop("Operation not supported for string vectors.");
 } else {
 // raw
 return RAW(vec);
 }
 }
};

std::shared_ptr<arrow::DataType> InferArrowTypeFromFactor(SEXP);
Expand Down

12 changes: 6 additions & 6 deletions
r/src/r_to_arrow.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1214,11 +1214,11 @@ bool can_reuse_memory(SEXP x, const std::shared_ptr<arrow::DataType>& type) {
 // because MakeSimpleArray below will force materialization
 switch (type->id()) {
 case Type::INT32:
 return TYPEOF(x) == INTSXP && !OBJECT(x);
 return TYPEOF(x) == INTSXP && !Rf_isObject(x);
 case Type::DOUBLE:
 return TYPEOF(x) == REALSXP && !OBJECT(x);
 return TYPEOF(x) == REALSXP && !Rf_isObject(x);
 case Type::INT8:
 return TYPEOF(x) == RAWSXP && !OBJECT(x);
 return TYPEOF(x) == RAWSXP && !Rf_isObject(x);
 case Type::INT64:
 return TYPEOF(x) == REALSXP && Rf_inherits(x, "integer64");
 default:
Expand DownExpand Up@@ -1412,17 +1412,17 @@ bool vector_from_r_memory(SEXP x, const std::shared_ptr<DataType>& type,

 switch (type->id()) {
 case Type::INT32:
 return TYPEOF(x) == INTSXP && !OBJECT(x) &&
 return TYPEOF(x) == INTSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::integers, Int32Type>(x, type, columns, j,
 tasks);

 case Type::DOUBLE:
 return TYPEOF(x) == REALSXP && !OBJECT(x) &&
 return TYPEOF(x) == REALSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::doubles, DoubleType>(x, type, columns, j,
 tasks);

 case Type::UINT8:
 return TYPEOF(x) == RAWSXP && !OBJECT(x) &&
 return TYPEOF(x) == RAWSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::raws, UInt8Type>(x, type, columns, j,
 tasks);

Expand Down

14 changes: 6 additions & 8 deletions
r/tests/testthat/test-altrep.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ test_that("element access methods for int32 ALTREP with nulls", {
 expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # because there are no nulls, DATAPTR() does not materialize
 # because there are nulls, DATAPTR() does materialize
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 expect_true(test_arrow_altrep_is_materialized(altrep))

Expand All@@ -193,7 +193,7 @@ test_that("element access methods for double ALTREP with nulls", {
 expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # because there are no nulls, DATAPTR() does not materialize
 # because there are nulls, DATAPTR() does materialize
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 expect_true(test_arrow_altrep_is_materialized(altrep))

Expand DownExpand Up@@ -244,14 +244,13 @@ test_that("element access methods for character ALTREP", {
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 # match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
 expect_true(test_arrow_altrep_is_materialized(altrep))

 # test element access after materialization
 expect_true(test_arrow_altrep_is_materialized(altrep))
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("element access methods for character ALTREP from large_utf8()", {
Expand All@@ -265,14 +264,13 @@ test_that("element access methods for character ALTREP from large_utf8()", {
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 # match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
 expect_true(test_arrow_altrep_is_materialized(altrep))

 # test element access after materialization
 expect_true(test_arrow_altrep_is_materialized(altrep))
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("empty vectors are not altrep", {
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
WIP: [R] Verify CRAN release 19.0.1.1#46036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

amoeba
wants to merge
8
commits into

from

 Closed


WIP: [R] Verify CRAN release 19.0.1.1
#46036
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
cd80a87

GH-45850: Fix r-devel note about symbols in .a libs (#45870)


nealrichardson Mar 20, 2025
7dd6d01

MINOR: [R] Don't print that we're cleaning up static libs (#45958)


nealrichardson Mar 28, 2025
453c1f4

GH-45949: [R] Fix CRAN warnings for 19.0.1 about compiled code (#45951)


jonkeane Apr 5, 2025
709d70f

GH-45987: [C++] Set CMAKE_POLICY_VERSION_MINIMUM=3.5 for bundled depe…


assignUser Apr 1, 2025
8333cf2

GH-45499: [CI] Bump actions/cache version on GHA (#45500)


pitrou Feb 11, 2025
6e49131

Update NEWS.md


amoeba Apr 7, 2025
aba40f5

19.0.1.1


amoeba Apr 7, 2025
b60cb1f

Move Version out from inside of Authors@R


jonkeane Apr 7, 2025

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


2 changes: 1 addition & 1 deletion
.github/workflows/cpp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ${{ matrix.image }}-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/docs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: debian-docs-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/docs_light.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
 with:
 fetch-depth: 0
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: conda-docs-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: conda-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/python.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ${{ matrix.cache }}-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/r.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 # As this key is identical on both matrix builds only one will be able to successfully cache,
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/r_nightly.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ jobs:
 exit 1
 fi
 - name: Cache Repo
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: repo
 key: r-nightly-${{ github.run_id }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/ruby.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ubuntu-${{ matrix.ubuntu }}-ruby-${{ hashFiles('cpp/**') }}
Expand Down

5 changes: 4 additions & 1 deletion
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -967,7 +967,8 @@ set(EP_COMMON_CMAKE_ARGS
 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}
 -DCMAKE_INSTALL_LIBDIR=lib
 -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
 -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE})
 -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
 -DCMAKE_POLICY_VERSION_MINIMUM=3.5)

# if building with a toolchain file, pass that through
if(CMAKE_TOOLCHAIN_FILE)
Expand DownExpand Up@@ -1033,6 +1034,8 @@ macro(prepare_fetchcontent)
 set(CMAKE_COMPILE_WARNING_AS_ERROR FALSE)
 set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY TRUE)
 set(CMAKE_MACOSX_RPATH ${ARROW_INSTALL_NAME_RPATH})
 set(CMAKE_POLICY_VERSION_MINIMUM 3.5)

 if(MSVC)
 string(REPLACE "/WX" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 string(REPLACE "/WX" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
Expand Down

2 changes: 1 addition & 1 deletion
r/DESCRIPTION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 19.0.1
Version: 19.0.1.1
Authors@R: c(
 person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
 person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down

7 changes: 7 additions & 0 deletions
r/NEWS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
 under the License.
-->

# arrow 19.0.1.1

## Minor improvements and fixes

- Updated internal code to comply with new CRAN requirements on non-API calls ([#45949](https://github.com/apache/arrow/issues/45949))
- Enable building the bundled third-party libraries under CMake 4.0 ([#45987](https://github.com/apache/arrow/issues/45987))

Comment on lines

+22
 to 
+25

@jonkeanejonkeaneApr 7, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for these! Good summary

# arrow 19.0.1

This release primarily updates the underlying Arrow C++ version used by the
Expand Down

5 changes: 5 additions & 0 deletions
r/src/Makevars.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,3 +27,8 @@ PKG_CPPFLAGS=@cflags@
# PKG_CXXFLAGS=$(CXX_VISIBILITY)
CXX_STD=CXX17
PKG_LIBS=@libs@

all: $(SHLIB) purify

purify: $(SHLIB)
	@rm -rf ../libarrow || true

52 changes: 35 additions & 17 deletions
r/src/altrep.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ const std::shared_ptr<ChunkedArray>& GetChunkedArray(SEXP alt) {
// materialization is needed.
// data2: starts as NULL, and becomes a standard R vector with the same
// data if necessary: if materialization is needed, e.g. if we need
// to access its data pointer, with DATAPTR().
// to access its data pointer, with INTEGER(), REAL(), etc.
template <typename Impl>
struct AltrepVectorBase {
 // store the Array as an external pointer in data1, mark as immutable
Expand DownExpand Up@@ -220,7 +220,14 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
 SEXP copy = PROTECT(Rf_allocVector(sexp_type, size));

 // copy the data from the array, through Get_region
 Get_region(alt, 0, size, reinterpret_cast<c_type*>(DATAPTR(copy)));
 if constexpr (std::is_same_v<c_type, double>) {
 Get_region(alt, 0, size, REAL(copy));
 } else if constexpr (std::is_same_v<c_type, int>) {
 Get_region(alt, 0, size, INTEGER(copy));
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }

 // store as data2, this is now considered materialized
 SetRepresentation(alt, copy);
Expand DownExpand Up@@ -269,13 +276,27 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
 }

 // Otherwise we have to materialize and hand the pointer to data2
 return DATAPTR(Materialize(alt));
 if constexpr (std::is_same_v<c_type, double>) {
 return REAL(Materialize(alt));
 } else if constexpr (std::is_same_v<c_type, int>) {
 return INTEGER(Materialize(alt));
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }
 }

 // The value at position i
 static c_type Elt(SEXP alt, R_xlen_t i) {
 if (IsMaterialized(alt)) {
 return reinterpret_cast<c_type*>(DATAPTR(Representation(alt)))[i];
 if constexpr (std::is_same_v<c_type, double>) {
 return REAL(Representation(alt))[i];
 } else if constexpr (std::is_same_v<c_type, int>) {
 return INTEGER(Representation(alt))[i];
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }
 }

 auto altrep_data =
Expand DownExpand Up@@ -531,7 +552,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
 SEXP copy = PROTECT(Rf_allocVector(INTSXP, size));

 // copy the data from the array, through Get_region
 Get_region(alt, 0, size, reinterpret_cast<int*>(DATAPTR(copy)));
 Get_region(alt, 0, size, INTEGER(copy));

 // store as data2, this is now considered materialized
 SetRepresentation(alt, copy);
Expand All@@ -552,7 +573,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
 return nullptr;
 }

 static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
 static void* Dataptr(SEXP alt, Rboolean writeable) { return INTEGER(Materialize(alt)); }

 static SEXP Duplicate(SEXP alt, Rboolean /* deep */) {
 // the representation integer vector
Expand DownExpand Up@@ -892,7 +913,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
 return s;
 }

 static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
 static void* Dataptr(SEXP alt, Rboolean writeable) {
 return const_cast<void*>(DATAPTR_RO(Materialize(alt)));
 }

 static SEXP Materialize(SEXP alt) {
 if (Base::IsMaterialized(alt)) {
Expand DownExpand Up@@ -931,7 +954,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
 }

 static const void* Dataptr_or_null(SEXP alt) {
 if (Base::IsMaterialized(alt)) return DATAPTR(Representation(alt));
 if (Base::IsMaterialized(alt)) {
 return DATAPTR_RO(alt);
 }

 // otherwise give up
 return nullptr;
Expand DownExpand Up@@ -1267,21 +1292,14 @@ sexp test_arrow_altrep_copy_by_dataptr(sexp x) {

 if (TYPEOF(x) == INTSXP) {
 cpp11::writable::integers out(Rf_xlength(x));
 int* ptr = reinterpret_cast<int*>(DATAPTR(x));
 int* ptr = INTEGER(x);
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
 return out;
 } else if (TYPEOF(x) == REALSXP) {
 cpp11::writable::doubles out(Rf_xlength(x));
 double* ptr = reinterpret_cast<double*>(DATAPTR(x));
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
 return out;
 } else if (TYPEOF(x) == STRSXP) {
 cpp11::writable::strings out(Rf_xlength(x));
 SEXP* ptr = reinterpret_cast<SEXP*>(DATAPTR(x));
 double* ptr = REAL(x);
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
Expand Down

20 changes: 19 additions & 1 deletion
r/src/arrow_types.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,14 +173,32 @@ template <typename RVector>
class RBuffer : public MutableBuffer {
 public:
 explicit RBuffer(RVector vec)
 : MutableBuffer(reinterpret_cast<uint8_t*>(DATAPTR(vec)),
 : MutableBuffer(reinterpret_cast<uint8_t*>(getDataPointer(vec)),
 vec.size() * sizeof(typename RVector::value_type),
 arrow::CPUDevice::memory_manager(gc_memory_pool())),
 vec_(vec) {}

 private:
 // vec_ holds the memory
 RVector vec_;

 static void* getDataPointer(RVector& vec) {
 if (TYPEOF(vec) == LGLSXP) {
 return LOGICAL(vec);
 } else if (TYPEOF(vec) == INTSXP) {
 return INTEGER(vec);
 } else if (TYPEOF(vec) == REALSXP) {
 return REAL(vec);
 } else if (TYPEOF(vec) == CPLXSXP) {
 return COMPLEX(vec);
 } else if (TYPEOF(vec) == STRSXP) {
 // We don't want to expose the string data here, so we error
 cpp11::stop("Operation not supported for string vectors.");
 } else {
 // raw
 return RAW(vec);
 }
 }
};

std::shared_ptr<arrow::DataType> InferArrowTypeFromFactor(SEXP);
Expand Down

12 changes: 6 additions & 6 deletions
r/src/r_to_arrow.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1214,11 +1214,11 @@ bool can_reuse_memory(SEXP x, const std::shared_ptr<arrow::DataType>& type) {
 // because MakeSimpleArray below will force materialization
 switch (type->id()) {
 case Type::INT32:
 return TYPEOF(x) == INTSXP && !OBJECT(x);
 return TYPEOF(x) == INTSXP && !Rf_isObject(x);
 case Type::DOUBLE:
 return TYPEOF(x) == REALSXP && !OBJECT(x);
 return TYPEOF(x) == REALSXP && !Rf_isObject(x);
 case Type::INT8:
 return TYPEOF(x) == RAWSXP && !OBJECT(x);
 return TYPEOF(x) == RAWSXP && !Rf_isObject(x);
 case Type::INT64:
 return TYPEOF(x) == REALSXP && Rf_inherits(x, "integer64");
 default:
Expand DownExpand Up@@ -1412,17 +1412,17 @@ bool vector_from_r_memory(SEXP x, const std::shared_ptr<DataType>& type,

 switch (type->id()) {
 case Type::INT32:
 return TYPEOF(x) == INTSXP && !OBJECT(x) &&
 return TYPEOF(x) == INTSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::integers, Int32Type>(x, type, columns, j,
 tasks);

 case Type::DOUBLE:
 return TYPEOF(x) == REALSXP && !OBJECT(x) &&
 return TYPEOF(x) == REALSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::doubles, DoubleType>(x, type, columns, j,
 tasks);

 case Type::UINT8:
 return TYPEOF(x) == RAWSXP && !OBJECT(x) &&
 return TYPEOF(x) == RAWSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::raws, UInt8Type>(x, type, columns, j,
 tasks);

Expand Down

14 changes: 6 additions & 8 deletions
r/tests/testthat/test-altrep.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ test_that("element access methods for int32 ALTREP with nulls", {
 expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # because there are no nulls, DATAPTR() does not materialize
 # because there are nulls, DATAPTR() does materialize
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 expect_true(test_arrow_altrep_is_materialized(altrep))

Expand All@@ -193,7 +193,7 @@ test_that("element access methods for double ALTREP with nulls", {
 expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # because there are no nulls, DATAPTR() does not materialize
 # because there are nulls, DATAPTR() does materialize
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 expect_true(test_arrow_altrep_is_materialized(altrep))

Expand DownExpand Up@@ -244,14 +244,13 @@ test_that("element access methods for character ALTREP", {
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 # match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
 expect_true(test_arrow_altrep_is_materialized(altrep))

 # test element access after materialization
 expect_true(test_arrow_altrep_is_materialized(altrep))
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("element access methods for character ALTREP from large_utf8()", {
Expand All@@ -265,14 +264,13 @@ test_that("element access methods for character ALTREP from large_utf8()", {
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 # match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
 expect_true(test_arrow_altrep_is_materialized(altrep))

 # test element access after materialization
 expect_true(test_arrow_altrep_is_materialized(altrep))
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("empty vectors are not altrep", {
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
WIP: [R] Verify CRAN release 19.0.1.1#46036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

amoeba
wants to merge
8
commits into

from

 Closed


WIP: [R] Verify CRAN release 19.0.1.1
#46036
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
cd80a87

GH-45850: Fix r-devel note about symbols in .a libs (#45870)


nealrichardson Mar 20, 2025
7dd6d01

MINOR: [R] Don't print that we're cleaning up static libs (#45958)


nealrichardson Mar 28, 2025
453c1f4

GH-45949: [R] Fix CRAN warnings for 19.0.1 about compiled code (#45951)


jonkeane Apr 5, 2025
709d70f

GH-45987: [C++] Set CMAKE_POLICY_VERSION_MINIMUM=3.5 for bundled depe…


assignUser Apr 1, 2025
8333cf2

GH-45499: [CI] Bump actions/cache version on GHA (#45500)


pitrou Feb 11, 2025
6e49131

Update NEWS.md


amoeba Apr 7, 2025
aba40f5

19.0.1.1


amoeba Apr 7, 2025
b60cb1f

Move Version out from inside of Authors@R


jonkeane Apr 7, 2025

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


2 changes: 1 addition & 1 deletion
.github/workflows/cpp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ${{ matrix.image }}-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/docs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: debian-docs-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/docs_light.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
 with:
 fetch-depth: 0
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: conda-docs-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: conda-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/python.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ${{ matrix.cache }}-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/r.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 # As this key is identical on both matrix builds only one will be able to successfully cache,
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/r_nightly.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ jobs:
 exit 1
 fi
 - name: Cache Repo
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: repo
 key: r-nightly-${{ github.run_id }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/ruby.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ubuntu-${{ matrix.ubuntu }}-ruby-${{ hashFiles('cpp/**') }}
Expand Down

5 changes: 4 additions & 1 deletion
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -967,7 +967,8 @@ set(EP_COMMON_CMAKE_ARGS
 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}
 -DCMAKE_INSTALL_LIBDIR=lib
 -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
 -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE})
 -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
 -DCMAKE_POLICY_VERSION_MINIMUM=3.5)

# if building with a toolchain file, pass that through
if(CMAKE_TOOLCHAIN_FILE)
Expand DownExpand Up@@ -1033,6 +1034,8 @@ macro(prepare_fetchcontent)
 set(CMAKE_COMPILE_WARNING_AS_ERROR FALSE)
 set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY TRUE)
 set(CMAKE_MACOSX_RPATH ${ARROW_INSTALL_NAME_RPATH})
 set(CMAKE_POLICY_VERSION_MINIMUM 3.5)

 if(MSVC)
 string(REPLACE "/WX" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 string(REPLACE "/WX" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
Expand Down

2 changes: 1 addition & 1 deletion
r/DESCRIPTION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 19.0.1
Version: 19.0.1.1
Authors@R: c(
 person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
 person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down

7 changes: 7 additions & 0 deletions
r/NEWS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
 under the License.
-->

# arrow 19.0.1.1

## Minor improvements and fixes

- Updated internal code to comply with new CRAN requirements on non-API calls ([#45949](https://github.com/apache/arrow/issues/45949))
- Enable building the bundled third-party libraries under CMake 4.0 ([#45987](https://github.com/apache/arrow/issues/45987))

Comment on lines

+22
 to 
+25

@jonkeanejonkeaneApr 7, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for these! Good summary

# arrow 19.0.1

This release primarily updates the underlying Arrow C++ version used by the
Expand Down

5 changes: 5 additions & 0 deletions
r/src/Makevars.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,3 +27,8 @@ PKG_CPPFLAGS=@cflags@
# PKG_CXXFLAGS=$(CXX_VISIBILITY)
CXX_STD=CXX17
PKG_LIBS=@libs@

all: $(SHLIB) purify

purify: $(SHLIB)
	@rm -rf ../libarrow || true

52 changes: 35 additions & 17 deletions
r/src/altrep.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ const std::shared_ptr<ChunkedArray>& GetChunkedArray(SEXP alt) {
// materialization is needed.
// data2: starts as NULL, and becomes a standard R vector with the same
// data if necessary: if materialization is needed, e.g. if we need
// to access its data pointer, with DATAPTR().
// to access its data pointer, with INTEGER(), REAL(), etc.
template <typename Impl>
struct AltrepVectorBase {
 // store the Array as an external pointer in data1, mark as immutable
Expand DownExpand Up@@ -220,7 +220,14 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
 SEXP copy = PROTECT(Rf_allocVector(sexp_type, size));

 // copy the data from the array, through Get_region
 Get_region(alt, 0, size, reinterpret_cast<c_type*>(DATAPTR(copy)));
 if constexpr (std::is_same_v<c_type, double>) {
 Get_region(alt, 0, size, REAL(copy));
 } else if constexpr (std::is_same_v<c_type, int>) {
 Get_region(alt, 0, size, INTEGER(copy));
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }

 // store as data2, this is now considered materialized
 SetRepresentation(alt, copy);
Expand DownExpand Up@@ -269,13 +276,27 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
 }

 // Otherwise we have to materialize and hand the pointer to data2
 return DATAPTR(Materialize(alt));
 if constexpr (std::is_same_v<c_type, double>) {
 return REAL(Materialize(alt));
 } else if constexpr (std::is_same_v<c_type, int>) {
 return INTEGER(Materialize(alt));
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }
 }

 // The value at position i
 static c_type Elt(SEXP alt, R_xlen_t i) {
 if (IsMaterialized(alt)) {
 return reinterpret_cast<c_type*>(DATAPTR(Representation(alt)))[i];
 if constexpr (std::is_same_v<c_type, double>) {
 return REAL(Representation(alt))[i];
 } else if constexpr (std::is_same_v<c_type, int>) {
 return INTEGER(Representation(alt))[i];
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }
 }

 auto altrep_data =
Expand DownExpand Up@@ -531,7 +552,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
 SEXP copy = PROTECT(Rf_allocVector(INTSXP, size));

 // copy the data from the array, through Get_region
 Get_region(alt, 0, size, reinterpret_cast<int*>(DATAPTR(copy)));
 Get_region(alt, 0, size, INTEGER(copy));

 // store as data2, this is now considered materialized
 SetRepresentation(alt, copy);
Expand All@@ -552,7 +573,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
 return nullptr;
 }

 static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
 static void* Dataptr(SEXP alt, Rboolean writeable) { return INTEGER(Materialize(alt)); }

 static SEXP Duplicate(SEXP alt, Rboolean /* deep */) {
 // the representation integer vector
Expand DownExpand Up@@ -892,7 +913,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
 return s;
 }

 static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
 static void* Dataptr(SEXP alt, Rboolean writeable) {
 return const_cast<void*>(DATAPTR_RO(Materialize(alt)));
 }

 static SEXP Materialize(SEXP alt) {
 if (Base::IsMaterialized(alt)) {
Expand DownExpand Up@@ -931,7 +954,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
 }

 static const void* Dataptr_or_null(SEXP alt) {
 if (Base::IsMaterialized(alt)) return DATAPTR(Representation(alt));
 if (Base::IsMaterialized(alt)) {
 return DATAPTR_RO(alt);
 }

 // otherwise give up
 return nullptr;
Expand DownExpand Up@@ -1267,21 +1292,14 @@ sexp test_arrow_altrep_copy_by_dataptr(sexp x) {

 if (TYPEOF(x) == INTSXP) {
 cpp11::writable::integers out(Rf_xlength(x));
 int* ptr = reinterpret_cast<int*>(DATAPTR(x));
 int* ptr = INTEGER(x);
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
 return out;
 } else if (TYPEOF(x) == REALSXP) {
 cpp11::writable::doubles out(Rf_xlength(x));
 double* ptr = reinterpret_cast<double*>(DATAPTR(x));
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
 return out;
 } else if (TYPEOF(x) == STRSXP) {
 cpp11::writable::strings out(Rf_xlength(x));
 SEXP* ptr = reinterpret_cast<SEXP*>(DATAPTR(x));
 double* ptr = REAL(x);
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
Expand Down

20 changes: 19 additions & 1 deletion
r/src/arrow_types.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,14 +173,32 @@ template <typename RVector>
class RBuffer : public MutableBuffer {
 public:
 explicit RBuffer(RVector vec)
 : MutableBuffer(reinterpret_cast<uint8_t*>(DATAPTR(vec)),
 : MutableBuffer(reinterpret_cast<uint8_t*>(getDataPointer(vec)),
 vec.size() * sizeof(typename RVector::value_type),
 arrow::CPUDevice::memory_manager(gc_memory_pool())),
 vec_(vec) {}

 private:
 // vec_ holds the memory
 RVector vec_;

 static void* getDataPointer(RVector& vec) {
 if (TYPEOF(vec) == LGLSXP) {
 return LOGICAL(vec);
 } else if (TYPEOF(vec) == INTSXP) {
 return INTEGER(vec);
 } else if (TYPEOF(vec) == REALSXP) {
 return REAL(vec);
 } else if (TYPEOF(vec) == CPLXSXP) {
 return COMPLEX(vec);
 } else if (TYPEOF(vec) == STRSXP) {
 // We don't want to expose the string data here, so we error
 cpp11::stop("Operation not supported for string vectors.");
 } else {
 // raw
 return RAW(vec);
 }
 }
};

std::shared_ptr<arrow::DataType> InferArrowTypeFromFactor(SEXP);
Expand Down

12 changes: 6 additions & 6 deletions
r/src/r_to_arrow.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1214,11 +1214,11 @@ bool can_reuse_memory(SEXP x, const std::shared_ptr<arrow::DataType>& type) {
 // because MakeSimpleArray below will force materialization
 switch (type->id()) {
 case Type::INT32:
 return TYPEOF(x) == INTSXP && !OBJECT(x);
 return TYPEOF(x) == INTSXP && !Rf_isObject(x);
 case Type::DOUBLE:
 return TYPEOF(x) == REALSXP && !OBJECT(x);
 return TYPEOF(x) == REALSXP && !Rf_isObject(x);
 case Type::INT8:
 return TYPEOF(x) == RAWSXP && !OBJECT(x);
 return TYPEOF(x) == RAWSXP && !Rf_isObject(x);
 case Type::INT64:
 return TYPEOF(x) == REALSXP && Rf_inherits(x, "integer64");
 default:
Expand DownExpand Up@@ -1412,17 +1412,17 @@ bool vector_from_r_memory(SEXP x, const std::shared_ptr<DataType>& type,

 switch (type->id()) {
 case Type::INT32:
 return TYPEOF(x) == INTSXP && !OBJECT(x) &&
 return TYPEOF(x) == INTSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::integers, Int32Type>(x, type, columns, j,
 tasks);

 case Type::DOUBLE:
 return TYPEOF(x) == REALSXP && !OBJECT(x) &&
 return TYPEOF(x) == REALSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::doubles, DoubleType>(x, type, columns, j,
 tasks);

 case Type::UINT8:
 return TYPEOF(x) == RAWSXP && !OBJECT(x) &&
 return TYPEOF(x) == RAWSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::raws, UInt8Type>(x, type, columns, j,
 tasks);

Expand Down

14 changes: 6 additions & 8 deletions
r/tests/testthat/test-altrep.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ test_that("element access methods for int32 ALTREP with nulls", {
 expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # because there are no nulls, DATAPTR() does not materialize
 # because there are nulls, DATAPTR() does materialize
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 expect_true(test_arrow_altrep_is_materialized(altrep))

Expand All@@ -193,7 +193,7 @@ test_that("element access methods for double ALTREP with nulls", {
 expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # because there are no nulls, DATAPTR() does not materialize
 # because there are nulls, DATAPTR() does materialize
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 expect_true(test_arrow_altrep_is_materialized(altrep))

Expand DownExpand Up@@ -244,14 +244,13 @@ test_that("element access methods for character ALTREP", {
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 # match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
 expect_true(test_arrow_altrep_is_materialized(altrep))

 # test element access after materialization
 expect_true(test_arrow_altrep_is_materialized(altrep))
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("element access methods for character ALTREP from large_utf8()", {
Expand All@@ -265,14 +264,13 @@ test_that("element access methods for character ALTREP from large_utf8()", {
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 # match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
 expect_true(test_arrow_altrep_is_materialized(altrep))

 # test element access after materialization
 expect_true(test_arrow_altrep_is_materialized(altrep))
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("empty vectors are not altrep", {
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
WIP: [R] Verify CRAN release 19.0.1.1#46036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

amoeba
wants to merge
8
commits into

from

 Closed


WIP: [R] Verify CRAN release 19.0.1.1
#46036
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
cd80a87

GH-45850: Fix r-devel note about symbols in .a libs (#45870)


nealrichardson Mar 20, 2025
7dd6d01

MINOR: [R] Don't print that we're cleaning up static libs (#45958)


nealrichardson Mar 28, 2025
453c1f4

GH-45949: [R] Fix CRAN warnings for 19.0.1 about compiled code (#45951)


jonkeane Apr 5, 2025
709d70f

GH-45987: [C++] Set CMAKE_POLICY_VERSION_MINIMUM=3.5 for bundled depe…


assignUser Apr 1, 2025
8333cf2

GH-45499: [CI] Bump actions/cache version on GHA (#45500)


pitrou Feb 11, 2025
6e49131

Update NEWS.md


amoeba Apr 7, 2025
aba40f5

19.0.1.1


amoeba Apr 7, 2025
b60cb1f

Move Version out from inside of Authors@R


jonkeane Apr 7, 2025

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


2 changes: 1 addition & 1 deletion
.github/workflows/cpp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ${{ matrix.image }}-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/docs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: debian-docs-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/docs_light.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
 with:
 fetch-depth: 0
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: conda-docs-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: conda-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/python.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ${{ matrix.cache }}-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/r.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 # As this key is identical on both matrix builds only one will be able to successfully cache,
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/r_nightly.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ jobs:
 exit 1
 fi
 - name: Cache Repo
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: repo
 key: r-nightly-${{ github.run_id }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/ruby.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ubuntu-${{ matrix.ubuntu }}-ruby-${{ hashFiles('cpp/**') }}
Expand Down

5 changes: 4 additions & 1 deletion
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -967,7 +967,8 @@ set(EP_COMMON_CMAKE_ARGS
 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}
 -DCMAKE_INSTALL_LIBDIR=lib
 -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
 -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE})
 -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
 -DCMAKE_POLICY_VERSION_MINIMUM=3.5)

# if building with a toolchain file, pass that through
if(CMAKE_TOOLCHAIN_FILE)
Expand DownExpand Up@@ -1033,6 +1034,8 @@ macro(prepare_fetchcontent)
 set(CMAKE_COMPILE_WARNING_AS_ERROR FALSE)
 set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY TRUE)
 set(CMAKE_MACOSX_RPATH ${ARROW_INSTALL_NAME_RPATH})
 set(CMAKE_POLICY_VERSION_MINIMUM 3.5)

 if(MSVC)
 string(REPLACE "/WX" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 string(REPLACE "/WX" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
Expand Down

2 changes: 1 addition & 1 deletion
r/DESCRIPTION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 19.0.1
Version: 19.0.1.1
Authors@R: c(
 person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
 person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down

7 changes: 7 additions & 0 deletions
r/NEWS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
 under the License.
-->

# arrow 19.0.1.1

## Minor improvements and fixes

- Updated internal code to comply with new CRAN requirements on non-API calls ([#45949](https://github.com/apache/arrow/issues/45949))
- Enable building the bundled third-party libraries under CMake 4.0 ([#45987](https://github.com/apache/arrow/issues/45987))

Comment on lines

+22
 to 
+25

@jonkeanejonkeaneApr 7, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for these! Good summary

# arrow 19.0.1

This release primarily updates the underlying Arrow C++ version used by the
Expand Down

5 changes: 5 additions & 0 deletions
r/src/Makevars.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,3 +27,8 @@ PKG_CPPFLAGS=@cflags@
# PKG_CXXFLAGS=$(CXX_VISIBILITY)
CXX_STD=CXX17
PKG_LIBS=@libs@

all: $(SHLIB) purify

purify: $(SHLIB)
	@rm -rf ../libarrow || true

52 changes: 35 additions & 17 deletions
r/src/altrep.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ const std::shared_ptr<ChunkedArray>& GetChunkedArray(SEXP alt) {
// materialization is needed.
// data2: starts as NULL, and becomes a standard R vector with the same
// data if necessary: if materialization is needed, e.g. if we need
// to access its data pointer, with DATAPTR().
// to access its data pointer, with INTEGER(), REAL(), etc.
template <typename Impl>
struct AltrepVectorBase {
 // store the Array as an external pointer in data1, mark as immutable
Expand DownExpand Up@@ -220,7 +220,14 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
 SEXP copy = PROTECT(Rf_allocVector(sexp_type, size));

 // copy the data from the array, through Get_region
 Get_region(alt, 0, size, reinterpret_cast<c_type*>(DATAPTR(copy)));
 if constexpr (std::is_same_v<c_type, double>) {
 Get_region(alt, 0, size, REAL(copy));
 } else if constexpr (std::is_same_v<c_type, int>) {
 Get_region(alt, 0, size, INTEGER(copy));
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }

 // store as data2, this is now considered materialized
 SetRepresentation(alt, copy);
Expand DownExpand Up@@ -269,13 +276,27 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
 }

 // Otherwise we have to materialize and hand the pointer to data2
 return DATAPTR(Materialize(alt));
 if constexpr (std::is_same_v<c_type, double>) {
 return REAL(Materialize(alt));
 } else if constexpr (std::is_same_v<c_type, int>) {
 return INTEGER(Materialize(alt));
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }
 }

 // The value at position i
 static c_type Elt(SEXP alt, R_xlen_t i) {
 if (IsMaterialized(alt)) {
 return reinterpret_cast<c_type*>(DATAPTR(Representation(alt)))[i];
 if constexpr (std::is_same_v<c_type, double>) {
 return REAL(Representation(alt))[i];
 } else if constexpr (std::is_same_v<c_type, int>) {
 return INTEGER(Representation(alt))[i];
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }
 }

 auto altrep_data =
Expand DownExpand Up@@ -531,7 +552,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
 SEXP copy = PROTECT(Rf_allocVector(INTSXP, size));

 // copy the data from the array, through Get_region
 Get_region(alt, 0, size, reinterpret_cast<int*>(DATAPTR(copy)));
 Get_region(alt, 0, size, INTEGER(copy));

 // store as data2, this is now considered materialized
 SetRepresentation(alt, copy);
Expand All@@ -552,7 +573,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
 return nullptr;
 }

 static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
 static void* Dataptr(SEXP alt, Rboolean writeable) { return INTEGER(Materialize(alt)); }

 static SEXP Duplicate(SEXP alt, Rboolean /* deep */) {
 // the representation integer vector
Expand DownExpand Up@@ -892,7 +913,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
 return s;
 }

 static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
 static void* Dataptr(SEXP alt, Rboolean writeable) {
 return const_cast<void*>(DATAPTR_RO(Materialize(alt)));
 }

 static SEXP Materialize(SEXP alt) {
 if (Base::IsMaterialized(alt)) {
Expand DownExpand Up@@ -931,7 +954,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
 }

 static const void* Dataptr_or_null(SEXP alt) {
 if (Base::IsMaterialized(alt)) return DATAPTR(Representation(alt));
 if (Base::IsMaterialized(alt)) {
 return DATAPTR_RO(alt);
 }

 // otherwise give up
 return nullptr;
Expand DownExpand Up@@ -1267,21 +1292,14 @@ sexp test_arrow_altrep_copy_by_dataptr(sexp x) {

 if (TYPEOF(x) == INTSXP) {
 cpp11::writable::integers out(Rf_xlength(x));
 int* ptr = reinterpret_cast<int*>(DATAPTR(x));
 int* ptr = INTEGER(x);
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
 return out;
 } else if (TYPEOF(x) == REALSXP) {
 cpp11::writable::doubles out(Rf_xlength(x));
 double* ptr = reinterpret_cast<double*>(DATAPTR(x));
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
 return out;
 } else if (TYPEOF(x) == STRSXP) {
 cpp11::writable::strings out(Rf_xlength(x));
 SEXP* ptr = reinterpret_cast<SEXP*>(DATAPTR(x));
 double* ptr = REAL(x);
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
Expand Down

20 changes: 19 additions & 1 deletion
r/src/arrow_types.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,14 +173,32 @@ template <typename RVector>
class RBuffer : public MutableBuffer {
 public:
 explicit RBuffer(RVector vec)
 : MutableBuffer(reinterpret_cast<uint8_t*>(DATAPTR(vec)),
 : MutableBuffer(reinterpret_cast<uint8_t*>(getDataPointer(vec)),
 vec.size() * sizeof(typename RVector::value_type),
 arrow::CPUDevice::memory_manager(gc_memory_pool())),
 vec_(vec) {}

 private:
 // vec_ holds the memory
 RVector vec_;

 static void* getDataPointer(RVector& vec) {
 if (TYPEOF(vec) == LGLSXP) {
 return LOGICAL(vec);
 } else if (TYPEOF(vec) == INTSXP) {
 return INTEGER(vec);
 } else if (TYPEOF(vec) == REALSXP) {
 return REAL(vec);
 } else if (TYPEOF(vec) == CPLXSXP) {
 return COMPLEX(vec);
 } else if (TYPEOF(vec) == STRSXP) {
 // We don't want to expose the string data here, so we error
 cpp11::stop("Operation not supported for string vectors.");
 } else {
 // raw
 return RAW(vec);
 }
 }
};

std::shared_ptr<arrow::DataType> InferArrowTypeFromFactor(SEXP);
Expand Down

12 changes: 6 additions & 6 deletions
r/src/r_to_arrow.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1214,11 +1214,11 @@ bool can_reuse_memory(SEXP x, const std::shared_ptr<arrow::DataType>& type) {
 // because MakeSimpleArray below will force materialization
 switch (type->id()) {
 case Type::INT32:
 return TYPEOF(x) == INTSXP && !OBJECT(x);
 return TYPEOF(x) == INTSXP && !Rf_isObject(x);
 case Type::DOUBLE:
 return TYPEOF(x) == REALSXP && !OBJECT(x);
 return TYPEOF(x) == REALSXP && !Rf_isObject(x);
 case Type::INT8:
 return TYPEOF(x) == RAWSXP && !OBJECT(x);
 return TYPEOF(x) == RAWSXP && !Rf_isObject(x);
 case Type::INT64:
 return TYPEOF(x) == REALSXP && Rf_inherits(x, "integer64");
 default:
Expand DownExpand Up@@ -1412,17 +1412,17 @@ bool vector_from_r_memory(SEXP x, const std::shared_ptr<DataType>& type,

 switch (type->id()) {
 case Type::INT32:
 return TYPEOF(x) == INTSXP && !OBJECT(x) &&
 return TYPEOF(x) == INTSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::integers, Int32Type>(x, type, columns, j,
 tasks);

 case Type::DOUBLE:
 return TYPEOF(x) == REALSXP && !OBJECT(x) &&
 return TYPEOF(x) == REALSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::doubles, DoubleType>(x, type, columns, j,
 tasks);

 case Type::UINT8:
 return TYPEOF(x) == RAWSXP && !OBJECT(x) &&
 return TYPEOF(x) == RAWSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::raws, UInt8Type>(x, type, columns, j,
 tasks);

Expand Down

14 changes: 6 additions & 8 deletions
r/tests/testthat/test-altrep.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ test_that("element access methods for int32 ALTREP with nulls", {
 expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # because there are no nulls, DATAPTR() does not materialize
 # because there are nulls, DATAPTR() does materialize
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 expect_true(test_arrow_altrep_is_materialized(altrep))

Expand All@@ -193,7 +193,7 @@ test_that("element access methods for double ALTREP with nulls", {
 expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # because there are no nulls, DATAPTR() does not materialize
 # because there are nulls, DATAPTR() does materialize
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 expect_true(test_arrow_altrep_is_materialized(altrep))

Expand DownExpand Up@@ -244,14 +244,13 @@ test_that("element access methods for character ALTREP", {
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 # match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
 expect_true(test_arrow_altrep_is_materialized(altrep))

 # test element access after materialization
 expect_true(test_arrow_altrep_is_materialized(altrep))
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("element access methods for character ALTREP from large_utf8()", {
Expand All@@ -265,14 +264,13 @@ test_that("element access methods for character ALTREP from large_utf8()", {
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 # match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
 expect_true(test_arrow_altrep_is_materialized(altrep))

 # test element access after materialization
 expect_true(test_arrow_altrep_is_materialized(altrep))
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("empty vectors are not altrep", {
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
WIP: [R] Verify CRAN release 19.0.1.1#46036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

amoeba
wants to merge
8
commits into

from

 Closed


WIP: [R] Verify CRAN release 19.0.1.1
#46036
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
cd80a87

GH-45850: Fix r-devel note about symbols in .a libs (#45870)


nealrichardson Mar 20, 2025
7dd6d01

MINOR: [R] Don't print that we're cleaning up static libs (#45958)


nealrichardson Mar 28, 2025
453c1f4

GH-45949: [R] Fix CRAN warnings for 19.0.1 about compiled code (#45951)


jonkeane Apr 5, 2025
709d70f

GH-45987: [C++] Set CMAKE_POLICY_VERSION_MINIMUM=3.5 for bundled depe…


assignUser Apr 1, 2025
8333cf2

GH-45499: [CI] Bump actions/cache version on GHA (#45500)


pitrou Feb 11, 2025
6e49131

Update NEWS.md


amoeba Apr 7, 2025
aba40f5

19.0.1.1


amoeba Apr 7, 2025
b60cb1f

Move Version out from inside of Authors@R


jonkeane Apr 7, 2025

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


2 changes: 1 addition & 1 deletion
.github/workflows/cpp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ${{ matrix.image }}-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/docs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: debian-docs-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/docs_light.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
 with:
 fetch-depth: 0
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: conda-docs-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: conda-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/python.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ${{ matrix.cache }}-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/r.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 # As this key is identical on both matrix builds only one will be able to successfully cache,
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/r_nightly.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ jobs:
 exit 1
 fi
 - name: Cache Repo
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: repo
 key: r-nightly-${{ github.run_id }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/ruby.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ubuntu-${{ matrix.ubuntu }}-ruby-${{ hashFiles('cpp/**') }}
Expand Down

5 changes: 4 additions & 1 deletion
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -967,7 +967,8 @@ set(EP_COMMON_CMAKE_ARGS
 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}
 -DCMAKE_INSTALL_LIBDIR=lib
 -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
 -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE})
 -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
 -DCMAKE_POLICY_VERSION_MINIMUM=3.5)

# if building with a toolchain file, pass that through
if(CMAKE_TOOLCHAIN_FILE)
Expand DownExpand Up@@ -1033,6 +1034,8 @@ macro(prepare_fetchcontent)
 set(CMAKE_COMPILE_WARNING_AS_ERROR FALSE)
 set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY TRUE)
 set(CMAKE_MACOSX_RPATH ${ARROW_INSTALL_NAME_RPATH})
 set(CMAKE_POLICY_VERSION_MINIMUM 3.5)

 if(MSVC)
 string(REPLACE "/WX" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 string(REPLACE "/WX" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
Expand Down

2 changes: 1 addition & 1 deletion
r/DESCRIPTION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 19.0.1
Version: 19.0.1.1
Authors@R: c(
 person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
 person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down

7 changes: 7 additions & 0 deletions
r/NEWS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
 under the License.
-->

# arrow 19.0.1.1

## Minor improvements and fixes

- Updated internal code to comply with new CRAN requirements on non-API calls ([#45949](https://github.com/apache/arrow/issues/45949))
- Enable building the bundled third-party libraries under CMake 4.0 ([#45987](https://github.com/apache/arrow/issues/45987))

Comment on lines

+22
 to 
+25

@jonkeanejonkeaneApr 7, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for these! Good summary

# arrow 19.0.1

This release primarily updates the underlying Arrow C++ version used by the
Expand Down

5 changes: 5 additions & 0 deletions
r/src/Makevars.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,3 +27,8 @@ PKG_CPPFLAGS=@cflags@
# PKG_CXXFLAGS=$(CXX_VISIBILITY)
CXX_STD=CXX17
PKG_LIBS=@libs@

all: $(SHLIB) purify

purify: $(SHLIB)
	@rm -rf ../libarrow || true

52 changes: 35 additions & 17 deletions
r/src/altrep.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ const std::shared_ptr<ChunkedArray>& GetChunkedArray(SEXP alt) {
// materialization is needed.
// data2: starts as NULL, and becomes a standard R vector with the same
// data if necessary: if materialization is needed, e.g. if we need
// to access its data pointer, with DATAPTR().
// to access its data pointer, with INTEGER(), REAL(), etc.
template <typename Impl>
struct AltrepVectorBase {
 // store the Array as an external pointer in data1, mark as immutable
Expand DownExpand Up@@ -220,7 +220,14 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
 SEXP copy = PROTECT(Rf_allocVector(sexp_type, size));

 // copy the data from the array, through Get_region
 Get_region(alt, 0, size, reinterpret_cast<c_type*>(DATAPTR(copy)));
 if constexpr (std::is_same_v<c_type, double>) {
 Get_region(alt, 0, size, REAL(copy));
 } else if constexpr (std::is_same_v<c_type, int>) {
 Get_region(alt, 0, size, INTEGER(copy));
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }

 // store as data2, this is now considered materialized
 SetRepresentation(alt, copy);
Expand DownExpand Up@@ -269,13 +276,27 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
 }

 // Otherwise we have to materialize and hand the pointer to data2
 return DATAPTR(Materialize(alt));
 if constexpr (std::is_same_v<c_type, double>) {
 return REAL(Materialize(alt));
 } else if constexpr (std::is_same_v<c_type, int>) {
 return INTEGER(Materialize(alt));
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }
 }

 // The value at position i
 static c_type Elt(SEXP alt, R_xlen_t i) {
 if (IsMaterialized(alt)) {
 return reinterpret_cast<c_type*>(DATAPTR(Representation(alt)))[i];
 if constexpr (std::is_same_v<c_type, double>) {
 return REAL(Representation(alt))[i];
 } else if constexpr (std::is_same_v<c_type, int>) {
 return INTEGER(Representation(alt))[i];
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }
 }

 auto altrep_data =
Expand DownExpand Up@@ -531,7 +552,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
 SEXP copy = PROTECT(Rf_allocVector(INTSXP, size));

 // copy the data from the array, through Get_region
 Get_region(alt, 0, size, reinterpret_cast<int*>(DATAPTR(copy)));
 Get_region(alt, 0, size, INTEGER(copy));

 // store as data2, this is now considered materialized
 SetRepresentation(alt, copy);
Expand All@@ -552,7 +573,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
 return nullptr;
 }

 static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
 static void* Dataptr(SEXP alt, Rboolean writeable) { return INTEGER(Materialize(alt)); }

 static SEXP Duplicate(SEXP alt, Rboolean /* deep */) {
 // the representation integer vector
Expand DownExpand Up@@ -892,7 +913,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
 return s;
 }

 static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
 static void* Dataptr(SEXP alt, Rboolean writeable) {
 return const_cast<void*>(DATAPTR_RO(Materialize(alt)));
 }

 static SEXP Materialize(SEXP alt) {
 if (Base::IsMaterialized(alt)) {
Expand DownExpand Up@@ -931,7 +954,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
 }

 static const void* Dataptr_or_null(SEXP alt) {
 if (Base::IsMaterialized(alt)) return DATAPTR(Representation(alt));
 if (Base::IsMaterialized(alt)) {
 return DATAPTR_RO(alt);
 }

 // otherwise give up
 return nullptr;
Expand DownExpand Up@@ -1267,21 +1292,14 @@ sexp test_arrow_altrep_copy_by_dataptr(sexp x) {

 if (TYPEOF(x) == INTSXP) {
 cpp11::writable::integers out(Rf_xlength(x));
 int* ptr = reinterpret_cast<int*>(DATAPTR(x));
 int* ptr = INTEGER(x);
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
 return out;
 } else if (TYPEOF(x) == REALSXP) {
 cpp11::writable::doubles out(Rf_xlength(x));
 double* ptr = reinterpret_cast<double*>(DATAPTR(x));
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
 return out;
 } else if (TYPEOF(x) == STRSXP) {
 cpp11::writable::strings out(Rf_xlength(x));
 SEXP* ptr = reinterpret_cast<SEXP*>(DATAPTR(x));
 double* ptr = REAL(x);
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
Expand Down

20 changes: 19 additions & 1 deletion
r/src/arrow_types.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,14 +173,32 @@ template <typename RVector>
class RBuffer : public MutableBuffer {
 public:
 explicit RBuffer(RVector vec)
 : MutableBuffer(reinterpret_cast<uint8_t*>(DATAPTR(vec)),
 : MutableBuffer(reinterpret_cast<uint8_t*>(getDataPointer(vec)),
 vec.size() * sizeof(typename RVector::value_type),
 arrow::CPUDevice::memory_manager(gc_memory_pool())),
 vec_(vec) {}

 private:
 // vec_ holds the memory
 RVector vec_;

 static void* getDataPointer(RVector& vec) {
 if (TYPEOF(vec) == LGLSXP) {
 return LOGICAL(vec);
 } else if (TYPEOF(vec) == INTSXP) {
 return INTEGER(vec);
 } else if (TYPEOF(vec) == REALSXP) {
 return REAL(vec);
 } else if (TYPEOF(vec) == CPLXSXP) {
 return COMPLEX(vec);
 } else if (TYPEOF(vec) == STRSXP) {
 // We don't want to expose the string data here, so we error
 cpp11::stop("Operation not supported for string vectors.");
 } else {
 // raw
 return RAW(vec);
 }
 }
};

std::shared_ptr<arrow::DataType> InferArrowTypeFromFactor(SEXP);
Expand Down

12 changes: 6 additions & 6 deletions
r/src/r_to_arrow.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1214,11 +1214,11 @@ bool can_reuse_memory(SEXP x, const std::shared_ptr<arrow::DataType>& type) {
 // because MakeSimpleArray below will force materialization
 switch (type->id()) {
 case Type::INT32:
 return TYPEOF(x) == INTSXP && !OBJECT(x);
 return TYPEOF(x) == INTSXP && !Rf_isObject(x);
 case Type::DOUBLE:
 return TYPEOF(x) == REALSXP && !OBJECT(x);
 return TYPEOF(x) == REALSXP && !Rf_isObject(x);
 case Type::INT8:
 return TYPEOF(x) == RAWSXP && !OBJECT(x);
 return TYPEOF(x) == RAWSXP && !Rf_isObject(x);
 case Type::INT64:
 return TYPEOF(x) == REALSXP && Rf_inherits(x, "integer64");
 default:
Expand DownExpand Up@@ -1412,17 +1412,17 @@ bool vector_from_r_memory(SEXP x, const std::shared_ptr<DataType>& type,

 switch (type->id()) {
 case Type::INT32:
 return TYPEOF(x) == INTSXP && !OBJECT(x) &&
 return TYPEOF(x) == INTSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::integers, Int32Type>(x, type, columns, j,
 tasks);

 case Type::DOUBLE:
 return TYPEOF(x) == REALSXP && !OBJECT(x) &&
 return TYPEOF(x) == REALSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::doubles, DoubleType>(x, type, columns, j,
 tasks);

 case Type::UINT8:
 return TYPEOF(x) == RAWSXP && !OBJECT(x) &&
 return TYPEOF(x) == RAWSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::raws, UInt8Type>(x, type, columns, j,
 tasks);

Expand Down

14 changes: 6 additions & 8 deletions
r/tests/testthat/test-altrep.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ test_that("element access methods for int32 ALTREP with nulls", {
 expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # because there are no nulls, DATAPTR() does not materialize
 # because there are nulls, DATAPTR() does materialize
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 expect_true(test_arrow_altrep_is_materialized(altrep))

Expand All@@ -193,7 +193,7 @@ test_that("element access methods for double ALTREP with nulls", {
 expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # because there are no nulls, DATAPTR() does not materialize
 # because there are nulls, DATAPTR() does materialize
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 expect_true(test_arrow_altrep_is_materialized(altrep))

Expand DownExpand Up@@ -244,14 +244,13 @@ test_that("element access methods for character ALTREP", {
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 # match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
 expect_true(test_arrow_altrep_is_materialized(altrep))

 # test element access after materialization
 expect_true(test_arrow_altrep_is_materialized(altrep))
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("element access methods for character ALTREP from large_utf8()", {
Expand All@@ -265,14 +264,13 @@ test_that("element access methods for character ALTREP from large_utf8()", {
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 # match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
 expect_true(test_arrow_altrep_is_materialized(altrep))

 # test element access after materialization
 expect_true(test_arrow_altrep_is_materialized(altrep))
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("empty vectors are not altrep", {
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
WIP: [R] Verify CRAN release 19.0.1.1#46036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

amoeba
wants to merge
8
commits into

from

 Closed


WIP: [R] Verify CRAN release 19.0.1.1
#46036
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
cd80a87

GH-45850: Fix r-devel note about symbols in .a libs (#45870)


nealrichardson Mar 20, 2025
7dd6d01

MINOR: [R] Don't print that we're cleaning up static libs (#45958)


nealrichardson Mar 28, 2025
453c1f4

GH-45949: [R] Fix CRAN warnings for 19.0.1 about compiled code (#45951)


jonkeane Apr 5, 2025
709d70f

GH-45987: [C++] Set CMAKE_POLICY_VERSION_MINIMUM=3.5 for bundled depe…


assignUser Apr 1, 2025
8333cf2

GH-45499: [CI] Bump actions/cache version on GHA (#45500)


pitrou Feb 11, 2025
6e49131

Update NEWS.md


amoeba Apr 7, 2025
aba40f5

19.0.1.1


amoeba Apr 7, 2025
b60cb1f

Move Version out from inside of Authors@R


jonkeane Apr 7, 2025

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


2 changes: 1 addition & 1 deletion
.github/workflows/cpp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ${{ matrix.image }}-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/docs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: debian-docs-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/docs_light.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
 with:
 fetch-depth: 0
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: conda-docs-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: conda-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/python.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ${{ matrix.cache }}-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/r.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 # As this key is identical on both matrix builds only one will be able to successfully cache,
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/r_nightly.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ jobs:
 exit 1
 fi
 - name: Cache Repo
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: repo
 key: r-nightly-${{ github.run_id }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/ruby.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ubuntu-${{ matrix.ubuntu }}-ruby-${{ hashFiles('cpp/**') }}
Expand Down

5 changes: 4 additions & 1 deletion
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -967,7 +967,8 @@ set(EP_COMMON_CMAKE_ARGS
 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}
 -DCMAKE_INSTALL_LIBDIR=lib
 -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
 -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE})
 -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
 -DCMAKE_POLICY_VERSION_MINIMUM=3.5)

# if building with a toolchain file, pass that through
if(CMAKE_TOOLCHAIN_FILE)
Expand DownExpand Up@@ -1033,6 +1034,8 @@ macro(prepare_fetchcontent)
 set(CMAKE_COMPILE_WARNING_AS_ERROR FALSE)
 set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY TRUE)
 set(CMAKE_MACOSX_RPATH ${ARROW_INSTALL_NAME_RPATH})
 set(CMAKE_POLICY_VERSION_MINIMUM 3.5)

 if(MSVC)
 string(REPLACE "/WX" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 string(REPLACE "/WX" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
Expand Down

2 changes: 1 addition & 1 deletion
r/DESCRIPTION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 19.0.1
Version: 19.0.1.1
Authors@R: c(
 person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
 person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down

7 changes: 7 additions & 0 deletions
r/NEWS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
 under the License.
-->

# arrow 19.0.1.1

## Minor improvements and fixes

- Updated internal code to comply with new CRAN requirements on non-API calls ([#45949](https://github.com/apache/arrow/issues/45949))
- Enable building the bundled third-party libraries under CMake 4.0 ([#45987](https://github.com/apache/arrow/issues/45987))

Comment on lines

+22
 to 
+25

@jonkeanejonkeaneApr 7, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for these! Good summary

# arrow 19.0.1

This release primarily updates the underlying Arrow C++ version used by the
Expand Down

5 changes: 5 additions & 0 deletions
r/src/Makevars.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,3 +27,8 @@ PKG_CPPFLAGS=@cflags@
# PKG_CXXFLAGS=$(CXX_VISIBILITY)
CXX_STD=CXX17
PKG_LIBS=@libs@

all: $(SHLIB) purify

purify: $(SHLIB)
	@rm -rf ../libarrow || true

52 changes: 35 additions & 17 deletions
r/src/altrep.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ const std::shared_ptr<ChunkedArray>& GetChunkedArray(SEXP alt) {
// materialization is needed.
// data2: starts as NULL, and becomes a standard R vector with the same
// data if necessary: if materialization is needed, e.g. if we need
// to access its data pointer, with DATAPTR().
// to access its data pointer, with INTEGER(), REAL(), etc.
template <typename Impl>
struct AltrepVectorBase {
 // store the Array as an external pointer in data1, mark as immutable
Expand DownExpand Up@@ -220,7 +220,14 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
 SEXP copy = PROTECT(Rf_allocVector(sexp_type, size));

 // copy the data from the array, through Get_region
 Get_region(alt, 0, size, reinterpret_cast<c_type*>(DATAPTR(copy)));
 if constexpr (std::is_same_v<c_type, double>) {
 Get_region(alt, 0, size, REAL(copy));
 } else if constexpr (std::is_same_v<c_type, int>) {
 Get_region(alt, 0, size, INTEGER(copy));
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }

 // store as data2, this is now considered materialized
 SetRepresentation(alt, copy);
Expand DownExpand Up@@ -269,13 +276,27 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
 }

 // Otherwise we have to materialize and hand the pointer to data2
 return DATAPTR(Materialize(alt));
 if constexpr (std::is_same_v<c_type, double>) {
 return REAL(Materialize(alt));
 } else if constexpr (std::is_same_v<c_type, int>) {
 return INTEGER(Materialize(alt));
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }
 }

 // The value at position i
 static c_type Elt(SEXP alt, R_xlen_t i) {
 if (IsMaterialized(alt)) {
 return reinterpret_cast<c_type*>(DATAPTR(Representation(alt)))[i];
 if constexpr (std::is_same_v<c_type, double>) {
 return REAL(Representation(alt))[i];
 } else if constexpr (std::is_same_v<c_type, int>) {
 return INTEGER(Representation(alt))[i];
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }
 }

 auto altrep_data =
Expand DownExpand Up@@ -531,7 +552,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
 SEXP copy = PROTECT(Rf_allocVector(INTSXP, size));

 // copy the data from the array, through Get_region
 Get_region(alt, 0, size, reinterpret_cast<int*>(DATAPTR(copy)));
 Get_region(alt, 0, size, INTEGER(copy));

 // store as data2, this is now considered materialized
 SetRepresentation(alt, copy);
Expand All@@ -552,7 +573,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
 return nullptr;
 }

 static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
 static void* Dataptr(SEXP alt, Rboolean writeable) { return INTEGER(Materialize(alt)); }

 static SEXP Duplicate(SEXP alt, Rboolean /* deep */) {
 // the representation integer vector
Expand DownExpand Up@@ -892,7 +913,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
 return s;
 }

 static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
 static void* Dataptr(SEXP alt, Rboolean writeable) {
 return const_cast<void*>(DATAPTR_RO(Materialize(alt)));
 }

 static SEXP Materialize(SEXP alt) {
 if (Base::IsMaterialized(alt)) {
Expand DownExpand Up@@ -931,7 +954,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
 }

 static const void* Dataptr_or_null(SEXP alt) {
 if (Base::IsMaterialized(alt)) return DATAPTR(Representation(alt));
 if (Base::IsMaterialized(alt)) {
 return DATAPTR_RO(alt);
 }

 // otherwise give up
 return nullptr;
Expand DownExpand Up@@ -1267,21 +1292,14 @@ sexp test_arrow_altrep_copy_by_dataptr(sexp x) {

 if (TYPEOF(x) == INTSXP) {
 cpp11::writable::integers out(Rf_xlength(x));
 int* ptr = reinterpret_cast<int*>(DATAPTR(x));
 int* ptr = INTEGER(x);
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
 return out;
 } else if (TYPEOF(x) == REALSXP) {
 cpp11::writable::doubles out(Rf_xlength(x));
 double* ptr = reinterpret_cast<double*>(DATAPTR(x));
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
 return out;
 } else if (TYPEOF(x) == STRSXP) {
 cpp11::writable::strings out(Rf_xlength(x));
 SEXP* ptr = reinterpret_cast<SEXP*>(DATAPTR(x));
 double* ptr = REAL(x);
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
Expand Down

20 changes: 19 additions & 1 deletion
r/src/arrow_types.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,14 +173,32 @@ template <typename RVector>
class RBuffer : public MutableBuffer {
 public:
 explicit RBuffer(RVector vec)
 : MutableBuffer(reinterpret_cast<uint8_t*>(DATAPTR(vec)),
 : MutableBuffer(reinterpret_cast<uint8_t*>(getDataPointer(vec)),
 vec.size() * sizeof(typename RVector::value_type),
 arrow::CPUDevice::memory_manager(gc_memory_pool())),
 vec_(vec) {}

 private:
 // vec_ holds the memory
 RVector vec_;

 static void* getDataPointer(RVector& vec) {
 if (TYPEOF(vec) == LGLSXP) {
 return LOGICAL(vec);
 } else if (TYPEOF(vec) == INTSXP) {
 return INTEGER(vec);
 } else if (TYPEOF(vec) == REALSXP) {
 return REAL(vec);
 } else if (TYPEOF(vec) == CPLXSXP) {
 return COMPLEX(vec);
 } else if (TYPEOF(vec) == STRSXP) {
 // We don't want to expose the string data here, so we error
 cpp11::stop("Operation not supported for string vectors.");
 } else {
 // raw
 return RAW(vec);
 }
 }
};

std::shared_ptr<arrow::DataType> InferArrowTypeFromFactor(SEXP);
Expand Down

12 changes: 6 additions & 6 deletions
r/src/r_to_arrow.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1214,11 +1214,11 @@ bool can_reuse_memory(SEXP x, const std::shared_ptr<arrow::DataType>& type) {
 // because MakeSimpleArray below will force materialization
 switch (type->id()) {
 case Type::INT32:
 return TYPEOF(x) == INTSXP && !OBJECT(x);
 return TYPEOF(x) == INTSXP && !Rf_isObject(x);
 case Type::DOUBLE:
 return TYPEOF(x) == REALSXP && !OBJECT(x);
 return TYPEOF(x) == REALSXP && !Rf_isObject(x);
 case Type::INT8:
 return TYPEOF(x) == RAWSXP && !OBJECT(x);
 return TYPEOF(x) == RAWSXP && !Rf_isObject(x);
 case Type::INT64:
 return TYPEOF(x) == REALSXP && Rf_inherits(x, "integer64");
 default:
Expand DownExpand Up@@ -1412,17 +1412,17 @@ bool vector_from_r_memory(SEXP x, const std::shared_ptr<DataType>& type,

 switch (type->id()) {
 case Type::INT32:
 return TYPEOF(x) == INTSXP && !OBJECT(x) &&
 return TYPEOF(x) == INTSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::integers, Int32Type>(x, type, columns, j,
 tasks);

 case Type::DOUBLE:
 return TYPEOF(x) == REALSXP && !OBJECT(x) &&
 return TYPEOF(x) == REALSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::doubles, DoubleType>(x, type, columns, j,
 tasks);

 case Type::UINT8:
 return TYPEOF(x) == RAWSXP && !OBJECT(x) &&
 return TYPEOF(x) == RAWSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::raws, UInt8Type>(x, type, columns, j,
 tasks);

Expand Down

14 changes: 6 additions & 8 deletions
r/tests/testthat/test-altrep.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ test_that("element access methods for int32 ALTREP with nulls", {
 expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # because there are no nulls, DATAPTR() does not materialize
 # because there are nulls, DATAPTR() does materialize
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 expect_true(test_arrow_altrep_is_materialized(altrep))

Expand All@@ -193,7 +193,7 @@ test_that("element access methods for double ALTREP with nulls", {
 expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # because there are no nulls, DATAPTR() does not materialize
 # because there are nulls, DATAPTR() does materialize
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 expect_true(test_arrow_altrep_is_materialized(altrep))

Expand DownExpand Up@@ -244,14 +244,13 @@ test_that("element access methods for character ALTREP", {
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 # match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
 expect_true(test_arrow_altrep_is_materialized(altrep))

 # test element access after materialization
 expect_true(test_arrow_altrep_is_materialized(altrep))
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("element access methods for character ALTREP from large_utf8()", {
Expand All@@ -265,14 +264,13 @@ test_that("element access methods for character ALTREP from large_utf8()", {
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 # match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
 expect_true(test_arrow_altrep_is_materialized(altrep))

 # test element access after materialization
 expect_true(test_arrow_altrep_is_materialized(altrep))
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("empty vectors are not altrep", {
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
WIP: [R] Verify CRAN release 19.0.1.1#46036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

amoeba
wants to merge
8
commits into

from

 Closed


WIP: [R] Verify CRAN release 19.0.1.1
#46036
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
cd80a87

GH-45850: Fix r-devel note about symbols in .a libs (#45870)


nealrichardson Mar 20, 2025
7dd6d01

MINOR: [R] Don't print that we're cleaning up static libs (#45958)


nealrichardson Mar 28, 2025
453c1f4

GH-45949: [R] Fix CRAN warnings for 19.0.1 about compiled code (#45951)


jonkeane Apr 5, 2025
709d70f

GH-45987: [C++] Set CMAKE_POLICY_VERSION_MINIMUM=3.5 for bundled depe…


assignUser Apr 1, 2025
8333cf2

GH-45499: [CI] Bump actions/cache version on GHA (#45500)


pitrou Feb 11, 2025
6e49131

Update NEWS.md


amoeba Apr 7, 2025
aba40f5

19.0.1.1


amoeba Apr 7, 2025
b60cb1f

Move Version out from inside of Authors@R


jonkeane Apr 7, 2025

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


2 changes: 1 addition & 1 deletion
.github/workflows/cpp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ${{ matrix.image }}-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/docs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: debian-docs-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/docs_light.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
 with:
 fetch-depth: 0
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: conda-docs-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: conda-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/python.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ${{ matrix.cache }}-${{ hashFiles('cpp/**') }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/r.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ jobs:
 run: |
 ci/scripts/util_free_space.sh
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 # As this key is identical on both matrix builds only one will be able to successfully cache,
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/r_nightly.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ jobs:
 exit 1
 fi
 - name: Cache Repo
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: repo
 key: r-nightly-${{ github.run_id }}
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/ruby.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ jobs:
 fetch-depth: 0
 submodules: recursive
 - name: Cache Docker Volumes
 uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
 uses: actions/cache@v4
 with:
 path: .docker
 key: ubuntu-${{ matrix.ubuntu }}-ruby-${{ hashFiles('cpp/**') }}
Expand Down

5 changes: 4 additions & 1 deletion
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -967,7 +967,8 @@ set(EP_COMMON_CMAKE_ARGS
 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}
 -DCMAKE_INSTALL_LIBDIR=lib
 -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
 -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE})
 -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
 -DCMAKE_POLICY_VERSION_MINIMUM=3.5)

# if building with a toolchain file, pass that through
if(CMAKE_TOOLCHAIN_FILE)
Expand DownExpand Up@@ -1033,6 +1034,8 @@ macro(prepare_fetchcontent)
 set(CMAKE_COMPILE_WARNING_AS_ERROR FALSE)
 set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY TRUE)
 set(CMAKE_MACOSX_RPATH ${ARROW_INSTALL_NAME_RPATH})
 set(CMAKE_POLICY_VERSION_MINIMUM 3.5)

 if(MSVC)
 string(REPLACE "/WX" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 string(REPLACE "/WX" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
Expand Down

2 changes: 1 addition & 1 deletion
r/DESCRIPTION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 19.0.1
Version: 19.0.1.1
Authors@R: c(
 person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
 person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down

7 changes: 7 additions & 0 deletions
r/NEWS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
 under the License.
-->

# arrow 19.0.1.1

## Minor improvements and fixes

- Updated internal code to comply with new CRAN requirements on non-API calls ([#45949](https://github.com/apache/arrow/issues/45949))
- Enable building the bundled third-party libraries under CMake 4.0 ([#45987](https://github.com/apache/arrow/issues/45987))

Comment on lines

+22
 to 
+25

@jonkeanejonkeaneApr 7, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for these! Good summary

# arrow 19.0.1

This release primarily updates the underlying Arrow C++ version used by the
Expand Down

5 changes: 5 additions & 0 deletions
r/src/Makevars.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,3 +27,8 @@ PKG_CPPFLAGS=@cflags@
# PKG_CXXFLAGS=$(CXX_VISIBILITY)
CXX_STD=CXX17
PKG_LIBS=@libs@

all: $(SHLIB) purify

purify: $(SHLIB)
	@rm -rf ../libarrow || true

52 changes: 35 additions & 17 deletions
r/src/altrep.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ const std::shared_ptr<ChunkedArray>& GetChunkedArray(SEXP alt) {
// materialization is needed.
// data2: starts as NULL, and becomes a standard R vector with the same
// data if necessary: if materialization is needed, e.g. if we need
// to access its data pointer, with DATAPTR().
// to access its data pointer, with INTEGER(), REAL(), etc.
template <typename Impl>
struct AltrepVectorBase {
 // store the Array as an external pointer in data1, mark as immutable
Expand DownExpand Up@@ -220,7 +220,14 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
 SEXP copy = PROTECT(Rf_allocVector(sexp_type, size));

 // copy the data from the array, through Get_region
 Get_region(alt, 0, size, reinterpret_cast<c_type*>(DATAPTR(copy)));
 if constexpr (std::is_same_v<c_type, double>) {
 Get_region(alt, 0, size, REAL(copy));
 } else if constexpr (std::is_same_v<c_type, int>) {
 Get_region(alt, 0, size, INTEGER(copy));
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }

 // store as data2, this is now considered materialized
 SetRepresentation(alt, copy);
Expand DownExpand Up@@ -269,13 +276,27 @@ struct AltrepVectorPrimitive : public AltrepVectorBase<AltrepVectorPrimitive<sex
 }

 // Otherwise we have to materialize and hand the pointer to data2
 return DATAPTR(Materialize(alt));
 if constexpr (std::is_same_v<c_type, double>) {
 return REAL(Materialize(alt));
 } else if constexpr (std::is_same_v<c_type, int>) {
 return INTEGER(Materialize(alt));
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }
 }

 // The value at position i
 static c_type Elt(SEXP alt, R_xlen_t i) {
 if (IsMaterialized(alt)) {
 return reinterpret_cast<c_type*>(DATAPTR(Representation(alt)))[i];
 if constexpr (std::is_same_v<c_type, double>) {
 return REAL(Representation(alt))[i];
 } else if constexpr (std::is_same_v<c_type, int>) {
 return INTEGER(Representation(alt))[i];
 } else {
 static_assert(std::is_same_v<c_type, double> || std::is_same_v<c_type, int>,
 "ALTREP not implemented for this c_type");
 }
 }

 auto altrep_data =
Expand DownExpand Up@@ -531,7 +552,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
 SEXP copy = PROTECT(Rf_allocVector(INTSXP, size));

 // copy the data from the array, through Get_region
 Get_region(alt, 0, size, reinterpret_cast<int*>(DATAPTR(copy)));
 Get_region(alt, 0, size, INTEGER(copy));

 // store as data2, this is now considered materialized
 SetRepresentation(alt, copy);
Expand All@@ -552,7 +573,7 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
 return nullptr;
 }

 static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
 static void* Dataptr(SEXP alt, Rboolean writeable) { return INTEGER(Materialize(alt)); }

 static SEXP Duplicate(SEXP alt, Rboolean /* deep */) {
 // the representation integer vector
Expand DownExpand Up@@ -892,7 +913,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
 return s;
 }

 static void* Dataptr(SEXP alt, Rboolean writeable) { return DATAPTR(Materialize(alt)); }
 static void* Dataptr(SEXP alt, Rboolean writeable) {
 return const_cast<void*>(DATAPTR_RO(Materialize(alt)));
 }

 static SEXP Materialize(SEXP alt) {
 if (Base::IsMaterialized(alt)) {
Expand DownExpand Up@@ -931,7 +954,9 @@ struct AltrepVectorString : public AltrepVectorBase<AltrepVectorString<Type>> {
 }

 static const void* Dataptr_or_null(SEXP alt) {
 if (Base::IsMaterialized(alt)) return DATAPTR(Representation(alt));
 if (Base::IsMaterialized(alt)) {
 return DATAPTR_RO(alt);
 }

 // otherwise give up
 return nullptr;
Expand DownExpand Up@@ -1267,21 +1292,14 @@ sexp test_arrow_altrep_copy_by_dataptr(sexp x) {

 if (TYPEOF(x) == INTSXP) {
 cpp11::writable::integers out(Rf_xlength(x));
 int* ptr = reinterpret_cast<int*>(DATAPTR(x));
 int* ptr = INTEGER(x);
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
 return out;
 } else if (TYPEOF(x) == REALSXP) {
 cpp11::writable::doubles out(Rf_xlength(x));
 double* ptr = reinterpret_cast<double*>(DATAPTR(x));
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
 return out;
 } else if (TYPEOF(x) == STRSXP) {
 cpp11::writable::strings out(Rf_xlength(x));
 SEXP* ptr = reinterpret_cast<SEXP*>(DATAPTR(x));
 double* ptr = REAL(x);
 for (R_xlen_t i = 0; i < n; i++) {
 out[i] = ptr[i];
 }
Expand Down

20 changes: 19 additions & 1 deletion
r/src/arrow_types.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,14 +173,32 @@ template <typename RVector>
class RBuffer : public MutableBuffer {
 public:
 explicit RBuffer(RVector vec)
 : MutableBuffer(reinterpret_cast<uint8_t*>(DATAPTR(vec)),
 : MutableBuffer(reinterpret_cast<uint8_t*>(getDataPointer(vec)),
 vec.size() * sizeof(typename RVector::value_type),
 arrow::CPUDevice::memory_manager(gc_memory_pool())),
 vec_(vec) {}

 private:
 // vec_ holds the memory
 RVector vec_;

 static void* getDataPointer(RVector& vec) {
 if (TYPEOF(vec) == LGLSXP) {
 return LOGICAL(vec);
 } else if (TYPEOF(vec) == INTSXP) {
 return INTEGER(vec);
 } else if (TYPEOF(vec) == REALSXP) {
 return REAL(vec);
 } else if (TYPEOF(vec) == CPLXSXP) {
 return COMPLEX(vec);
 } else if (TYPEOF(vec) == STRSXP) {
 // We don't want to expose the string data here, so we error
 cpp11::stop("Operation not supported for string vectors.");
 } else {
 // raw
 return RAW(vec);
 }
 }
};

std::shared_ptr<arrow::DataType> InferArrowTypeFromFactor(SEXP);
Expand Down

12 changes: 6 additions & 6 deletions
r/src/r_to_arrow.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1214,11 +1214,11 @@ bool can_reuse_memory(SEXP x, const std::shared_ptr<arrow::DataType>& type) {
 // because MakeSimpleArray below will force materialization
 switch (type->id()) {
 case Type::INT32:
 return TYPEOF(x) == INTSXP && !OBJECT(x);
 return TYPEOF(x) == INTSXP && !Rf_isObject(x);
 case Type::DOUBLE:
 return TYPEOF(x) == REALSXP && !OBJECT(x);
 return TYPEOF(x) == REALSXP && !Rf_isObject(x);
 case Type::INT8:
 return TYPEOF(x) == RAWSXP && !OBJECT(x);
 return TYPEOF(x) == RAWSXP && !Rf_isObject(x);
 case Type::INT64:
 return TYPEOF(x) == REALSXP && Rf_inherits(x, "integer64");
 default:
Expand DownExpand Up@@ -1412,17 +1412,17 @@ bool vector_from_r_memory(SEXP x, const std::shared_ptr<DataType>& type,

 switch (type->id()) {
 case Type::INT32:
 return TYPEOF(x) == INTSXP && !OBJECT(x) &&
 return TYPEOF(x) == INTSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::integers, Int32Type>(x, type, columns, j,
 tasks);

 case Type::DOUBLE:
 return TYPEOF(x) == REALSXP && !OBJECT(x) &&
 return TYPEOF(x) == REALSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::doubles, DoubleType>(x, type, columns, j,
 tasks);

 case Type::UINT8:
 return TYPEOF(x) == RAWSXP && !OBJECT(x) &&
 return TYPEOF(x) == RAWSXP && !Rf_isObject(x) &&
 vector_from_r_memory_impl<cpp11::raws, UInt8Type>(x, type, columns, j,
 tasks);

Expand Down

14 changes: 6 additions & 8 deletions
r/tests/testthat/test-altrep.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ test_that("element access methods for int32 ALTREP with nulls", {
 expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # because there are no nulls, DATAPTR() does not materialize
 # because there are nulls, DATAPTR() does materialize
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 expect_true(test_arrow_altrep_is_materialized(altrep))

Expand All@@ -193,7 +193,7 @@ test_that("element access methods for double ALTREP with nulls", {
 expect_identical(test_arrow_altrep_copy_by_region(altrep, 123), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # because there are no nulls, DATAPTR() does not materialize
 # because there are nulls, DATAPTR() does materialize
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 expect_true(test_arrow_altrep_is_materialized(altrep))

Expand DownExpand Up@@ -244,14 +244,13 @@ test_that("element access methods for character ALTREP", {
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 # match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
 expect_true(test_arrow_altrep_is_materialized(altrep))

 # test element access after materialization
 expect_true(test_arrow_altrep_is_materialized(altrep))
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("element access methods for character ALTREP from large_utf8()", {
Expand All@@ -265,14 +264,13 @@ test_that("element access methods for character ALTREP from large_utf8()", {
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_false(test_arrow_altrep_is_materialized(altrep))

 # DATAPTR() should always materialize for strings
expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
 # match() calls DATAPTR() internally which materializes the vector
match(altrep, c("1", "40", "999"))
 expect_true(test_arrow_altrep_is_materialized(altrep))

 # test element access after materialization
 expect_true(test_arrow_altrep_is_materialized(altrep))
 expect_identical(test_arrow_altrep_copy_by_element(altrep), original)
 expect_identical(test_arrow_altrep_copy_by_dataptr(altrep), original)
})

test_that("empty vectors are not altrep", {
Expand Down