Skip to content

Commit 7c28cd2

Browse files
committed
chore: Avoid calls to non-API R functions
1 parent 6c666a7 commit 7c28cd2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/reltoaltrep.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ MaterializedQueryResult *AltrepRelationWrapper::GetQueryResult() {
122122
cpp11::stop("Materialization is disabled, use collect() or as_tibble() to materialize.");
123123
}
124124

125-
auto materialize_callback = Rf_GetOption(RStrings::get().materialize_callback_sym, R_BaseEnv);
125+
auto materialize_callback = Rf_GetOption1(RStrings::get().materialize_callback_sym);
126126
if (Rf_isFunction(materialize_callback)) {
127127
sexp call = Rf_lang2(materialize_callback, rel_eptr);
128128
Rf_eval(call, R_BaseEnv);
129129
}
130130

131-
auto materialize_message = Rf_GetOption(RStrings::get().materialize_message_sym, R_BaseEnv);
131+
auto materialize_message = Rf_GetOption1(RStrings::get().materialize_message_sym);
132132
if (Rf_isLogical(materialize_message) && Rf_length(materialize_message) == 1 &&
133133
LOGICAL_ELT(materialize_message, 0) == true) {
134134
// Legacy
@@ -244,7 +244,7 @@ struct AltrepVectorWrapper {
244244
dest_offset += chunk.size();
245245
}
246246
}
247-
return DATAPTR(transformed_vector);
247+
return (void*)DATAPTR_RO(transformed_vector);
248248
}
249249

250250
SEXP Vector() {

src/scan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ struct DedupPointerEnumType {
6464
return val == NA_STRING;
6565
}
6666
static uintptr_t Convert(SEXP val) {
67-
return (uintptr_t)DATAPTR(val);
67+
return (uintptr_t)DATAPTR_RO(val);
6868
}
6969
};
7070

src/transform.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ SEXP ToRString(const string_t &input) {
216216

217217
void duckdb_r_transform(Vector &src_vec, const SEXP dest, idx_t dest_offset, idx_t n, bool integer64) {
218218
if (src_vec.GetType().GetAlias() == R_STRING_TYPE_NAME) {
219-
ptrdiff_t sexp_header_size = (data_ptr_t)DATAPTR(R_BlankString) - (data_ptr_t)R_BlankString;
219+
ptrdiff_t sexp_header_size = (data_ptr_t)DATAPTR_RO(R_BlankString) - (data_ptr_t)R_BlankString;
220220

221221
auto child_ptr = FlatVector::GetData<uintptr_t>(src_vec);
222222
auto &mask = FlatVector::Validity(src_vec);

0 commit comments

Comments
 (0)