Bugfix for correct dimnames reading in dense arrays.

Also extended tests for arrays inside DFs to the new world.
ArtifactDB · Nov 28, 2023 · 88f8557 · 88f8557
1 parent afc5c55
commit 88f8557
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/R/readArray.R b/R/readArray.R
@@ -44,7 +44,7 @@ readArray <- function(path, array.file.backed=TRUE, ...) {
         on.exit(H5Dclose(dhandle), add=TRUE, after=FALSE)
         placeholder <- h5_read_attribute(dhandle, "missing-value-placeholder", check=TRUE, default=NULL)
 
-        ndims <- length(H5Sget_simple_extent_dims(H5Dget_space(dhandle)))
+        ndims <- H5Sget_simple_extent_dims(H5Dget_space(dhandle))$rank
         names <- load_names(ghandle, ndims)
 
         list(type=type, names=names, transposed=(transposed != 0L), placeholder=placeholder)

diff --git a/tests/testthat/test-stage-df.R b/tests/testthat/test-stage-df.R
@@ -19,6 +19,14 @@ test_that("staging of arrays within DFs works correctly", {
     roundtrip$Y <- as.matrix(roundtrip$Y)
     roundtrip$Z <- as.matrix(roundtrip$Z)
     expect_equal(roundtrip, input)
+
+    # Works in the new world.
+    tmp <- tempfile()
+    saveObject(input, tmp)
+    roundtrip <- readObject(tmp)
+    roundtrip$Y <- as.matrix(roundtrip$Y)
+    roundtrip$Z <- as.matrix(roundtrip$Z)
+    expect_identical(roundtrip, input)
 })
 
 test_that("staging of arrays continues to work with character matrices", {
@@ -36,5 +44,12 @@ test_that("staging of arrays continues to work with character matrices", {
     roundtrip$Y <- as.matrix(roundtrip$Y)
     roundtrip$Z <- as.matrix(roundtrip$Z)
     expect_equal(roundtrip, input)
-})
 
+    # Works in the new world.
+    tmp <- tempfile()
+    saveObject(input, tmp)
+    roundtrip <- readObject(tmp)
+    roundtrip$Y <- as.matrix(roundtrip$Y)
+    roundtrip$Z <- as.matrix(roundtrip$Z)
+    expect_identical(roundtrip, input)
+})