Skip to content

Let result size fall back to estimated size #217

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
Mar 4, 2021
Merged

Let result size fall back to estimated size #217

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
2c35d48
use estimated size when no result size was returned
eddelbuettel Mar 3, 2021
ce8c5f3
update NEWS
eddelbuettel Mar 4, 2021
f8718d3
add a unit test
eddelbuettel Mar 4, 2021
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
6 changes: 5 additions & 1 deletion R/TileDBArray.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,11 @@ setMethod("[", "tiledb_array",
libtiledb_query_result_buffer_elements(qryptr, name)
}
estsz <- mapply(getResultSize, allnames, allvarnum, MoreArgs=list(qryptr=qryptr), SIMPLIFY=TRUE)
resrv <- max(estsz, na.rm=TRUE)
if (any(!is.na(estsz))) {
resrv <- max(estsz, na.rm=TRUE)
} else {
resrv <- resrv/8 # character case where bytesize of offset vector was used
}

## get results
getResult <- function(buf, name, varnum, resrv, qryptr) {
Expand Down
1 change: 1 addition & 0 deletions inst/NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

* Two tests with datetime comparisons which fail only on one macOS system are now conditional (#216)

* Result sets with all-character column now fall back to estimated result sizes (#217)


# 0.9.0
Expand Down
15 changes: 14 additions & 1 deletion inst/tinytest/test_dataframe.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ expect_equal(df, newdf[,-1])


## test dense with non-default index columm
#exit_file("not finished")
uri <- tempfile()
set.seed(42)
rows <- 50L
Expand Down Expand Up @@ -233,3 +232,17 @@ if (getRversion() < '4.0.0') {
val$B <- as.character(val$B)
}
expect_equal(dat, val)

## array with char only columns in dimension and attribute, used to error before #217
N <- 20
D <- data.frame(sample=paste(LETTERS[1:N], as.character(sort(trunc(runif(N, 100, 200)))), sep=""),
header=paste(LETTERS[1:N], as.character(sort(trunc(runif(N, 10000, 20000)))), sep=""),
stringsAsFactors=FALSE)
uri <- tempfile()
fromDataFrame(D, uri, col_index=1, sparse=TRUE)
chk <- tiledb_array(uri, as.data.frame=TRUE)
if (getRversion() < '4.0.0') {
chk$sample <- as.character(chk$sample)
chk$header <- as.character(chk$header)
}
expect_equal(D, chk[])