Skip to content
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.

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

Correct tiledb_query_get_range_var call #662

Merged
merged 2 commits into from
Feb 22, 2024
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
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: tiledb
Type: Package
Version: 0.24.0.1
Version: 0.24.0.2
Title: Modern Database Engine for Multi-Modal Data via Sparse and Dense Multidimensional Arrays
Authors@R: c(person("TileDB, Inc.", role = c("aut", "cph")),
person("Dirk", "Eddelbuettel", email = "dirk@tiledb.com", role = "cre"))
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ export(tiledb_query_get_fragment_uri)
export(tiledb_query_get_layout)
export(tiledb_query_get_range)
export(tiledb_query_get_range_num)
export(tiledb_query_get_range_var)
export(tiledb_query_import_buffer)
export(tiledb_query_result_buffer_elements)
export(tiledb_query_result_buffer_elements_vec)
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

* This release of the R package builds against [TileDB 2.20.1](https://github.com/TileDB-Inc/TileDB/releases/tag/2.20.1), and has also been tested against earlier releases as well as the development version (#661)

## Bug Fixes

* The `tiledb_get_query_range_var()` accessor now correctly calls the range getter for variable-sized dimensions. (#662)


# tiledb 0.24.0

Expand Down
4 changes: 2 additions & 2 deletions R/Query.R
Original file line number Diff line number Diff line change
Expand Up @@ -526,12 +526,12 @@ tiledb_query_get_range <- function(query, dimidx, rngidx) {
#' Retrieve the query range for a variable-sized query dimension and range index
#'
#' @param query A TileDB Query object
#' @param dimidx An integer index selecting the dimension
#' @param dimidx An integer index selecting the variable-sized dimension
#' @param rngidx An integer index selection the given range for the dimension
#' @return An string vector with elements start and end for the query
#' range for the given dimension and range index
#' @export
tiledb_query_get_range <- function(query, dimidx, rngidx) {
tiledb_query_get_range_var <- function(query, dimidx, rngidx) {
stopifnot(`Argument 'query' must be a tiledb_query object` = is(query, "tiledb_query"),
`Argument 'dimidx' must be numeric` = is.numeric(dimidx),
`Argument 'rngidx' must be numeric` = is.numeric(rngidx))
Expand Down
19 changes: 19 additions & 0 deletions inst/tinytest/test_query.R
Original file line number Diff line number Diff line change
Expand Up @@ -292,3 +292,22 @@ expect_silent(tiledb_query_set_subarray(qry, c(1L,5L), "INT32"))
expect_silent(tiledb_query_submit(qry))
expect_silent(tiledb_query_finalize(qry))
expect_equal(tiledb_query_status(qry), "COMPLETE")


uri <- tempfile()
pp <- palmerpenguins::penguins
fromDataFrame(pp, uri, sparse = TRUE, col_index = c("species", "year"))
## dim 1: species
qry <- tiledb_query(tiledb_array(uri), "READ")
expect_equal(tiledb_query_get_range_num(qry, 1), 1)
qry <- tiledb_query(tiledb_array(uri), "READ")
expect_equal(tiledb_query_get_range_var(qry, 1, 1), c("", ""))
qry <- tiledb_query(tiledb_array(uri), "READ")
expect_error(tiledb_query_get_range_var(qry, 1, 2)) # wrong range
## dim 2: year
qry <- tiledb_query(tiledb_array(uri), "READ")
expect_equal(tiledb_query_get_range_num(qry, 2), 1)
qry <- tiledb_query(tiledb_array(uri), "READ")
expect_equal(tiledb_query_get_range(qry, 2, 1), c(2007, 2009, 0))
qry <- tiledb_query(tiledb_array(uri), "READ")
expect_error(tiledb_query_get_range(qry, 2, 2)) # wrong range
1 change: 1 addition & 0 deletions man/tiledb-package.Rd

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

11 changes: 2 additions & 9 deletions man/tiledb_query_get_range.Rd

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

22 changes: 22 additions & 0 deletions man/tiledb_query_get_range_var.Rd

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