Skip to content
Closed
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export(decimal)
export(decimal128)
export(default_memory_pool)
export(dictionary)
export(duration)
export(ends_with)
export(everything)
export(field)
Expand Down
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.

25 changes: 25 additions & 0 deletions r/R/type.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,13 @@ TimeType <- R6Class("TimeType",
Time32 <- R6Class("Time32", inherit = TimeType)
Time64 <- R6Class("Time64", inherit = TimeType)

DurationType <- R6Class("DurationType",
inherit = FixedWidthType,
public = list(
unit = function() DurationType__unit(self)
)
)

Null <- R6Class("Null", inherit = DataType)

Timestamp <- R6Class("Timestamp",
Expand DownExpand Up@@ -334,6 +341,13 @@ valid_time64_units <- c(
"us" = TimeUnit$MICRO
)

valid_duration_units <- c(
"s" = TimeUnit$SECOND,
"ms" = TimeUnit$MILLI,
"us" = TimeUnit$MICRO,
"ns" = TimeUnit$NANO
)

make_valid_time_unit <- function(unit, valid_units) {
if (is.character(unit)) {
unit <- valid_units[match.arg(unit, choices = names(valid_units))]
Expand All@@ -360,6 +374,16 @@ time64 <- function(unit = c("ns", "us")) {
Time64__initialize(unit)
}

#' @rdname data-type
#' @export
duration <- function(unit = c("s", "ms", "us", "ns")) {
if (is.character(unit)) {
unit <- match.arg(unit)
}
unit <- make_valid_time_unit(unit, valid_duration_units)
Duration__initialize(unit)
}

#' @rdname data-type
#' @export
null <- function() Null__initialize()
Expand DownExpand Up@@ -503,6 +527,7 @@ canonical_type_str <- function(type_str) {
large_list = "large_list",
fixed_size_list_of = "fixed_size_list",
fixed_size_list = "fixed_size_list",
duration = "duration",
stop("Unrecognized string representation of data type", call. = FALSE)
)
}
Expand Down
3 changes: 3 additions & 0 deletions r/man/data-type.Rd

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

58 changes: 58 additions & 0 deletions r/src/array_to_vector.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -886,6 +886,61 @@ class Converter_Time : public Converter {
}
};

template <typename value_type, typename unit_type = TimeType>
class Converter_Duration : public Converter {
public:
explicit Converter_Duration(const std::shared_ptr<ChunkedArray>& chunked_array)
: Converter(chunked_array) {}

SEXP Allocate(R_xlen_t n) const {
cpp11::writable::doubles data(n);
data.attr("class") = "difftime";

// difftime is always stored as "seconds"
data.attr("units") = cpp11::writable::strings({"secs"});
return data;
}

Status Ingest_all_nulls(SEXP data, R_xlen_t start, R_xlen_t n) const {
std::fill_n(REAL(data) + start, n, NA_REAL);
return Status::OK();
}

Status Ingest_some_nulls(SEXP data, const std::shared_ptr<arrow::Array>& array,
R_xlen_t start, R_xlen_t n, size_t chunk_index) const {
int multiplier = TimeUnit_multiplier(array);

auto p_data = REAL(data) + start;
auto p_values = array->data()->GetValues<value_type>(1);
auto ingest_one = [&](R_xlen_t i) {
p_data[i] = static_cast<double>(p_values[i]) / multiplier;
return Status::OK();
};
auto null_one = [&](R_xlen_t i) {
p_data[i] = NA_REAL;
return Status::OK();
};
return IngestSome(array, n, ingest_one, null_one);
}

private:
int TimeUnit_multiplier(const std::shared_ptr<Array>& array) const {
// difftime is always "seconds", so multiply based on the Array's TimeUnit
switch (static_cast<unit_type*>(array->type().get())->unit()) {
case TimeUnit::SECOND:
return 1;
case TimeUnit::MILLI:
return 1000;
case TimeUnit::MICRO:
return 1000000;
case TimeUnit::NANO:
return 1000000000;
default:
return 0;
}
}
};

template <typename value_type>
class Converter_Timestamp : public Converter_Time<value_type, TimestampType> {
public:
Expand DownExpand Up@@ -1204,6 +1259,9 @@ std::shared_ptr<Converter> Converter::Make(
case Type::TIME64:
return std::make_shared<arrow::r::Converter_Time<int64_t>>(chunked_array);

case Type::DURATION:
return std::make_shared<arrow::r::Converter_Duration<int64_t>>(chunked_array);

case Type::TIMESTAMP:
return std::make_shared<arrow::r::Converter_Timestamp<int64_t>>(chunked_array);

Expand Down
32 changes: 32 additions & 0 deletions r/src/arrowExports.cpp

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

12 changes: 12 additions & 0 deletions r/src/datatype.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ const char* r6_class_name<arrow::DataType>::get(
return "Time32";
case Type::TIME64:
return "Time64";
case Type::DURATION:
return "DurationType";

case Type::DECIMAL128:
return "Decimal128Type";
Expand DownExpand Up@@ -207,6 +209,11 @@ std::shared_ptr<arrow::DataType> Time64__initialize(arrow::TimeUnit::type unit)
return arrow::time64(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> Duration__initialize(arrow::TimeUnit::type unit) {
return arrow::duration(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> list__(SEXP x) {
if (Rf_inherits(x, "Field")) {
Expand DownExpand Up@@ -309,6 +316,11 @@ arrow::TimeUnit::type TimeType__unit(const std::shared_ptr<arrow::TimeType>& typ
return type->unit();
}

// [[arrow::export]]
arrow::TimeUnit::type DurationType__unit(const std::shared_ptr<arrow::TimeType>& type) {
return type->unit();
}

// [[arrow::export]]
int32_t DecimalType__precision(const std::shared_ptr<arrow::DecimalType>& type) {
return type->precision();
Expand Down
71 changes: 54 additions & 17 deletions r/src/r_to_arrow.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@ enum RVectorType {
DATE_INT,
DATE_DBL,
TIME,
DURATION,
POSIXCT,
POSIXLT,
BINARY,
Expand DownExpand Up@@ -107,8 +108,10 @@ RVectorType GetVectorType(SEXP x) {
return INT64;
} else if (Rf_inherits(x, "POSIXct")) {
return POSIXCT;
} else if (Rf_inherits(x, "difftime")) {
} else if (Rf_inherits(x, "hms")) {
return TIME;
} else if (Rf_inherits(x, "difftime")) {
return DURATION;
} else {
return FLOAT64;
}
Expand DownExpand Up@@ -580,6 +583,23 @@ int64_t get_TimeUnit_multiplier(TimeUnit::type unit) {
}
}

Result<int> get_difftime_unit_multiplier(SEXP x) {
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
return 1;
} else if (unit == "mins") {
return 60;
} else if (unit == "hours") {
return 3600;
} else if (unit == "days") {
return 86400;
} else if (unit == "weeks") {
return 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
}

template <typename T>
class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
Expand All@@ -592,21 +612,7 @@ class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
}

// multiplier to get the number of seconds from the value stored in the R vector
int difftime_multiplier;
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
difftime_multiplier = 1;
} else if (unit == "mins") {
difftime_multiplier = 60;
} else if (unit == "hours") {
difftime_multiplier = 3600;
} else if (unit == "days") {
difftime_multiplier = 86400;
} else if (unit == "weeks") {
difftime_multiplier = 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

// then multiply the seconds by this to match the time unit
auto multiplier =
Expand DownExpand Up@@ -822,7 +828,38 @@ class RPrimitiveConverter<T, enable_if_t<is_duration_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
public:
Status Extend(SEXP x, int64_t size, int64_t offset = 0) override {
// TODO: look in lubridate
auto rtype = GetVectorType(x);

// only handle <difftime> R objects
if (rtype == DURATION) {
RETURN_NOT_OK(this->Reserve(size - offset));

ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

int64_t multiplier =
get_TimeUnit_multiplier(this->primitive_type_->unit()) * difftime_multiplier;

auto append_value = [this, multiplier](double value) {
auto converted = static_cast<typename T::c_type>(value * multiplier);
this->primitive_builder_->UnsafeAppend(converted);
return Status::OK();
};
auto append_null = [this]() {
this->primitive_builder_->UnsafeAppendNull();
return Status::OK();
};

if (ALTREP(x)) {
return VisitVector(RVectorIterator_ALTREP<double>(x, offset), size, append_null,
append_value);
} else {
return VisitVector(RVectorIterator<double>(x, offset), size, append_null,
append_value);
}

return Status::OK();
}

return Status::NotImplemented("Extend");
}
};
Expand Down
5 changes: 4 additions & 1 deletion r/src/type_infer.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,9 +96,12 @@ std::shared_ptr<arrow::DataType> InferArrowTypeFromVector<REALSXP>(SEXP x) {
if (Rf_inherits(x, "integer64")) {
return int64();
}
if (Rf_inherits(x, "difftime")) {
if (Rf_inherits(x, "hms")) {
return time32(TimeUnit::SECOND);
}
if (Rf_inherits(x, "difftime")) {
return duration(TimeUnit::SECOND);
}
return float64();
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
ARROW-14941 [R] Implement Duration R6 class and bindings for lubridate::duration() by paleolimbot · Pull Request #11850 · apache/arrow · GitHub
Skip to content
Closed
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export(decimal)
export(decimal128)
export(default_memory_pool)
export(dictionary)
export(duration)
export(ends_with)
export(everything)
export(field)
Expand Down
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.

25 changes: 25 additions & 0 deletions r/R/type.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,13 @@ TimeType <- R6Class("TimeType",
Time32 <- R6Class("Time32", inherit = TimeType)
Time64 <- R6Class("Time64", inherit = TimeType)

DurationType <- R6Class("DurationType",
inherit = FixedWidthType,
public = list(
unit = function() DurationType__unit(self)
)
)

Null <- R6Class("Null", inherit = DataType)

Timestamp <- R6Class("Timestamp",
Expand DownExpand Up@@ -334,6 +341,13 @@ valid_time64_units <- c(
"us" = TimeUnit$MICRO
)

valid_duration_units <- c(
"s" = TimeUnit$SECOND,
"ms" = TimeUnit$MILLI,
"us" = TimeUnit$MICRO,
"ns" = TimeUnit$NANO
)

make_valid_time_unit <- function(unit, valid_units) {
if (is.character(unit)) {
unit <- valid_units[match.arg(unit, choices = names(valid_units))]
Expand All@@ -360,6 +374,16 @@ time64 <- function(unit = c("ns", "us")) {
Time64__initialize(unit)
}

#' @rdname data-type
#' @export
duration <- function(unit = c("s", "ms", "us", "ns")) {
if (is.character(unit)) {
unit <- match.arg(unit)
}
unit <- make_valid_time_unit(unit, valid_duration_units)
Duration__initialize(unit)
}

#' @rdname data-type
#' @export
null <- function() Null__initialize()
Expand DownExpand Up@@ -503,6 +527,7 @@ canonical_type_str <- function(type_str) {
large_list = "large_list",
fixed_size_list_of = "fixed_size_list",
fixed_size_list = "fixed_size_list",
duration = "duration",
stop("Unrecognized string representation of data type", call. = FALSE)
)
}
Expand Down
3 changes: 3 additions & 0 deletions r/man/data-type.Rd

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

58 changes: 58 additions & 0 deletions r/src/array_to_vector.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -886,6 +886,61 @@ class Converter_Time : public Converter {
}
};

template <typename value_type, typename unit_type = TimeType>
class Converter_Duration : public Converter {
public:
explicit Converter_Duration(const std::shared_ptr<ChunkedArray>& chunked_array)
: Converter(chunked_array) {}

SEXP Allocate(R_xlen_t n) const {
cpp11::writable::doubles data(n);
data.attr("class") = "difftime";

// difftime is always stored as "seconds"
data.attr("units") = cpp11::writable::strings({"secs"});
return data;
}

Status Ingest_all_nulls(SEXP data, R_xlen_t start, R_xlen_t n) const {
std::fill_n(REAL(data) + start, n, NA_REAL);
return Status::OK();
}

Status Ingest_some_nulls(SEXP data, const std::shared_ptr<arrow::Array>& array,
R_xlen_t start, R_xlen_t n, size_t chunk_index) const {
int multiplier = TimeUnit_multiplier(array);

auto p_data = REAL(data) + start;
auto p_values = array->data()->GetValues<value_type>(1);
auto ingest_one = [&](R_xlen_t i) {
p_data[i] = static_cast<double>(p_values[i]) / multiplier;
return Status::OK();
};
auto null_one = [&](R_xlen_t i) {
p_data[i] = NA_REAL;
return Status::OK();
};
return IngestSome(array, n, ingest_one, null_one);
}

private:
int TimeUnit_multiplier(const std::shared_ptr<Array>& array) const {
// difftime is always "seconds", so multiply based on the Array's TimeUnit
switch (static_cast<unit_type*>(array->type().get())->unit()) {
case TimeUnit::SECOND:
return 1;
case TimeUnit::MILLI:
return 1000;
case TimeUnit::MICRO:
return 1000000;
case TimeUnit::NANO:
return 1000000000;
default:
return 0;
}
}
};

template <typename value_type>
class Converter_Timestamp : public Converter_Time<value_type, TimestampType> {
public:
Expand DownExpand Up@@ -1204,6 +1259,9 @@ std::shared_ptr<Converter> Converter::Make(
case Type::TIME64:
return std::make_shared<arrow::r::Converter_Time<int64_t>>(chunked_array);

case Type::DURATION:
return std::make_shared<arrow::r::Converter_Duration<int64_t>>(chunked_array);

case Type::TIMESTAMP:
return std::make_shared<arrow::r::Converter_Timestamp<int64_t>>(chunked_array);

Expand Down
32 changes: 32 additions & 0 deletions r/src/arrowExports.cpp

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

12 changes: 12 additions & 0 deletions r/src/datatype.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ const char* r6_class_name<arrow::DataType>::get(
return "Time32";
case Type::TIME64:
return "Time64";
case Type::DURATION:
return "DurationType";

case Type::DECIMAL128:
return "Decimal128Type";
Expand DownExpand Up@@ -207,6 +209,11 @@ std::shared_ptr<arrow::DataType> Time64__initialize(arrow::TimeUnit::type unit)
return arrow::time64(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> Duration__initialize(arrow::TimeUnit::type unit) {
return arrow::duration(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> list__(SEXP x) {
if (Rf_inherits(x, "Field")) {
Expand DownExpand Up@@ -309,6 +316,11 @@ arrow::TimeUnit::type TimeType__unit(const std::shared_ptr<arrow::TimeType>& typ
return type->unit();
}

// [[arrow::export]]
arrow::TimeUnit::type DurationType__unit(const std::shared_ptr<arrow::TimeType>& type) {
return type->unit();
}

// [[arrow::export]]
int32_t DecimalType__precision(const std::shared_ptr<arrow::DecimalType>& type) {
return type->precision();
Expand Down
71 changes: 54 additions & 17 deletions r/src/r_to_arrow.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@ enum RVectorType {
DATE_INT,
DATE_DBL,
TIME,
DURATION,
POSIXCT,
POSIXLT,
BINARY,
Expand DownExpand Up@@ -107,8 +108,10 @@ RVectorType GetVectorType(SEXP x) {
return INT64;
} else if (Rf_inherits(x, "POSIXct")) {
return POSIXCT;
} else if (Rf_inherits(x, "difftime")) {
} else if (Rf_inherits(x, "hms")) {
return TIME;
} else if (Rf_inherits(x, "difftime")) {
return DURATION;
} else {
return FLOAT64;
}
Expand DownExpand Up@@ -580,6 +583,23 @@ int64_t get_TimeUnit_multiplier(TimeUnit::type unit) {
}
}

Result<int> get_difftime_unit_multiplier(SEXP x) {
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
return 1;
} else if (unit == "mins") {
return 60;
} else if (unit == "hours") {
return 3600;
} else if (unit == "days") {
return 86400;
} else if (unit == "weeks") {
return 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
}

template <typename T>
class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
Expand All@@ -592,21 +612,7 @@ class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
}

// multiplier to get the number of seconds from the value stored in the R vector
int difftime_multiplier;
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
difftime_multiplier = 1;
} else if (unit == "mins") {
difftime_multiplier = 60;
} else if (unit == "hours") {
difftime_multiplier = 3600;
} else if (unit == "days") {
difftime_multiplier = 86400;
} else if (unit == "weeks") {
difftime_multiplier = 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

// then multiply the seconds by this to match the time unit
auto multiplier =
Expand DownExpand Up@@ -822,7 +828,38 @@ class RPrimitiveConverter<T, enable_if_t<is_duration_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
public:
Status Extend(SEXP x, int64_t size, int64_t offset = 0) override {
// TODO: look in lubridate
auto rtype = GetVectorType(x);

// only handle <difftime> R objects
if (rtype == DURATION) {
RETURN_NOT_OK(this->Reserve(size - offset));

ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

int64_t multiplier =
get_TimeUnit_multiplier(this->primitive_type_->unit()) * difftime_multiplier;

auto append_value = [this, multiplier](double value) {
auto converted = static_cast<typename T::c_type>(value * multiplier);
this->primitive_builder_->UnsafeAppend(converted);
return Status::OK();
};
auto append_null = [this]() {
this->primitive_builder_->UnsafeAppendNull();
return Status::OK();
};

if (ALTREP(x)) {
return VisitVector(RVectorIterator_ALTREP<double>(x, offset), size, append_null,
append_value);
} else {
return VisitVector(RVectorIterator<double>(x, offset), size, append_null,
append_value);
}

return Status::OK();
}

return Status::NotImplemented("Extend");
}
};
Expand Down
5 changes: 4 additions & 1 deletion r/src/type_infer.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,9 +96,12 @@ std::shared_ptr<arrow::DataType> InferArrowTypeFromVector<REALSXP>(SEXP x) {
if (Rf_inherits(x, "integer64")) {
return int64();
}
if (Rf_inherits(x, "difftime")) {
if (Rf_inherits(x, "hms")) {
return time32(TimeUnit::SECOND);
}
if (Rf_inherits(x, "difftime")) {
return duration(TimeUnit::SECOND);
}
return float64();
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ARROW-14941 [R] Implement Duration R6 class and bindings for lubridate::duration() by paleolimbot · Pull Request #11850 · apache/arrow · GitHub
Skip to content
Closed
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export(decimal)
export(decimal128)
export(default_memory_pool)
export(dictionary)
export(duration)
export(ends_with)
export(everything)
export(field)
Expand Down
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.

25 changes: 25 additions & 0 deletions r/R/type.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,13 @@ TimeType <- R6Class("TimeType",
Time32 <- R6Class("Time32", inherit = TimeType)
Time64 <- R6Class("Time64", inherit = TimeType)

DurationType <- R6Class("DurationType",
inherit = FixedWidthType,
public = list(
unit = function() DurationType__unit(self)
)
)

Null <- R6Class("Null", inherit = DataType)

Timestamp <- R6Class("Timestamp",
Expand DownExpand Up@@ -334,6 +341,13 @@ valid_time64_units <- c(
"us" = TimeUnit$MICRO
)

valid_duration_units <- c(
"s" = TimeUnit$SECOND,
"ms" = TimeUnit$MILLI,
"us" = TimeUnit$MICRO,
"ns" = TimeUnit$NANO
)

make_valid_time_unit <- function(unit, valid_units) {
if (is.character(unit)) {
unit <- valid_units[match.arg(unit, choices = names(valid_units))]
Expand All@@ -360,6 +374,16 @@ time64 <- function(unit = c("ns", "us")) {
Time64__initialize(unit)
}

#' @rdname data-type
#' @export
duration <- function(unit = c("s", "ms", "us", "ns")) {
if (is.character(unit)) {
unit <- match.arg(unit)
}
unit <- make_valid_time_unit(unit, valid_duration_units)
Duration__initialize(unit)
}

#' @rdname data-type
#' @export
null <- function() Null__initialize()
Expand DownExpand Up@@ -503,6 +527,7 @@ canonical_type_str <- function(type_str) {
large_list = "large_list",
fixed_size_list_of = "fixed_size_list",
fixed_size_list = "fixed_size_list",
duration = "duration",
stop("Unrecognized string representation of data type", call. = FALSE)
)
}
Expand Down
3 changes: 3 additions & 0 deletions r/man/data-type.Rd

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

58 changes: 58 additions & 0 deletions r/src/array_to_vector.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -886,6 +886,61 @@ class Converter_Time : public Converter {
}
};

template <typename value_type, typename unit_type = TimeType>
class Converter_Duration : public Converter {
public:
explicit Converter_Duration(const std::shared_ptr<ChunkedArray>& chunked_array)
: Converter(chunked_array) {}

SEXP Allocate(R_xlen_t n) const {
cpp11::writable::doubles data(n);
data.attr("class") = "difftime";

// difftime is always stored as "seconds"
data.attr("units") = cpp11::writable::strings({"secs"});
return data;
}

Status Ingest_all_nulls(SEXP data, R_xlen_t start, R_xlen_t n) const {
std::fill_n(REAL(data) + start, n, NA_REAL);
return Status::OK();
}

Status Ingest_some_nulls(SEXP data, const std::shared_ptr<arrow::Array>& array,
R_xlen_t start, R_xlen_t n, size_t chunk_index) const {
int multiplier = TimeUnit_multiplier(array);

auto p_data = REAL(data) + start;
auto p_values = array->data()->GetValues<value_type>(1);
auto ingest_one = [&](R_xlen_t i) {
p_data[i] = static_cast<double>(p_values[i]) / multiplier;
return Status::OK();
};
auto null_one = [&](R_xlen_t i) {
p_data[i] = NA_REAL;
return Status::OK();
};
return IngestSome(array, n, ingest_one, null_one);
}

private:
int TimeUnit_multiplier(const std::shared_ptr<Array>& array) const {
// difftime is always "seconds", so multiply based on the Array's TimeUnit
switch (static_cast<unit_type*>(array->type().get())->unit()) {
case TimeUnit::SECOND:
return 1;
case TimeUnit::MILLI:
return 1000;
case TimeUnit::MICRO:
return 1000000;
case TimeUnit::NANO:
return 1000000000;
default:
return 0;
}
}
};

template <typename value_type>
class Converter_Timestamp : public Converter_Time<value_type, TimestampType> {
public:
Expand DownExpand Up@@ -1204,6 +1259,9 @@ std::shared_ptr<Converter> Converter::Make(
case Type::TIME64:
return std::make_shared<arrow::r::Converter_Time<int64_t>>(chunked_array);

case Type::DURATION:
return std::make_shared<arrow::r::Converter_Duration<int64_t>>(chunked_array);

case Type::TIMESTAMP:
return std::make_shared<arrow::r::Converter_Timestamp<int64_t>>(chunked_array);

Expand Down
32 changes: 32 additions & 0 deletions r/src/arrowExports.cpp

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

12 changes: 12 additions & 0 deletions r/src/datatype.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ const char* r6_class_name<arrow::DataType>::get(
return "Time32";
case Type::TIME64:
return "Time64";
case Type::DURATION:
return "DurationType";

case Type::DECIMAL128:
return "Decimal128Type";
Expand DownExpand Up@@ -207,6 +209,11 @@ std::shared_ptr<arrow::DataType> Time64__initialize(arrow::TimeUnit::type unit)
return arrow::time64(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> Duration__initialize(arrow::TimeUnit::type unit) {
return arrow::duration(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> list__(SEXP x) {
if (Rf_inherits(x, "Field")) {
Expand DownExpand Up@@ -309,6 +316,11 @@ arrow::TimeUnit::type TimeType__unit(const std::shared_ptr<arrow::TimeType>& typ
return type->unit();
}

// [[arrow::export]]
arrow::TimeUnit::type DurationType__unit(const std::shared_ptr<arrow::TimeType>& type) {
return type->unit();
}

// [[arrow::export]]
int32_t DecimalType__precision(const std::shared_ptr<arrow::DecimalType>& type) {
return type->precision();
Expand Down
71 changes: 54 additions & 17 deletions r/src/r_to_arrow.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@ enum RVectorType {
DATE_INT,
DATE_DBL,
TIME,
DURATION,
POSIXCT,
POSIXLT,
BINARY,
Expand DownExpand Up@@ -107,8 +108,10 @@ RVectorType GetVectorType(SEXP x) {
return INT64;
} else if (Rf_inherits(x, "POSIXct")) {
return POSIXCT;
} else if (Rf_inherits(x, "difftime")) {
} else if (Rf_inherits(x, "hms")) {
return TIME;
} else if (Rf_inherits(x, "difftime")) {
return DURATION;
} else {
return FLOAT64;
}
Expand DownExpand Up@@ -580,6 +583,23 @@ int64_t get_TimeUnit_multiplier(TimeUnit::type unit) {
}
}

Result<int> get_difftime_unit_multiplier(SEXP x) {
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
return 1;
} else if (unit == "mins") {
return 60;
} else if (unit == "hours") {
return 3600;
} else if (unit == "days") {
return 86400;
} else if (unit == "weeks") {
return 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
}

template <typename T>
class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
Expand All@@ -592,21 +612,7 @@ class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
}

// multiplier to get the number of seconds from the value stored in the R vector
int difftime_multiplier;
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
difftime_multiplier = 1;
} else if (unit == "mins") {
difftime_multiplier = 60;
} else if (unit == "hours") {
difftime_multiplier = 3600;
} else if (unit == "days") {
difftime_multiplier = 86400;
} else if (unit == "weeks") {
difftime_multiplier = 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

// then multiply the seconds by this to match the time unit
auto multiplier =
Expand DownExpand Up@@ -822,7 +828,38 @@ class RPrimitiveConverter<T, enable_if_t<is_duration_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
public:
Status Extend(SEXP x, int64_t size, int64_t offset = 0) override {
// TODO: look in lubridate
auto rtype = GetVectorType(x);

// only handle <difftime> R objects
if (rtype == DURATION) {
RETURN_NOT_OK(this->Reserve(size - offset));

ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

int64_t multiplier =
get_TimeUnit_multiplier(this->primitive_type_->unit()) * difftime_multiplier;

auto append_value = [this, multiplier](double value) {
auto converted = static_cast<typename T::c_type>(value * multiplier);
this->primitive_builder_->UnsafeAppend(converted);
return Status::OK();
};
auto append_null = [this]() {
this->primitive_builder_->UnsafeAppendNull();
return Status::OK();
};

if (ALTREP(x)) {
return VisitVector(RVectorIterator_ALTREP<double>(x, offset), size, append_null,
append_value);
} else {
return VisitVector(RVectorIterator<double>(x, offset), size, append_null,
append_value);
}

return Status::OK();
}

return Status::NotImplemented("Extend");
}
};
Expand Down
5 changes: 4 additions & 1 deletion r/src/type_infer.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,9 +96,12 @@ std::shared_ptr<arrow::DataType> InferArrowTypeFromVector<REALSXP>(SEXP x) {
if (Rf_inherits(x, "integer64")) {
return int64();
}
if (Rf_inherits(x, "difftime")) {
if (Rf_inherits(x, "hms")) {
return time32(TimeUnit::SECOND);
}
if (Rf_inherits(x, "difftime")) {
return duration(TimeUnit::SECOND);
}
return float64();
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ARROW-14941 [R] Implement Duration R6 class and bindings for lubridate::duration() by paleolimbot · Pull Request #11850 · apache/arrow · GitHub
Skip to content
Closed
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export(decimal)
export(decimal128)
export(default_memory_pool)
export(dictionary)
export(duration)
export(ends_with)
export(everything)
export(field)
Expand Down
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.

25 changes: 25 additions & 0 deletions r/R/type.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,13 @@ TimeType <- R6Class("TimeType",
Time32 <- R6Class("Time32", inherit = TimeType)
Time64 <- R6Class("Time64", inherit = TimeType)

DurationType <- R6Class("DurationType",
inherit = FixedWidthType,
public = list(
unit = function() DurationType__unit(self)
)
)

Null <- R6Class("Null", inherit = DataType)

Timestamp <- R6Class("Timestamp",
Expand DownExpand Up@@ -334,6 +341,13 @@ valid_time64_units <- c(
"us" = TimeUnit$MICRO
)

valid_duration_units <- c(
"s" = TimeUnit$SECOND,
"ms" = TimeUnit$MILLI,
"us" = TimeUnit$MICRO,
"ns" = TimeUnit$NANO
)

make_valid_time_unit <- function(unit, valid_units) {
if (is.character(unit)) {
unit <- valid_units[match.arg(unit, choices = names(valid_units))]
Expand All@@ -360,6 +374,16 @@ time64 <- function(unit = c("ns", "us")) {
Time64__initialize(unit)
}

#' @rdname data-type
#' @export
duration <- function(unit = c("s", "ms", "us", "ns")) {
if (is.character(unit)) {
unit <- match.arg(unit)
}
unit <- make_valid_time_unit(unit, valid_duration_units)
Duration__initialize(unit)
}

#' @rdname data-type
#' @export
null <- function() Null__initialize()
Expand DownExpand Up@@ -503,6 +527,7 @@ canonical_type_str <- function(type_str) {
large_list = "large_list",
fixed_size_list_of = "fixed_size_list",
fixed_size_list = "fixed_size_list",
duration = "duration",
stop("Unrecognized string representation of data type", call. = FALSE)
)
}
Expand Down
3 changes: 3 additions & 0 deletions r/man/data-type.Rd

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

58 changes: 58 additions & 0 deletions r/src/array_to_vector.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -886,6 +886,61 @@ class Converter_Time : public Converter {
}
};

template <typename value_type, typename unit_type = TimeType>
class Converter_Duration : public Converter {
public:
explicit Converter_Duration(const std::shared_ptr<ChunkedArray>& chunked_array)
: Converter(chunked_array) {}

SEXP Allocate(R_xlen_t n) const {
cpp11::writable::doubles data(n);
data.attr("class") = "difftime";

// difftime is always stored as "seconds"
data.attr("units") = cpp11::writable::strings({"secs"});
return data;
}

Status Ingest_all_nulls(SEXP data, R_xlen_t start, R_xlen_t n) const {
std::fill_n(REAL(data) + start, n, NA_REAL);
return Status::OK();
}

Status Ingest_some_nulls(SEXP data, const std::shared_ptr<arrow::Array>& array,
R_xlen_t start, R_xlen_t n, size_t chunk_index) const {
int multiplier = TimeUnit_multiplier(array);

auto p_data = REAL(data) + start;
auto p_values = array->data()->GetValues<value_type>(1);
auto ingest_one = [&](R_xlen_t i) {
p_data[i] = static_cast<double>(p_values[i]) / multiplier;
return Status::OK();
};
auto null_one = [&](R_xlen_t i) {
p_data[i] = NA_REAL;
return Status::OK();
};
return IngestSome(array, n, ingest_one, null_one);
}

private:
int TimeUnit_multiplier(const std::shared_ptr<Array>& array) const {
// difftime is always "seconds", so multiply based on the Array's TimeUnit
switch (static_cast<unit_type*>(array->type().get())->unit()) {
case TimeUnit::SECOND:
return 1;
case TimeUnit::MILLI:
return 1000;
case TimeUnit::MICRO:
return 1000000;
case TimeUnit::NANO:
return 1000000000;
default:
return 0;
}
}
};

template <typename value_type>
class Converter_Timestamp : public Converter_Time<value_type, TimestampType> {
public:
Expand DownExpand Up@@ -1204,6 +1259,9 @@ std::shared_ptr<Converter> Converter::Make(
case Type::TIME64:
return std::make_shared<arrow::r::Converter_Time<int64_t>>(chunked_array);

case Type::DURATION:
return std::make_shared<arrow::r::Converter_Duration<int64_t>>(chunked_array);

case Type::TIMESTAMP:
return std::make_shared<arrow::r::Converter_Timestamp<int64_t>>(chunked_array);

Expand Down
32 changes: 32 additions & 0 deletions r/src/arrowExports.cpp

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

12 changes: 12 additions & 0 deletions r/src/datatype.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ const char* r6_class_name<arrow::DataType>::get(
return "Time32";
case Type::TIME64:
return "Time64";
case Type::DURATION:
return "DurationType";

case Type::DECIMAL128:
return "Decimal128Type";
Expand DownExpand Up@@ -207,6 +209,11 @@ std::shared_ptr<arrow::DataType> Time64__initialize(arrow::TimeUnit::type unit)
return arrow::time64(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> Duration__initialize(arrow::TimeUnit::type unit) {
return arrow::duration(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> list__(SEXP x) {
if (Rf_inherits(x, "Field")) {
Expand DownExpand Up@@ -309,6 +316,11 @@ arrow::TimeUnit::type TimeType__unit(const std::shared_ptr<arrow::TimeType>& typ
return type->unit();
}

// [[arrow::export]]
arrow::TimeUnit::type DurationType__unit(const std::shared_ptr<arrow::TimeType>& type) {
return type->unit();
}

// [[arrow::export]]
int32_t DecimalType__precision(const std::shared_ptr<arrow::DecimalType>& type) {
return type->precision();
Expand Down
71 changes: 54 additions & 17 deletions r/src/r_to_arrow.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@ enum RVectorType {
DATE_INT,
DATE_DBL,
TIME,
DURATION,
POSIXCT,
POSIXLT,
BINARY,
Expand DownExpand Up@@ -107,8 +108,10 @@ RVectorType GetVectorType(SEXP x) {
return INT64;
} else if (Rf_inherits(x, "POSIXct")) {
return POSIXCT;
} else if (Rf_inherits(x, "difftime")) {
} else if (Rf_inherits(x, "hms")) {
return TIME;
} else if (Rf_inherits(x, "difftime")) {
return DURATION;
} else {
return FLOAT64;
}
Expand DownExpand Up@@ -580,6 +583,23 @@ int64_t get_TimeUnit_multiplier(TimeUnit::type unit) {
}
}

Result<int> get_difftime_unit_multiplier(SEXP x) {
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
return 1;
} else if (unit == "mins") {
return 60;
} else if (unit == "hours") {
return 3600;
} else if (unit == "days") {
return 86400;
} else if (unit == "weeks") {
return 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
}

template <typename T>
class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
Expand All@@ -592,21 +612,7 @@ class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
}

// multiplier to get the number of seconds from the value stored in the R vector
int difftime_multiplier;
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
difftime_multiplier = 1;
} else if (unit == "mins") {
difftime_multiplier = 60;
} else if (unit == "hours") {
difftime_multiplier = 3600;
} else if (unit == "days") {
difftime_multiplier = 86400;
} else if (unit == "weeks") {
difftime_multiplier = 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

// then multiply the seconds by this to match the time unit
auto multiplier =
Expand DownExpand Up@@ -822,7 +828,38 @@ class RPrimitiveConverter<T, enable_if_t<is_duration_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
public:
Status Extend(SEXP x, int64_t size, int64_t offset = 0) override {
// TODO: look in lubridate
auto rtype = GetVectorType(x);

// only handle <difftime> R objects
if (rtype == DURATION) {
RETURN_NOT_OK(this->Reserve(size - offset));

ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

int64_t multiplier =
get_TimeUnit_multiplier(this->primitive_type_->unit()) * difftime_multiplier;

auto append_value = [this, multiplier](double value) {
auto converted = static_cast<typename T::c_type>(value * multiplier);
this->primitive_builder_->UnsafeAppend(converted);
return Status::OK();
};
auto append_null = [this]() {
this->primitive_builder_->UnsafeAppendNull();
return Status::OK();
};

if (ALTREP(x)) {
return VisitVector(RVectorIterator_ALTREP<double>(x, offset), size, append_null,
append_value);
} else {
return VisitVector(RVectorIterator<double>(x, offset), size, append_null,
append_value);
}

return Status::OK();
}

return Status::NotImplemented("Extend");
}
};
Expand Down
5 changes: 4 additions & 1 deletion r/src/type_infer.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,9 +96,12 @@ std::shared_ptr<arrow::DataType> InferArrowTypeFromVector<REALSXP>(SEXP x) {
if (Rf_inherits(x, "integer64")) {
return int64();
}
if (Rf_inherits(x, "difftime")) {
if (Rf_inherits(x, "hms")) {
return time32(TimeUnit::SECOND);
}
if (Rf_inherits(x, "difftime")) {
return duration(TimeUnit::SECOND);
}
return float64();
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' ARROW-14941 [R] Implement Duration R6 class and bindings for lubridate::duration() by paleolimbot · Pull Request #11850 · apache/arrow · GitHub
Skip to content
Closed
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export(decimal)
export(decimal128)
export(default_memory_pool)
export(dictionary)
export(duration)
export(ends_with)
export(everything)
export(field)
Expand Down
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.

25 changes: 25 additions & 0 deletions r/R/type.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,13 @@ TimeType <- R6Class("TimeType",
Time32 <- R6Class("Time32", inherit = TimeType)
Time64 <- R6Class("Time64", inherit = TimeType)

DurationType <- R6Class("DurationType",
inherit = FixedWidthType,
public = list(
unit = function() DurationType__unit(self)
)
)

Null <- R6Class("Null", inherit = DataType)

Timestamp <- R6Class("Timestamp",
Expand DownExpand Up@@ -334,6 +341,13 @@ valid_time64_units <- c(
"us" = TimeUnit$MICRO
)

valid_duration_units <- c(
"s" = TimeUnit$SECOND,
"ms" = TimeUnit$MILLI,
"us" = TimeUnit$MICRO,
"ns" = TimeUnit$NANO
)

make_valid_time_unit <- function(unit, valid_units) {
if (is.character(unit)) {
unit <- valid_units[match.arg(unit, choices = names(valid_units))]
Expand All@@ -360,6 +374,16 @@ time64 <- function(unit = c("ns", "us")) {
Time64__initialize(unit)
}

#' @rdname data-type
#' @export
duration <- function(unit = c("s", "ms", "us", "ns")) {
if (is.character(unit)) {
unit <- match.arg(unit)
}
unit <- make_valid_time_unit(unit, valid_duration_units)
Duration__initialize(unit)
}

#' @rdname data-type
#' @export
null <- function() Null__initialize()
Expand DownExpand Up@@ -503,6 +527,7 @@ canonical_type_str <- function(type_str) {
large_list = "large_list",
fixed_size_list_of = "fixed_size_list",
fixed_size_list = "fixed_size_list",
duration = "duration",
stop("Unrecognized string representation of data type", call. = FALSE)
)
}
Expand Down
3 changes: 3 additions & 0 deletions r/man/data-type.Rd

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

58 changes: 58 additions & 0 deletions r/src/array_to_vector.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -886,6 +886,61 @@ class Converter_Time : public Converter {
}
};

template <typename value_type, typename unit_type = TimeType>
class Converter_Duration : public Converter {
public:
explicit Converter_Duration(const std::shared_ptr<ChunkedArray>& chunked_array)
: Converter(chunked_array) {}

SEXP Allocate(R_xlen_t n) const {
cpp11::writable::doubles data(n);
data.attr("class") = "difftime";

// difftime is always stored as "seconds"
data.attr("units") = cpp11::writable::strings({"secs"});
return data;
}

Status Ingest_all_nulls(SEXP data, R_xlen_t start, R_xlen_t n) const {
std::fill_n(REAL(data) + start, n, NA_REAL);
return Status::OK();
}

Status Ingest_some_nulls(SEXP data, const std::shared_ptr<arrow::Array>& array,
R_xlen_t start, R_xlen_t n, size_t chunk_index) const {
int multiplier = TimeUnit_multiplier(array);

auto p_data = REAL(data) + start;
auto p_values = array->data()->GetValues<value_type>(1);
auto ingest_one = [&](R_xlen_t i) {
p_data[i] = static_cast<double>(p_values[i]) / multiplier;
return Status::OK();
};
auto null_one = [&](R_xlen_t i) {
p_data[i] = NA_REAL;
return Status::OK();
};
return IngestSome(array, n, ingest_one, null_one);
}

private:
int TimeUnit_multiplier(const std::shared_ptr<Array>& array) const {
// difftime is always "seconds", so multiply based on the Array's TimeUnit
switch (static_cast<unit_type*>(array->type().get())->unit()) {
case TimeUnit::SECOND:
return 1;
case TimeUnit::MILLI:
return 1000;
case TimeUnit::MICRO:
return 1000000;
case TimeUnit::NANO:
return 1000000000;
default:
return 0;
}
}
};

template <typename value_type>
class Converter_Timestamp : public Converter_Time<value_type, TimestampType> {
public:
Expand DownExpand Up@@ -1204,6 +1259,9 @@ std::shared_ptr<Converter> Converter::Make(
case Type::TIME64:
return std::make_shared<arrow::r::Converter_Time<int64_t>>(chunked_array);

case Type::DURATION:
return std::make_shared<arrow::r::Converter_Duration<int64_t>>(chunked_array);

case Type::TIMESTAMP:
return std::make_shared<arrow::r::Converter_Timestamp<int64_t>>(chunked_array);

Expand Down
32 changes: 32 additions & 0 deletions r/src/arrowExports.cpp

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

12 changes: 12 additions & 0 deletions r/src/datatype.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ const char* r6_class_name<arrow::DataType>::get(
return "Time32";
case Type::TIME64:
return "Time64";
case Type::DURATION:
return "DurationType";

case Type::DECIMAL128:
return "Decimal128Type";
Expand DownExpand Up@@ -207,6 +209,11 @@ std::shared_ptr<arrow::DataType> Time64__initialize(arrow::TimeUnit::type unit)
return arrow::time64(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> Duration__initialize(arrow::TimeUnit::type unit) {
return arrow::duration(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> list__(SEXP x) {
if (Rf_inherits(x, "Field")) {
Expand DownExpand Up@@ -309,6 +316,11 @@ arrow::TimeUnit::type TimeType__unit(const std::shared_ptr<arrow::TimeType>& typ
return type->unit();
}

// [[arrow::export]]
arrow::TimeUnit::type DurationType__unit(const std::shared_ptr<arrow::TimeType>& type) {
return type->unit();
}

// [[arrow::export]]
int32_t DecimalType__precision(const std::shared_ptr<arrow::DecimalType>& type) {
return type->precision();
Expand Down
71 changes: 54 additions & 17 deletions r/src/r_to_arrow.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@ enum RVectorType {
DATE_INT,
DATE_DBL,
TIME,
DURATION,
POSIXCT,
POSIXLT,
BINARY,
Expand DownExpand Up@@ -107,8 +108,10 @@ RVectorType GetVectorType(SEXP x) {
return INT64;
} else if (Rf_inherits(x, "POSIXct")) {
return POSIXCT;
} else if (Rf_inherits(x, "difftime")) {
} else if (Rf_inherits(x, "hms")) {
return TIME;
} else if (Rf_inherits(x, "difftime")) {
return DURATION;
} else {
return FLOAT64;
}
Expand DownExpand Up@@ -580,6 +583,23 @@ int64_t get_TimeUnit_multiplier(TimeUnit::type unit) {
}
}

Result<int> get_difftime_unit_multiplier(SEXP x) {
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
return 1;
} else if (unit == "mins") {
return 60;
} else if (unit == "hours") {
return 3600;
} else if (unit == "days") {
return 86400;
} else if (unit == "weeks") {
return 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
}

template <typename T>
class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
Expand All@@ -592,21 +612,7 @@ class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
}

// multiplier to get the number of seconds from the value stored in the R vector
int difftime_multiplier;
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
difftime_multiplier = 1;
} else if (unit == "mins") {
difftime_multiplier = 60;
} else if (unit == "hours") {
difftime_multiplier = 3600;
} else if (unit == "days") {
difftime_multiplier = 86400;
} else if (unit == "weeks") {
difftime_multiplier = 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

// then multiply the seconds by this to match the time unit
auto multiplier =
Expand DownExpand Up@@ -822,7 +828,38 @@ class RPrimitiveConverter<T, enable_if_t<is_duration_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
public:
Status Extend(SEXP x, int64_t size, int64_t offset = 0) override {
// TODO: look in lubridate
auto rtype = GetVectorType(x);

// only handle <difftime> R objects
if (rtype == DURATION) {
RETURN_NOT_OK(this->Reserve(size - offset));

ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

int64_t multiplier =
get_TimeUnit_multiplier(this->primitive_type_->unit()) * difftime_multiplier;

auto append_value = [this, multiplier](double value) {
auto converted = static_cast<typename T::c_type>(value * multiplier);
this->primitive_builder_->UnsafeAppend(converted);
return Status::OK();
};
auto append_null = [this]() {
this->primitive_builder_->UnsafeAppendNull();
return Status::OK();
};

if (ALTREP(x)) {
return VisitVector(RVectorIterator_ALTREP<double>(x, offset), size, append_null,
append_value);
} else {
return VisitVector(RVectorIterator<double>(x, offset), size, append_null,
append_value);
}

return Status::OK();
}

return Status::NotImplemented("Extend");
}
};
Expand Down
5 changes: 4 additions & 1 deletion r/src/type_infer.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,9 +96,12 @@ std::shared_ptr<arrow::DataType> InferArrowTypeFromVector<REALSXP>(SEXP x) {
if (Rf_inherits(x, "integer64")) {
return int64();
}
if (Rf_inherits(x, "difftime")) {
if (Rf_inherits(x, "hms")) {
return time32(TimeUnit::SECOND);
}
if (Rf_inherits(x, "difftime")) {
return duration(TimeUnit::SECOND);
}
return float64();
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ARROW-14941 [R] Implement Duration R6 class and bindings for lubridate::duration() by paleolimbot · Pull Request #11850 · apache/arrow · GitHub
Skip to content
Closed
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export(decimal)
export(decimal128)
export(default_memory_pool)
export(dictionary)
export(duration)
export(ends_with)
export(everything)
export(field)
Expand Down
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.

25 changes: 25 additions & 0 deletions r/R/type.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,13 @@ TimeType <- R6Class("TimeType",
Time32 <- R6Class("Time32", inherit = TimeType)
Time64 <- R6Class("Time64", inherit = TimeType)

DurationType <- R6Class("DurationType",
inherit = FixedWidthType,
public = list(
unit = function() DurationType__unit(self)
)
)

Null <- R6Class("Null", inherit = DataType)

Timestamp <- R6Class("Timestamp",
Expand DownExpand Up@@ -334,6 +341,13 @@ valid_time64_units <- c(
"us" = TimeUnit$MICRO
)

valid_duration_units <- c(
"s" = TimeUnit$SECOND,
"ms" = TimeUnit$MILLI,
"us" = TimeUnit$MICRO,
"ns" = TimeUnit$NANO
)

make_valid_time_unit <- function(unit, valid_units) {
if (is.character(unit)) {
unit <- valid_units[match.arg(unit, choices = names(valid_units))]
Expand All@@ -360,6 +374,16 @@ time64 <- function(unit = c("ns", "us")) {
Time64__initialize(unit)
}

#' @rdname data-type
#' @export
duration <- function(unit = c("s", "ms", "us", "ns")) {
if (is.character(unit)) {
unit <- match.arg(unit)
}
unit <- make_valid_time_unit(unit, valid_duration_units)
Duration__initialize(unit)
}

#' @rdname data-type
#' @export
null <- function() Null__initialize()
Expand DownExpand Up@@ -503,6 +527,7 @@ canonical_type_str <- function(type_str) {
large_list = "large_list",
fixed_size_list_of = "fixed_size_list",
fixed_size_list = "fixed_size_list",
duration = "duration",
stop("Unrecognized string representation of data type", call. = FALSE)
)
}
Expand Down
3 changes: 3 additions & 0 deletions r/man/data-type.Rd

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

58 changes: 58 additions & 0 deletions r/src/array_to_vector.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -886,6 +886,61 @@ class Converter_Time : public Converter {
}
};

template <typename value_type, typename unit_type = TimeType>
class Converter_Duration : public Converter {
public:
explicit Converter_Duration(const std::shared_ptr<ChunkedArray>& chunked_array)
: Converter(chunked_array) {}

SEXP Allocate(R_xlen_t n) const {
cpp11::writable::doubles data(n);
data.attr("class") = "difftime";

// difftime is always stored as "seconds"
data.attr("units") = cpp11::writable::strings({"secs"});
return data;
}

Status Ingest_all_nulls(SEXP data, R_xlen_t start, R_xlen_t n) const {
std::fill_n(REAL(data) + start, n, NA_REAL);
return Status::OK();
}

Status Ingest_some_nulls(SEXP data, const std::shared_ptr<arrow::Array>& array,
R_xlen_t start, R_xlen_t n, size_t chunk_index) const {
int multiplier = TimeUnit_multiplier(array);

auto p_data = REAL(data) + start;
auto p_values = array->data()->GetValues<value_type>(1);
auto ingest_one = [&](R_xlen_t i) {
p_data[i] = static_cast<double>(p_values[i]) / multiplier;
return Status::OK();
};
auto null_one = [&](R_xlen_t i) {
p_data[i] = NA_REAL;
return Status::OK();
};
return IngestSome(array, n, ingest_one, null_one);
}

private:
int TimeUnit_multiplier(const std::shared_ptr<Array>& array) const {
// difftime is always "seconds", so multiply based on the Array's TimeUnit
switch (static_cast<unit_type*>(array->type().get())->unit()) {
case TimeUnit::SECOND:
return 1;
case TimeUnit::MILLI:
return 1000;
case TimeUnit::MICRO:
return 1000000;
case TimeUnit::NANO:
return 1000000000;
default:
return 0;
}
}
};

template <typename value_type>
class Converter_Timestamp : public Converter_Time<value_type, TimestampType> {
public:
Expand DownExpand Up@@ -1204,6 +1259,9 @@ std::shared_ptr<Converter> Converter::Make(
case Type::TIME64:
return std::make_shared<arrow::r::Converter_Time<int64_t>>(chunked_array);

case Type::DURATION:
return std::make_shared<arrow::r::Converter_Duration<int64_t>>(chunked_array);

case Type::TIMESTAMP:
return std::make_shared<arrow::r::Converter_Timestamp<int64_t>>(chunked_array);

Expand Down
32 changes: 32 additions & 0 deletions r/src/arrowExports.cpp

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

12 changes: 12 additions & 0 deletions r/src/datatype.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ const char* r6_class_name<arrow::DataType>::get(
return "Time32";
case Type::TIME64:
return "Time64";
case Type::DURATION:
return "DurationType";

case Type::DECIMAL128:
return "Decimal128Type";
Expand DownExpand Up@@ -207,6 +209,11 @@ std::shared_ptr<arrow::DataType> Time64__initialize(arrow::TimeUnit::type unit)
return arrow::time64(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> Duration__initialize(arrow::TimeUnit::type unit) {
return arrow::duration(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> list__(SEXP x) {
if (Rf_inherits(x, "Field")) {
Expand DownExpand Up@@ -309,6 +316,11 @@ arrow::TimeUnit::type TimeType__unit(const std::shared_ptr<arrow::TimeType>& typ
return type->unit();
}

// [[arrow::export]]
arrow::TimeUnit::type DurationType__unit(const std::shared_ptr<arrow::TimeType>& type) {
return type->unit();
}

// [[arrow::export]]
int32_t DecimalType__precision(const std::shared_ptr<arrow::DecimalType>& type) {
return type->precision();
Expand Down
71 changes: 54 additions & 17 deletions r/src/r_to_arrow.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@ enum RVectorType {
DATE_INT,
DATE_DBL,
TIME,
DURATION,
POSIXCT,
POSIXLT,
BINARY,
Expand DownExpand Up@@ -107,8 +108,10 @@ RVectorType GetVectorType(SEXP x) {
return INT64;
} else if (Rf_inherits(x, "POSIXct")) {
return POSIXCT;
} else if (Rf_inherits(x, "difftime")) {
} else if (Rf_inherits(x, "hms")) {
return TIME;
} else if (Rf_inherits(x, "difftime")) {
return DURATION;
} else {
return FLOAT64;
}
Expand DownExpand Up@@ -580,6 +583,23 @@ int64_t get_TimeUnit_multiplier(TimeUnit::type unit) {
}
}

Result<int> get_difftime_unit_multiplier(SEXP x) {
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
return 1;
} else if (unit == "mins") {
return 60;
} else if (unit == "hours") {
return 3600;
} else if (unit == "days") {
return 86400;
} else if (unit == "weeks") {
return 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
}

template <typename T>
class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
Expand All@@ -592,21 +612,7 @@ class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
}

// multiplier to get the number of seconds from the value stored in the R vector
int difftime_multiplier;
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
difftime_multiplier = 1;
} else if (unit == "mins") {
difftime_multiplier = 60;
} else if (unit == "hours") {
difftime_multiplier = 3600;
} else if (unit == "days") {
difftime_multiplier = 86400;
} else if (unit == "weeks") {
difftime_multiplier = 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

// then multiply the seconds by this to match the time unit
auto multiplier =
Expand DownExpand Up@@ -822,7 +828,38 @@ class RPrimitiveConverter<T, enable_if_t<is_duration_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
public:
Status Extend(SEXP x, int64_t size, int64_t offset = 0) override {
// TODO: look in lubridate
auto rtype = GetVectorType(x);

// only handle <difftime> R objects
if (rtype == DURATION) {
RETURN_NOT_OK(this->Reserve(size - offset));

ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

int64_t multiplier =
get_TimeUnit_multiplier(this->primitive_type_->unit()) * difftime_multiplier;

auto append_value = [this, multiplier](double value) {
auto converted = static_cast<typename T::c_type>(value * multiplier);
this->primitive_builder_->UnsafeAppend(converted);
return Status::OK();
};
auto append_null = [this]() {
this->primitive_builder_->UnsafeAppendNull();
return Status::OK();
};

if (ALTREP(x)) {
return VisitVector(RVectorIterator_ALTREP<double>(x, offset), size, append_null,
append_value);
} else {
return VisitVector(RVectorIterator<double>(x, offset), size, append_null,
append_value);
}

return Status::OK();
}

return Status::NotImplemented("Extend");
}
};
Expand Down
5 changes: 4 additions & 1 deletion r/src/type_infer.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,9 +96,12 @@ std::shared_ptr<arrow::DataType> InferArrowTypeFromVector<REALSXP>(SEXP x) {
if (Rf_inherits(x, "integer64")) {
return int64();
}
if (Rf_inherits(x, "difftime")) {
if (Rf_inherits(x, "hms")) {
return time32(TimeUnit::SECOND);
}
if (Rf_inherits(x, "difftime")) {
return duration(TimeUnit::SECOND);
}
return float64();
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ARROW-14941 [R] Implement Duration R6 class and bindings for lubridate::duration() by paleolimbot · Pull Request #11850 · apache/arrow · GitHub
Skip to content
Closed
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export(decimal)
export(decimal128)
export(default_memory_pool)
export(dictionary)
export(duration)
export(ends_with)
export(everything)
export(field)
Expand Down
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.

25 changes: 25 additions & 0 deletions r/R/type.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,13 @@ TimeType <- R6Class("TimeType",
Time32 <- R6Class("Time32", inherit = TimeType)
Time64 <- R6Class("Time64", inherit = TimeType)

DurationType <- R6Class("DurationType",
inherit = FixedWidthType,
public = list(
unit = function() DurationType__unit(self)
)
)

Null <- R6Class("Null", inherit = DataType)

Timestamp <- R6Class("Timestamp",
Expand DownExpand Up@@ -334,6 +341,13 @@ valid_time64_units <- c(
"us" = TimeUnit$MICRO
)

valid_duration_units <- c(
"s" = TimeUnit$SECOND,
"ms" = TimeUnit$MILLI,
"us" = TimeUnit$MICRO,
"ns" = TimeUnit$NANO
)

make_valid_time_unit <- function(unit, valid_units) {
if (is.character(unit)) {
unit <- valid_units[match.arg(unit, choices = names(valid_units))]
Expand All@@ -360,6 +374,16 @@ time64 <- function(unit = c("ns", "us")) {
Time64__initialize(unit)
}

#' @rdname data-type
#' @export
duration <- function(unit = c("s", "ms", "us", "ns")) {
if (is.character(unit)) {
unit <- match.arg(unit)
}
unit <- make_valid_time_unit(unit, valid_duration_units)
Duration__initialize(unit)
}

#' @rdname data-type
#' @export
null <- function() Null__initialize()
Expand DownExpand Up@@ -503,6 +527,7 @@ canonical_type_str <- function(type_str) {
large_list = "large_list",
fixed_size_list_of = "fixed_size_list",
fixed_size_list = "fixed_size_list",
duration = "duration",
stop("Unrecognized string representation of data type", call. = FALSE)
)
}
Expand Down
3 changes: 3 additions & 0 deletions r/man/data-type.Rd

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

58 changes: 58 additions & 0 deletions r/src/array_to_vector.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -886,6 +886,61 @@ class Converter_Time : public Converter {
}
};

template <typename value_type, typename unit_type = TimeType>
class Converter_Duration : public Converter {
public:
explicit Converter_Duration(const std::shared_ptr<ChunkedArray>& chunked_array)
: Converter(chunked_array) {}

SEXP Allocate(R_xlen_t n) const {
cpp11::writable::doubles data(n);
data.attr("class") = "difftime";

// difftime is always stored as "seconds"
data.attr("units") = cpp11::writable::strings({"secs"});
return data;
}

Status Ingest_all_nulls(SEXP data, R_xlen_t start, R_xlen_t n) const {
std::fill_n(REAL(data) + start, n, NA_REAL);
return Status::OK();
}

Status Ingest_some_nulls(SEXP data, const std::shared_ptr<arrow::Array>& array,
R_xlen_t start, R_xlen_t n, size_t chunk_index) const {
int multiplier = TimeUnit_multiplier(array);

auto p_data = REAL(data) + start;
auto p_values = array->data()->GetValues<value_type>(1);
auto ingest_one = [&](R_xlen_t i) {
p_data[i] = static_cast<double>(p_values[i]) / multiplier;
return Status::OK();
};
auto null_one = [&](R_xlen_t i) {
p_data[i] = NA_REAL;
return Status::OK();
};
return IngestSome(array, n, ingest_one, null_one);
}

private:
int TimeUnit_multiplier(const std::shared_ptr<Array>& array) const {
// difftime is always "seconds", so multiply based on the Array's TimeUnit
switch (static_cast<unit_type*>(array->type().get())->unit()) {
case TimeUnit::SECOND:
return 1;
case TimeUnit::MILLI:
return 1000;
case TimeUnit::MICRO:
return 1000000;
case TimeUnit::NANO:
return 1000000000;
default:
return 0;
}
}
};

template <typename value_type>
class Converter_Timestamp : public Converter_Time<value_type, TimestampType> {
public:
Expand DownExpand Up@@ -1204,6 +1259,9 @@ std::shared_ptr<Converter> Converter::Make(
case Type::TIME64:
return std::make_shared<arrow::r::Converter_Time<int64_t>>(chunked_array);

case Type::DURATION:
return std::make_shared<arrow::r::Converter_Duration<int64_t>>(chunked_array);

case Type::TIMESTAMP:
return std::make_shared<arrow::r::Converter_Timestamp<int64_t>>(chunked_array);

Expand Down
32 changes: 32 additions & 0 deletions r/src/arrowExports.cpp

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

12 changes: 12 additions & 0 deletions r/src/datatype.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ const char* r6_class_name<arrow::DataType>::get(
return "Time32";
case Type::TIME64:
return "Time64";
case Type::DURATION:
return "DurationType";

case Type::DECIMAL128:
return "Decimal128Type";
Expand DownExpand Up@@ -207,6 +209,11 @@ std::shared_ptr<arrow::DataType> Time64__initialize(arrow::TimeUnit::type unit)
return arrow::time64(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> Duration__initialize(arrow::TimeUnit::type unit) {
return arrow::duration(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> list__(SEXP x) {
if (Rf_inherits(x, "Field")) {
Expand DownExpand Up@@ -309,6 +316,11 @@ arrow::TimeUnit::type TimeType__unit(const std::shared_ptr<arrow::TimeType>& typ
return type->unit();
}

// [[arrow::export]]
arrow::TimeUnit::type DurationType__unit(const std::shared_ptr<arrow::TimeType>& type) {
return type->unit();
}

// [[arrow::export]]
int32_t DecimalType__precision(const std::shared_ptr<arrow::DecimalType>& type) {
return type->precision();
Expand Down
71 changes: 54 additions & 17 deletions r/src/r_to_arrow.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@ enum RVectorType {
DATE_INT,
DATE_DBL,
TIME,
DURATION,
POSIXCT,
POSIXLT,
BINARY,
Expand DownExpand Up@@ -107,8 +108,10 @@ RVectorType GetVectorType(SEXP x) {
return INT64;
} else if (Rf_inherits(x, "POSIXct")) {
return POSIXCT;
} else if (Rf_inherits(x, "difftime")) {
} else if (Rf_inherits(x, "hms")) {
return TIME;
} else if (Rf_inherits(x, "difftime")) {
return DURATION;
} else {
return FLOAT64;
}
Expand DownExpand Up@@ -580,6 +583,23 @@ int64_t get_TimeUnit_multiplier(TimeUnit::type unit) {
}
}

Result<int> get_difftime_unit_multiplier(SEXP x) {
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
return 1;
} else if (unit == "mins") {
return 60;
} else if (unit == "hours") {
return 3600;
} else if (unit == "days") {
return 86400;
} else if (unit == "weeks") {
return 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
}

template <typename T>
class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
Expand All@@ -592,21 +612,7 @@ class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
}

// multiplier to get the number of seconds from the value stored in the R vector
int difftime_multiplier;
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
difftime_multiplier = 1;
} else if (unit == "mins") {
difftime_multiplier = 60;
} else if (unit == "hours") {
difftime_multiplier = 3600;
} else if (unit == "days") {
difftime_multiplier = 86400;
} else if (unit == "weeks") {
difftime_multiplier = 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

// then multiply the seconds by this to match the time unit
auto multiplier =
Expand DownExpand Up@@ -822,7 +828,38 @@ class RPrimitiveConverter<T, enable_if_t<is_duration_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
public:
Status Extend(SEXP x, int64_t size, int64_t offset = 0) override {
// TODO: look in lubridate
auto rtype = GetVectorType(x);

// only handle <difftime> R objects
if (rtype == DURATION) {
RETURN_NOT_OK(this->Reserve(size - offset));

ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

int64_t multiplier =
get_TimeUnit_multiplier(this->primitive_type_->unit()) * difftime_multiplier;

auto append_value = [this, multiplier](double value) {
auto converted = static_cast<typename T::c_type>(value * multiplier);
this->primitive_builder_->UnsafeAppend(converted);
return Status::OK();
};
auto append_null = [this]() {
this->primitive_builder_->UnsafeAppendNull();
return Status::OK();
};

if (ALTREP(x)) {
return VisitVector(RVectorIterator_ALTREP<double>(x, offset), size, append_null,
append_value);
} else {
return VisitVector(RVectorIterator<double>(x, offset), size, append_null,
append_value);
}

return Status::OK();
}

return Status::NotImplemented("Extend");
}
};
Expand Down
5 changes: 4 additions & 1 deletion r/src/type_infer.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,9 +96,12 @@ std::shared_ptr<arrow::DataType> InferArrowTypeFromVector<REALSXP>(SEXP x) {
if (Rf_inherits(x, "integer64")) {
return int64();
}
if (Rf_inherits(x, "difftime")) {
if (Rf_inherits(x, "hms")) {
return time32(TimeUnit::SECOND);
}
if (Rf_inherits(x, "difftime")) {
return duration(TimeUnit::SECOND);
}
return float64();
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); ARROW-14941 [R] Implement Duration R6 class and bindings for lubridate::duration() by paleolimbot · Pull Request #11850 · apache/arrow · GitHub
Skip to content
Closed
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export(decimal)
export(decimal128)
export(default_memory_pool)
export(dictionary)
export(duration)
export(ends_with)
export(everything)
export(field)
Expand Down
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.

25 changes: 25 additions & 0 deletions r/R/type.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,13 @@ TimeType <- R6Class("TimeType",
Time32 <- R6Class("Time32", inherit = TimeType)
Time64 <- R6Class("Time64", inherit = TimeType)

DurationType <- R6Class("DurationType",
inherit = FixedWidthType,
public = list(
unit = function() DurationType__unit(self)
)
)

Null <- R6Class("Null", inherit = DataType)

Timestamp <- R6Class("Timestamp",
Expand DownExpand Up@@ -334,6 +341,13 @@ valid_time64_units <- c(
"us" = TimeUnit$MICRO
)

valid_duration_units <- c(
"s" = TimeUnit$SECOND,
"ms" = TimeUnit$MILLI,
"us" = TimeUnit$MICRO,
"ns" = TimeUnit$NANO
)

make_valid_time_unit <- function(unit, valid_units) {
if (is.character(unit)) {
unit <- valid_units[match.arg(unit, choices = names(valid_units))]
Expand All@@ -360,6 +374,16 @@ time64 <- function(unit = c("ns", "us")) {
Time64__initialize(unit)
}

#' @rdname data-type
#' @export
duration <- function(unit = c("s", "ms", "us", "ns")) {
if (is.character(unit)) {
unit <- match.arg(unit)
}
unit <- make_valid_time_unit(unit, valid_duration_units)
Duration__initialize(unit)
}

#' @rdname data-type
#' @export
null <- function() Null__initialize()
Expand DownExpand Up@@ -503,6 +527,7 @@ canonical_type_str <- function(type_str) {
large_list = "large_list",
fixed_size_list_of = "fixed_size_list",
fixed_size_list = "fixed_size_list",
duration = "duration",
stop("Unrecognized string representation of data type", call. = FALSE)
)
}
Expand Down
3 changes: 3 additions & 0 deletions r/man/data-type.Rd

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

58 changes: 58 additions & 0 deletions r/src/array_to_vector.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -886,6 +886,61 @@ class Converter_Time : public Converter {
}
};

template <typename value_type, typename unit_type = TimeType>
class Converter_Duration : public Converter {
public:
explicit Converter_Duration(const std::shared_ptr<ChunkedArray>& chunked_array)
: Converter(chunked_array) {}

SEXP Allocate(R_xlen_t n) const {
cpp11::writable::doubles data(n);
data.attr("class") = "difftime";

// difftime is always stored as "seconds"
data.attr("units") = cpp11::writable::strings({"secs"});
return data;
}

Status Ingest_all_nulls(SEXP data, R_xlen_t start, R_xlen_t n) const {
std::fill_n(REAL(data) + start, n, NA_REAL);
return Status::OK();
}

Status Ingest_some_nulls(SEXP data, const std::shared_ptr<arrow::Array>& array,
R_xlen_t start, R_xlen_t n, size_t chunk_index) const {
int multiplier = TimeUnit_multiplier(array);

auto p_data = REAL(data) + start;
auto p_values = array->data()->GetValues<value_type>(1);
auto ingest_one = [&](R_xlen_t i) {
p_data[i] = static_cast<double>(p_values[i]) / multiplier;
return Status::OK();
};
auto null_one = [&](R_xlen_t i) {
p_data[i] = NA_REAL;
return Status::OK();
};
return IngestSome(array, n, ingest_one, null_one);
}

private:
int TimeUnit_multiplier(const std::shared_ptr<Array>& array) const {
// difftime is always "seconds", so multiply based on the Array's TimeUnit
switch (static_cast<unit_type*>(array->type().get())->unit()) {
case TimeUnit::SECOND:
return 1;
case TimeUnit::MILLI:
return 1000;
case TimeUnit::MICRO:
return 1000000;
case TimeUnit::NANO:
return 1000000000;
default:
return 0;
}
}
};

template <typename value_type>
class Converter_Timestamp : public Converter_Time<value_type, TimestampType> {
public:
Expand DownExpand Up@@ -1204,6 +1259,9 @@ std::shared_ptr<Converter> Converter::Make(
case Type::TIME64:
return std::make_shared<arrow::r::Converter_Time<int64_t>>(chunked_array);

case Type::DURATION:
return std::make_shared<arrow::r::Converter_Duration<int64_t>>(chunked_array);

case Type::TIMESTAMP:
return std::make_shared<arrow::r::Converter_Timestamp<int64_t>>(chunked_array);

Expand Down
32 changes: 32 additions & 0 deletions r/src/arrowExports.cpp

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

12 changes: 12 additions & 0 deletions r/src/datatype.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ const char* r6_class_name<arrow::DataType>::get(
return "Time32";
case Type::TIME64:
return "Time64";
case Type::DURATION:
return "DurationType";

case Type::DECIMAL128:
return "Decimal128Type";
Expand DownExpand Up@@ -207,6 +209,11 @@ std::shared_ptr<arrow::DataType> Time64__initialize(arrow::TimeUnit::type unit)
return arrow::time64(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> Duration__initialize(arrow::TimeUnit::type unit) {
return arrow::duration(unit);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> list__(SEXP x) {
if (Rf_inherits(x, "Field")) {
Expand DownExpand Up@@ -309,6 +316,11 @@ arrow::TimeUnit::type TimeType__unit(const std::shared_ptr<arrow::TimeType>& typ
return type->unit();
}

// [[arrow::export]]
arrow::TimeUnit::type DurationType__unit(const std::shared_ptr<arrow::TimeType>& type) {
return type->unit();
}

// [[arrow::export]]
int32_t DecimalType__precision(const std::shared_ptr<arrow::DecimalType>& type) {
return type->precision();
Expand Down
71 changes: 54 additions & 17 deletions r/src/r_to_arrow.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@ enum RVectorType {
DATE_INT,
DATE_DBL,
TIME,
DURATION,
POSIXCT,
POSIXLT,
BINARY,
Expand DownExpand Up@@ -107,8 +108,10 @@ RVectorType GetVectorType(SEXP x) {
return INT64;
} else if (Rf_inherits(x, "POSIXct")) {
return POSIXCT;
} else if (Rf_inherits(x, "difftime")) {
} else if (Rf_inherits(x, "hms")) {
return TIME;
} else if (Rf_inherits(x, "difftime")) {
return DURATION;
} else {
return FLOAT64;
}
Expand DownExpand Up@@ -580,6 +583,23 @@ int64_t get_TimeUnit_multiplier(TimeUnit::type unit) {
}
}

Result<int> get_difftime_unit_multiplier(SEXP x) {
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
return 1;
} else if (unit == "mins") {
return 60;
} else if (unit == "hours") {
return 3600;
} else if (unit == "days") {
return 86400;
} else if (unit == "weeks") {
return 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
}

template <typename T>
class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
Expand All@@ -592,21 +612,7 @@ class RPrimitiveConverter<T, enable_if_t<is_time_type<T>::value>>
}

// multiplier to get the number of seconds from the value stored in the R vector
int difftime_multiplier;
std::string unit(CHAR(STRING_ELT(Rf_getAttrib(x, symbols::units), 0)));
if (unit == "secs") {
difftime_multiplier = 1;
} else if (unit == "mins") {
difftime_multiplier = 60;
} else if (unit == "hours") {
difftime_multiplier = 3600;
} else if (unit == "days") {
difftime_multiplier = 86400;
} else if (unit == "weeks") {
difftime_multiplier = 604800;
} else {
return Status::Invalid("unknown difftime unit");
}
ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

// then multiply the seconds by this to match the time unit
auto multiplier =
Expand DownExpand Up@@ -822,7 +828,38 @@ class RPrimitiveConverter<T, enable_if_t<is_duration_type<T>::value>>
: public PrimitiveConverter<T, RConverter> {
public:
Status Extend(SEXP x, int64_t size, int64_t offset = 0) override {
// TODO: look in lubridate
auto rtype = GetVectorType(x);

// only handle <difftime> R objects
if (rtype == DURATION) {
RETURN_NOT_OK(this->Reserve(size - offset));

ARROW_ASSIGN_OR_RAISE(int difftime_multiplier, get_difftime_unit_multiplier(x));

int64_t multiplier =
get_TimeUnit_multiplier(this->primitive_type_->unit()) * difftime_multiplier;

auto append_value = [this, multiplier](double value) {
auto converted = static_cast<typename T::c_type>(value * multiplier);
this->primitive_builder_->UnsafeAppend(converted);
return Status::OK();
};
auto append_null = [this]() {
this->primitive_builder_->UnsafeAppendNull();
return Status::OK();
};

if (ALTREP(x)) {
return VisitVector(RVectorIterator_ALTREP<double>(x, offset), size, append_null,
append_value);
} else {
return VisitVector(RVectorIterator<double>(x, offset), size, append_null,
append_value);
}

return Status::OK();
}

return Status::NotImplemented("Extend");
}
};
Expand Down
5 changes: 4 additions & 1 deletion r/src/type_infer.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,9 +96,12 @@ std::shared_ptr<arrow::DataType> InferArrowTypeFromVector<REALSXP>(SEXP x) {
if (Rf_inherits(x, "integer64")) {
return int64();
}
if (Rf_inherits(x, "difftime")) {
if (Rf_inherits(x, "hms")) {
return time32(TimeUnit::SECOND);
}
if (Rf_inherits(x, "difftime")) {
return duration(TimeUnit::SECOND);
}
return float64();
}

Expand Down
Loading