Skip to content

GH-48631: [R] Non-API calls: 'ATTRIB', 'SET_ATTRIB' #48634

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

Merged
thisisnic merged 3 commits into from
Jan 12, 2026
Merged

GH-48631: [R] Non-API calls: 'ATTRIB', 'SET_ATTRIB' #48634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
084745d
Remove non-API calls
thisisnic Dec 23, 2025
6dcb11c
Backport R_altrep_class_name
thisisnic Jan 12, 2026
d6c7a41
Revert other changes
thisisnic Jan 12, 2026
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
23 changes: 10 additions & 13 deletions r/src/altrep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ struct AltrepVectorBase {
// What gets printed on .Internal(inspect(<the altrep object>))
static Rboolean Inspect(SEXP alt, int pre, int deep, int pvec,
void (*inspect_subtree)(SEXP, int, int, int)) {
SEXP data_class_sym = CAR(ATTRIB(ALTREP_CLASS(alt)));
const char* class_name = CHAR(PRINTNAME(data_class_sym));
SEXP class_sym = R_altrep_class_name(alt);
const char* class_name = CHAR(PRINTNAME(class_sym));

if (IsMaterialized(alt)) {
Rprintf("materialized %s len=%ld\n", class_name,
Expand Down Expand Up @@ -574,11 +574,10 @@ struct AltrepFactor : public AltrepVectorBase<AltrepFactor> {
// the representation integer vector
SEXP dup = PROTECT(Rf_shallow_duplicate(Materialize(alt)));

// additional attributes from the altrep
SEXP atts = PROTECT(Rf_duplicate(ATTRIB(alt)));
SET_ATTRIB(dup, atts);
// copy attributes from the altrep object
DUPLICATE_ATTRIB(dup, alt);

UNPROTECT(2);
UNPROTECT(1);
return dup;
}

Expand Down Expand Up @@ -1094,9 +1093,7 @@ SEXP MakeAltrepVector(const std::shared_ptr<ChunkedArray>& chunked_array) {

bool is_arrow_altrep(SEXP x) {
if (ALTREP(x)) {
SEXP info = ALTREP_CLASS_SERIALIZED_CLASS(ALTREP_CLASS(x));
SEXP pkg = ALTREP_SERIALIZED_CLASS_PKGSYM(info);

SEXP pkg = R_altrep_class_package(x);
if (pkg == symbols::arrow) return true;
}

Expand Down Expand Up @@ -1160,8 +1157,8 @@ sexp test_arrow_altrep_is_materialized(sexp x) {
return Rf_ScalarLogical(NA_LOGICAL);
}

sexp data_class_sym = CAR(ATTRIB(ALTREP_CLASS(x)));
std::string class_name(CHAR(PRINTNAME(data_class_sym)));
SEXP class_sym = R_altrep_class_name(x);
std::string class_name(CHAR(PRINTNAME(class_sym)));

int result = NA_LOGICAL;
if (class_name == "arrow::array_dbl_vector") {
Expand Down Expand Up @@ -1191,8 +1188,8 @@ bool test_arrow_altrep_force_materialize(sexp x) {
stop("x is already materialized");
}

sexp data_class_sym = CAR(ATTRIB(ALTREP_CLASS(x)));
std::string class_name(CHAR(PRINTNAME(data_class_sym)));
SEXP class_sym = R_altrep_class_name(x);
std::string class_name(CHAR(PRINTNAME(class_sym)));

if (class_name == "arrow::array_dbl_vector") {
arrow::r::altrep::AltrepVectorPrimitive<REALSXP>::Materialize(x);
Expand Down
15 changes: 10 additions & 5 deletions r/src/arrow_cpp11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@
#define ARROW_R_DCHECK(EXPR)
#endif

// For context, see:
// https://github.com/r-devel/r-svn/blob/6418faeb6f5d87d3d9b92b8978773bc3856b4b6f/src/main/altrep.c#L37
#define ALTREP_CLASS_SERIALIZED_CLASS(x) ATTRIB(x)
#define ALTREP_SERIALIZED_CLASS_PKGSYM(x) CADR(x)

#if (R_VERSION < R_Version(3, 5, 0))
#define LOGICAL_RO(x) ((const int*)LOGICAL(x))
#define INTEGER_RO(x) ((const int*)INTEGER(x))
Expand All @@ -55,6 +50,16 @@
#define DATAPTR(x) (void*)STRING_PTR(x)
#endif

// R_altrep_class_name and R_altrep_class_package don't exist before R 4.6
#if R_VERSION < R_Version(4, 6, 0)
inline SEXP R_altrep_class_name(SEXP x) {
return ALTREP(x) ? CAR(ATTRIB(ALTREP_CLASS(x))) : R_NilValue;
}
inline SEXP R_altrep_class_package(SEXP x) {
return ALTREP(x) ? CADR(ATTRIB(ALTREP_CLASS(x))) : R_NilValue;
}
#endif

namespace arrow {
namespace r {

Expand Down
Loading