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
3 changes: 3 additions & 0 deletions R/AllGenerics.R
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,6 @@ setGeneric("return.data.frame<-", function(x, value) standardGeneric("return.dat
setGeneric("attrs<-", function(x, value) standardGeneric("attrs<-"))

## TODO: bring other generics here
#' @rdname generics
#' @export
setGeneric("raw_dump", function(object, ...) standardGeneric("raw_dump"))
4 changes: 0 additions & 4 deletions R/ArraySchema.R
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,6 @@ tiledb_array_schema.from_array <- function(x, ctx = tiledb_get_context()) {
return(tiledb_array_schema(dom, c(val), ctx))
}

#' @rdname generics
#' @export
setGeneric("raw_dump", function(object, ...) standardGeneric("raw_dump"))

#' Raw display of an array schema object
#'
#' This method used the display method provided by the underlying
Expand Down
2 changes: 2 additions & 0 deletions R/TileDBArray.R
Original file line number Diff line number Diff line change
Expand Up @@ -1826,6 +1826,8 @@ setMethod("tdb_collect", signature("tiledb_array"), function(x, ...) {
## Entry points for tiledb_dense and tiledb_sparse

#' @rdname tiledb_array
#' @param ... Used as a pass-through for \code{tiledb_dense}
#' and \code{tiledb_sparse} aliasing
#' @export
tiledb_dense <- function(...) {
if (isFALSE("tiledb_dense_called" %in% names(.pkgenv))) {
Expand Down
12 changes: 5 additions & 7 deletions man/generics.Rd

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

3 changes: 3 additions & 0 deletions man/tiledb_array.Rd

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

2 changes: 1 addition & 1 deletion man/tiledb_arrow_array_ptr.Rd

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

4 changes: 2 additions & 2 deletions man/tiledb_query_export_buffer.Rd

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

4 changes: 2 additions & 2 deletions man/tiledb_query_import_buffer.Rd

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

6 changes: 3 additions & 3 deletions src/arrowio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ SEXP allocate_arrow_array_as_xptr() {
#if TILEDB_VERSION >= TileDB_Version(2,2,0)
return allocate_arrow_array();
#else
return NA_REAL;
return R_NilValue;
#endif
}

Expand All @@ -103,7 +103,7 @@ SEXP allocate_arrow_schema_as_xptr() {
#if TILEDB_VERSION >= TileDB_Version(2,2,0)
return allocate_arrow_schema();
#else
return NA_REAL;
return R_NilValue;
#endif
}

Expand Down Expand Up @@ -138,7 +138,7 @@ Rcpp::List libtiledb_query_export_buffer(XPtr<tiledb::Context> ctx,
return Rcpp::List::create(arrptr, schptr);
#else
Rcpp::stop("This function requires TileDB 2.2.0 or greater.");
return Rcpp::NumericVector::create(0, 0); // not reached
return Rcpp::List::create(R_NilValue, R_NilValue); // not reached
#endif
}

Expand Down