Skip to content

For domain info cast int64 to double if overflowing #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eddelbuettel merged 3 commits into from
Feb 24, 2022
Merged

For domain info cast int64 to double if overflowing #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee53189
do not error on overly large domain values but cast to double
eddelbuettel Feb 23, 2022
1b5a0e2
use tile() for extent, not dim()
eddelbuettel Feb 23, 2022
3772d8d
remove commented-out line
eddelbuettel Feb 24, 2022
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
2 changes: 1 addition & 1 deletion R/Dim.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ tiledb_dim <- function(name, domain, tile, type, ctx = tiledb_get_context()) {
nf <- nfilters(fl)
tp <- datatype(object)
dm <- if (is.na(cells)) "" else paste0(domain(object), if (grepl("INT", tp)) "L" else "", collape="")
ex <- if (is.na(cells)) "" else paste0(dim(object), if (grepl("INT", tp)) "L" else "", collape="")
ex <- if (is.na(cells)) "" else paste0(tile(object), if (grepl("INT", tp)) "L" else "", collape="")
txt <- paste0("tiledb_dim(name=\"", name(object), "\", ",
"domain=c(", if (is.na(cells)) "NULL,NULL"
else paste0(dm, collapse=","), "), ",
Expand Down
10 changes: 4 additions & 6 deletions src/libtiledb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,9 +856,8 @@ SEXP libtiledb_dim_get_domain(XPtr<tiledb::Dimension> dim) {
using DataType = tiledb::impl::tiledb_to_type<TILEDB_INT64>::type;
auto d1 = dim->domain<DataType>().first;
auto d2 = dim->domain<DataType>().second;
if (d1 <= R_NaInt || d1 > std::numeric_limits<int64_t>::max() ||
d2 <= R_NaInt || d2 > std::numeric_limits<int64_t>::max()) {
Rcpp::stop("tiledb_dim domain INT64 value not representable as an R integer64 type");
if (d1 > std::numeric_limits<int64_t>::max() || d2 > std::numeric_limits<int64_t>::max()) {
return NumericVector({static_cast<double>(d1), static_cast<double>(d2)});
}
std::vector<int64_t> v = { d1, d2 };
return makeInteger64(v);
Expand All @@ -867,9 +866,8 @@ SEXP libtiledb_dim_get_domain(XPtr<tiledb::Dimension> dim) {
using DataType = tiledb::impl::tiledb_to_type<TILEDB_UINT64>::type;
auto d1 = dim->domain<DataType>().first;
auto d2 = dim->domain<DataType>().second;
if (d1 > std::numeric_limits<int64_t>::max() ||
d2 > std::numeric_limits<int64_t>::max()) {
Rcpp::stop("tiledb_dim domain UINT64 value not representable as an R integer64 type");
if (d1 > std::numeric_limits<int64_t>::max() || d2 > std::numeric_limits<int64_t>::max()) {
return NumericVector({static_cast<double>(d1), static_cast<double>(d2)});
}
std::vector<int64_t> v = { static_cast<int64_t>(d1), static_cast<int64_t>(d2) };
return makeInteger64(v);
Expand Down