Skip to content

Add small tweaks to make tests pass with R 3.6.3 #243

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 2 commits into from
May 13, 2021
Merged

Add small tweaks to make tests pass with R 3.6.3 #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad287b1
minor tweaks to make tests pass with R 3.6.3
eddelbuettel May 13, 2021
4efe54c
add NEWS entry
eddelbuettel May 13, 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
7 changes: 7 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# tiledb 'under development'

## Bug Fixes

* Unit tests of character columns in data frames accomodate R versions prior to R 4.0.0 in all cases (#243)


# tiledb 0.9.1

* This release of the R package builds against [TileDB 2.2.9](https://github.com/TileDB-Inc/TileDB/releases/tag/2.2.9), but has also been tested against previous releases as well as the development version.
Expand Down
14 changes: 6 additions & 8 deletions inst/tinytest/test_dataframe.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,13 @@ D <- data.frame(sample=paste(LETTERS[1:N], as.character(sort(trunc(runif(N, 100,
stringsAsFactors=FALSE)
uri <- tempfile()
fromDataFrame(D, uri, col_index=1, sparse=TRUE)
chk <- tiledb_array(uri, as.data.frame=TRUE)
arr <- tiledb_array(uri, as.data.frame=TRUE)
chk <- arr[]
if (getRversion() < '4.0.0') {
chk$sample <- as.character(chk$sample)
chk$header <- as.character(chk$header)
}
expect_equal(D, chk[])
expect_equal(D, chk)

## sparse array can have duplicate values in index column
df <- data.frame(
Expand All @@ -256,15 +257,12 @@ df <- data.frame(
)

uri <- tempfile()
expect_error(
fromDataFrame(df, uri, col_index=1, sparse=TRUE, allows_dups=FALSE)
)
expect_error(fromDataFrame(df, uri, col_index=1, sparse=TRUE, allows_dups=FALSE))

uri <- tempfile()
expect_silent(
arr <- fromDataFrame(df, uri, col_index=1, sparse=TRUE, allows_dups=TRUE)
)
expect_silent(arr <- fromDataFrame(df, uri, col_index=1, sparse=TRUE, allows_dups=TRUE))

arr <- tiledb_array(uri, as.data.frame=TRUE)
chk <- arr[]
if (getRversion() < '4.0.0') chk$char <- as.character(chk$char)
expect_equal(df, chk)
4 changes: 3 additions & 1 deletion inst/tinytest/test_dim.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,12 @@ for (dtype in dimtypes) {
"DATETIME_AS" = as.nanotime("1970-01-01T00:00:00.000000001+00:00") + (0:4)*1e9
)
avec <- 10^(1:5)
data <- data.frame(row = dvec, attr = avec)
data <- data.frame(row = dvec, attr = avec, stringsAsFactors=FALSE)
arr[] <- data

arr2 <- tiledb_array(uri, as.data.frame=TRUE)
readdata <- arr2[]
if (dtype == "ASCII" && getRversion() < '4.0.0') readdata$row <- as.character(readdata$row)
if (dtype == "UINT64") readdata[,1] <- as.integer64(readdata[,1]) # return doubles here
expect_equal(data, readdata)
if (grepl("^DATETIME", dtype)) {
Expand Down Expand Up @@ -252,6 +253,7 @@ for (dtype in dimtypes) {
selected_ranges(arr3) <- list(cbind(data[2, "row"], data[4, "row"]))
}
readdata <- arr3[]
if (dtype == "ASCII" && getRversion() < '4.0.0') readdata$row <- as.character(readdata$row)
if (dtype == "UINT64") readdata[,1] <- as.integer64(readdata[,1]) # return doubles here
expect_equivalent(data[2:4,], readdata, info=dtype) # equivalent as not type consistent (int <-> numeric)
expect_equal(NROW(readdata), 3L)
Expand Down