Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
8 changes: 8 additions & 0 deletions r/R/arrowExports.R

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

5 changes: 5 additions & 0 deletions r/data-raw/codegen.R
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,11 @@ glue::glue('\n
'extern "C" void R_init_arrow(DllInfo* dll){
R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
R_useDynamicSymbols(dll, FALSE);

#if defined(HAS_ALTREP)
arrow::r::Init_Altrep_classes(dll);
#endif

}
\n')

Expand Down
166 changes: 166 additions & 0 deletions r/src/altrep.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

#include <cpp11/altrep.hpp>

#include "./arrow_types.h"

#if defined(HAS_ALTREP)

#include <R_ext/Altrep.h>
#include <arrow/array.h>

namespace arrow {
namespace r {

template <int sexp_type>
struct ArrayNoNull {
using data_type = typename std::conditional<sexp_type == INTSXP, int, double>::type;
static void DeleteArray(std::shared_ptr<Array>* ptr) { delete ptr; }
using Pointer = cpp11::external_pointer<std::shared_ptr<Array>, DeleteArray>;

// altrep object around an Array with no nulls
// data1: an external pointer to a shared pointer to the Array
// data2: not used

static SEXP Make(R_altrep_class_t class_t, const std::shared_ptr<Array>& array) {
// we don't need the whole r6 object, just an external pointer
// that retain the array
Pointer xp(new std::shared_ptr<Array>(array));

SEXP res = R_new_altrep(class_t, xp, R_NilValue);
MARK_NOT_MUTABLE(res);

return res;
}

static Rboolean Inspect(SEXP x, int pre, int deep, int pvec,
void (*inspect_subtree)(SEXP, int, int, int)) {
const auto& array = Get(x);
Rprintf("arrow::Array<%s, NONULL> len=%d, Array=<%p>\n",
array->type()->ToString().c_str(), array->length(), array.get());
inspect_subtree(R_altrep_data1(x), pre, deep + 1, pvec);
return TRUE;
}

static const std::shared_ptr<Array>& Get(SEXP vec) {
return *Pointer(R_altrep_data1(vec));
}

static R_xlen_t Length(SEXP vec) { return Get(vec)->length(); }

static const void* Dataptr_or_null(SEXP vec) {
return Get(vec)->data()->template GetValues<data_type>(1);
}

static SEXP Duplicate(SEXP vec, Rboolean) {
const auto& array = Get(vec);
auto size = array->length();

SEXP copy = PROTECT(Rf_allocVector(sexp_type, array->length()));

memcpy(DATAPTR(copy), Dataptr_or_null(vec), size * sizeof(data_type));

UNPROTECT(1);
return copy;
}

static void* Dataptr(SEXP vec, Rboolean writeable) {
return const_cast<void*>(Dataptr_or_null(vec));
}

// by definition, there are no NA
static int No_NA(SEXP vec) { return 1; }

static void Init(R_altrep_class_t class_t, DllInfo* dll) {
// altrep
R_set_altrep_Length_method(class_t, ArrayNoNull::Length);
R_set_altrep_Inspect_method(class_t, ArrayNoNull::Inspect);
R_set_altrep_Duplicate_method(class_t, ArrayNoNull::Duplicate);

// altvec
R_set_altvec_Dataptr_method(class_t, ArrayNoNull::Dataptr);
R_set_altvec_Dataptr_or_null_method(class_t, ArrayNoNull::Dataptr_or_null);
}
};

struct DoubleArrayNoNull {
static R_altrep_class_t class_t;

static void Init(DllInfo* dll) {
class_t = R_make_altreal_class("array_nonull_dbl_vector", "arrow", dll);
ArrayNoNull<REALSXP>::Init(class_t, dll);
R_set_altreal_No_NA_method(class_t, ArrayNoNull<REALSXP>::No_NA);
}

static SEXP Make(const std::shared_ptr<Array>& array) {
return ArrayNoNull<REALSXP>::Make(class_t, array);
}
};

struct Int32ArrayNoNull {
static R_altrep_class_t class_t;

static void Init(DllInfo* dll) {
class_t = R_make_altinteger_class("array_nonull_int_vector", "arrow", dll);
ArrayNoNull<INTSXP>::Init(class_t, dll);
R_set_altinteger_No_NA_method(class_t, ArrayNoNull<INTSXP>::No_NA);
}

static SEXP Make(const std::shared_ptr<Array>& array) {
return ArrayNoNull<INTSXP>::Make(class_t, array);
}
};

R_altrep_class_t Int32ArrayNoNull::class_t;
R_altrep_class_t DoubleArrayNoNull::class_t;

void Init_Altrep_classes(DllInfo* dll) {
DoubleArrayNoNull::Init(dll);
Int32ArrayNoNull::Init(dll);
}

SEXP MakeDoubleArrayNoNull(const std::shared_ptr<Array>& array) {
return DoubleArrayNoNull::Make(array);
}

SEXP MakeInt32ArrayNoNull(const std::shared_ptr<Array>& array) {
return Int32ArrayNoNull::Make(array);
Copy link
Member

Choose a reason for hiding this comment

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

Edge case worthy of mention in a comment somewhere: IIUC this doesn't check for instances of NA_integer_ in array and these will be considered null by R even though is_altrep_int_nonull(as.vector(array)) (and we report no_NA = 1)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll think about where to mention this, but this isn't limited to these altrep variants. any int32 array that happens to have a non null NA_integer_ will be mismanaged by R with this sentinel approach.

}

} // namespace r
} // namespace arrow

