Skip to content

Commit

Permalink
[r] Several micro-tweak post latest rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
eddelbuettel committed Sep 8, 2023
1 parent 6acee54 commit e2a655a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions apis/r/R/ReadIter.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ ReadIter <- R6::R6Class(
#' @description Create (lifecycle: experimental)
#' @param sr soma read pointer
#' @param enums An optional list with enumeration information
initialize = function(sr) {
initialize = function(sr, enumlst=NULL) {
private$soma_reader_pointer <- sr
private$enums <- enumlst
},

#' @description Check if iterated read is complete or not. (lifecycle: experimental)
Expand Down Expand Up @@ -60,7 +61,7 @@ ReadIter <- R6::R6Class(
# to be refined in derived classes
soma_reader_transform = function(x) {
.NotYetImplemented()
}
},

enums = NULL
)
Expand Down
2 changes: 1 addition & 1 deletion apis/r/man/ReadIter.Rd

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

2 changes: 1 addition & 1 deletion apis/r/src/riterator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ Rcpp::List sr_setup(const std::string& uri,
std::string_view name = "unnamed";
std::vector<std::string> column_names = {};


std::map<std::string, std::string> platform_config = config_vector_to_map(Rcpp::wrap(config));
tiledb::Config cfg(platform_config);
spdl::debug("[sr_setup] creating ctx object with supplied config");
Expand All @@ -102,7 +103,6 @@ Rcpp::List sr_setup(const std::string& uri,
if (!colnames.isNull()) {
column_names = Rcpp::as<std::vector<std::string>>(colnames);
}
std::map<std::string, std::string> platform_config = config_vector_to_map(Rcpp::wrap(config));

std::uint64_t ts_start = 0; // beginning of time aka the epoch (force double signature)
std::uint64_t ts_end = std::numeric_limits<uint64_t>::max(); // max if unset
Expand Down

0 comments on commit e2a655a

Please sign in to comment.