Skip to content

Commit a641d41

Browse files
committed
reinsert nrows to HDF5DataFrame class
1 parent 990a78a commit a641d41

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

R/AllClasses.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ setClass("HDF5DataFrame",
1414
contains="DataFrame",
1515
slots=c(path="character",
1616
name = "character",
17-
columns="character"))
18-
# nrows="integer"))
17+
columns="character",
18+
nrows="integer"))
1919

2020
#' HDF5ColumnSeed Class
2121
#'

R/HDF5DataFrame.R

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,17 @@ HDF5DataFrame <- function(filepath, name = "", columns = NULL) {
9595

9696
# check dataframe
9797
.check_dataframe_dim(filepath, name)
98-
98+
99+
# get attributes
100+
nrows <- dim(HDF5Array::HDF5Array(filepath = filepath,
101+
name = file.path(name, columns[1])))[1]
102+
99103
# HDF5DataFrame
100104
methods::new("HDF5DataFrame",
101105
path=filepath,
102106
name = name,
103-
columns=columns)
107+
columns=columns,
108+
nrows=nrows)
104109
}
105110

106111
####
@@ -348,7 +353,6 @@ cbind.HDF5DataFrame <- function(..., deparse.level=1) {
348353
methods::new("HDF5DataFrame",
349354
path=xpath,
350355
columns=all_columns,
351-
# nrows=NROW(objects[[1]]),
352356
elementMetadata=all_mcols,
353357
metadata=do.call(c, all_metadata)
354358
)
@@ -406,7 +410,7 @@ setAs("HDF5DataFrame", "DFrame", function(from) .collapse_to_df(from))
406410
setAs("HDF5DataFrame", "DataFrame", function(from) .collapse_to_df(from))
407411

408412
#' @noRd
409-
.from_DataFrame_to_HDF5DataFrame <- function(from, to="DFrame")
413+
.from_DataFrame_to_HDF5DataFrame <- function(from)
410414
{
411415
output_hdf5 <- tempfile(fileext = ".h5")
412416
writeHDF5DataFrame(from,

man/HDF5DataFrame-package.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)