Skip to content
Merged
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
4 changes: 4 additions & 0 deletions r/R/arrowExports.R

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

11 changes: 1 addition & 10 deletions r/R/type.R
Original file line number Diff line number Diff line change
Expand Up @@ -604,16 +604,7 @@ timestamp <- function(unit = c("s", "ms", "us", "ns"), timezone = "") {
#' @export
decimal <- function(precision, scale) {
args <- check_decimal_args(precision, scale)

if (args$precision > 38) {
decimal256(args$precision, args$scale)
} else if (args$precision > 18) {
decimal128(args$precision, args$scale)
} else if (args$precision > 9) {
decimal64(args$precision, args$scale)
} else {
decimal32(args$precision, args$scale)
}
SmallestDecimal__initialize(args$precision, args$scale)
}

#' @rdname data-type
Expand Down
10 changes: 10 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/datatype.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,12 @@ std::shared_ptr<arrow::DataType> Decimal256Type__initialize(int32_t precision,
return ValueOrStop(arrow::Decimal256Type::Make(precision, scale));
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> SmallestDecimal__initialize(int32_t precision,
int32_t scale) {
return arrow::smallest_decimal(precision, scale);
}

// [[arrow::export]]
std::shared_ptr<arrow::DataType> DayTimeInterval__initialize() {
return arrow::day_time_interval();
Expand Down
Loading