#endif

// [[arrow::export]]
bool is_altrep_int_nonull(SEXP x) {
#if defined(HAS_ALTREP)
return R_altrep_inherits(x, arrow::r::Int32ArrayNoNull::class_t);
#else
return false;
#endif
}

// [[arrow::export]]
bool is_altrep_dbl_nonull(SEXP x) {
#if defined(HAS_ALTREP)
return R_altrep_inherits(x, arrow::r::DoubleArrayNoNull::class_t);
#else
return false;
#endif
}
23 changes: 23 additions & 0 deletions r/src/array_to_vector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <arrow/util/parallel.h>
#include <arrow/util/task_group.h>

#include <cpp11/altrep.hpp>
#include <type_traits>

namespace arrow {
Expand Down Expand Up @@ -143,6 +144,24 @@ Status IngestSome(const std::shared_ptr<arrow::Array>& array, R_xlen_t n,
// Allocate + Ingest
SEXP ArrayVector__as_vector(R_xlen_t n, const std::shared_ptr<DataType>& type,
const ArrayVector& arrays) {
#if defined(HAS_ALTREP)
// special case when there is only one array
if (arrays.size() == 1) {
const auto& array = arrays[0];
if (arrow::r::GetBoolOption("arrow.use_altrep", true) && array->length() > 0 &&
array->null_count() == 0) {
switch (type->id()) {
case arrow::Type::DOUBLE:
return arrow::r::MakeDoubleArrayNoNull(array);
case arrow::Type::INT32:
return arrow::r::MakeInt32ArrayNoNull(array);
default:
break;
}
}
}
#endif

auto converter = Converter::Make(type, arrays);
SEXP data = PROTECT(converter->Allocate(n));
StopIfNotOk(converter->IngestSerial(data));
Expand Down Expand Up @@ -1280,6 +1299,10 @@ SEXP Array__as_vector(const std::shared_ptr<arrow::Array>& array) {

// [[arrow::export]]
SEXP ChunkedArray__as_vector(const std::shared_ptr<arrow::ChunkedArray>& chunked_array) {
if (chunked_array->num_chunks() == 1) {
return Array__as_vector(chunked_array->chunk(0));
}

return arrow::r::ArrayVector__as_vector(chunked_array->length(), chunked_array->type(),
chunked_array->chunks());
}
Expand Down
37 changes: 37 additions & 0 deletions r/src/arrowExports.cpp

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

6 changes: 6 additions & 0 deletions r/src/arrow_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,12 @@ arrow::Status InferSchemaFromDots(SEXP lst, SEXP schema_sxp, int num_fields,
arrow::Status AddMetadataFromDots(SEXP lst, int num_fields,
std::shared_ptr<arrow::Schema>& schema);

#if defined(HAS_ALTREP)
void Init_Altrep_classes(DllInfo* dll);
SEXP MakeInt32ArrayNoNull(const std::shared_ptr<Array>& array);
SEXP MakeDoubleArrayNoNull(const std::shared_ptr<Array>& array);
#endif

} // namespace r
} // namespace arrow

Expand Down
Loading