Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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/RcppExports.R

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

4 changes: 3 additions & 1 deletion r/R/Schema.R
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
`arrow::Schema` <- R6Class("arrow::Schema",
inherit = `arrow::Object`,
public = list(
ToString = function() Schema__ToString(self)
ToString = function() Schema__ToString(self),
num_fields = function() Schema__num_fields(self),
field = function(i) construct(`arrow::Field`, Schema__field(self, i))
)
)

Expand Down
25 changes: 25 additions & 0 deletions r/src/RcppExports.cpp

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

36 changes: 36 additions & 0 deletions r/src/array.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,40 @@ SEXP Int64Array(const std::shared_ptr<Array>& array) {
return vec;
}

SEXP DecimalArray(const std::shared_ptr<Array>& array) {
auto n = array->length();
NumericVector vec(no_init(n));

if (n == 0) return vec;

auto null_count = array->null_count();
if (null_count == n) {
std::fill(vec.begin(), vec.end(), NA_REAL);
return vec;
}

auto p_vec = reinterpret_cast<double*>(vec.begin());
const auto& decimals_arr =
internal::checked_cast<const arrow::Decimal128Array&>(*array);

if (array->null_count()) {
internal::BitmapReader bitmap_reader(array->null_bitmap()->data(), array->offset(),
n);

for (size_t i = 0; i < n; i++, bitmap_reader.Next()) {
p_vec[i] = bitmap_reader.IsNotSet()
? NA_REAL
: std::stod(decimals_arr.FormatValue(i).c_str());
}
} else {
for (size_t i = 0; i < n; i++) {
p_vec[i] = std::stod(decimals_arr.FormatValue(i).c_str());
}
}

return vec;
}

} // namespace r
} // namespace arrow

Expand Down Expand Up @@ -748,6 +782,8 @@ SEXP Array__as_vector(const std::shared_ptr<arrow::Array>& array) {
// lossy promotions to numeric vector
case Type::INT64:
return arrow::r::Int64Array(array);
case Type::DECIMAL:
return arrow::r::DecimalArray(array);

default:
break;
Expand Down
15 changes: 15 additions & 0 deletions r/src/datatype.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,21 @@ std::string Schema__ToString(const std::shared_ptr<arrow::Schema>& s) {
return s->ToString();
}

// [[Rcpp::export]]
int Schema__num_fields(const std::shared_ptr<arrow::Schema>& s) {
return s->num_fields();
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Field> Schema__field(const std::shared_ptr<arrow::Schema>& s,
int i) {
if (i >= s->num_fields() || i < 0) {
Rcpp::stop("Invalid field index for schema.");
}

return s->field(i);
}

// [[Rcpp::export]]
std::string ListType__ToString(const std::shared_ptr<arrow::ListType>& type) {
return type->ToString();
Expand Down