Skip to content

Commit c410d6d

Browse files
committed
Merge branch 'master' into froll-fix-memleak
2 parents 43929cf + 5975ffd commit c410d6d

File tree

6 files changed

+713
-56
lines changed

6 files changed

+713
-56
lines changed

inst/tests/froll.Rraw

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1690,6 +1690,12 @@ test(6010.610, frollapply(numeric(), 3, identity), list())
16901690
test(6010.611, frollapply(list(numeric(), numeric()), 3, identity), list(NULL,NULL))
16911691
test(6010.612, frollapply(list(numeric(), 1:3), 3, identity), list(NULL, list(NA,NA,1:3)))
16921692

1693+
## codecov memcpy calls #7304
1694+
x = data.table(v1=1:2, v2=c(1,2), v3=c("a","b"), v4=list(1,2), v5=as.complex(1:2), v6=as.raw(1:2))
1695+
old = setDTthreads(1L) ## ensure no parallel::mccollect so codecov can pick up
1696+
test(6010.619, frollapply(x, 1, ncol, by.column=FALSE), c(6L,6L))
1697+
setDTthreads(old)
1698+
16931699
#### list input in frollapply
16941700
DT = as.data.table(iris)
16951701
test(6010.620, ## list()/.() same as data.frame()

src/fread.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@ double wallclock(void)
418418
* 2.206MiB (2313045 bytes)
419419
* 38.69KiB (39615 bytes)
420420
* 214 bytes
421+
* 1 byte
421422
* 0 bytes
422423
* The function returns a pointer to a static string buffer, so the caller
423424
* should not attempt to deallocate the buffer, or call this function from

0 commit comments

Comments
 (0)