Skip to content

Commit 4f2518e

Browse files
authored
Merge branch 'master' into hindi_j
2 parents b01bcf3 + 03c647f commit 4f2518e

29 files changed

+4020
-9
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.dir-locals.el
2+
.check.translations.R
23
^\.Rprofile$
34
^data\.table_.*\.tar\.gz$
45
^config\.log$

.ci/.lintr.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ exclusions = c(local({
8484
infix_spaces_linter = Inf,
8585
undesirable_function_linter = Inf
8686
)),
87-
exclusion_for_dir("vignettes", list(
87+
exclusion_for_dir(c("vignettes", "vignettes/fr"), list(
8888
quotes_linter = Inf,
8989
sample_int_linter = Inf
9090
# strings_as_factors_linter = Inf

.github/workflows/pkgup.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
Rscript -e 'tools::write_PACKAGES("public/src/contrib", fields="Revision")'
6666
- name: upload
6767
if: github.ref == 'refs/heads/master'
68-
uses: actions/upload-pages-artifact@v4
68+
uses: actions/upload-pages-artifact@v3
6969
with:
7070
path: "public"
7171
- name: deploy

.gitlab-ci.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ integration:
315315
- R --version
316316
- *install-deps ## markdown pkg not present in r-pkgdown image
317317
- mkdir -p ./pkgdown/favicon/ && cp .graphics/favicon/* ./pkgdown/favicon/ ## copy favicons
318-
- rm -rf ./vignettes ## r-lib/pkgdown#2383
319318
- Rscript -e 'pkgdown::build_site(override=list(destination="./website"))'
320319
## html manual, vignettes, repos, cran_web, cran_checks
321320
- echo 'source(".ci/ci.R"); source(".ci/publish.R")' >> .Rprofile
@@ -388,10 +387,6 @@ integration:
388387
- Rscript -e 'check.index("data.table", names(test.jobs))'
389388
## web/checks/check_flavors.html
390389
- Rscript -e 'check.flavors(names(test.jobs))'
391-
## pkgdown vignettes workaround r-lib/pkgdown#2383
392-
- mkdir -p website/articles
393-
- cp bus/integration/cran/library/data.table/doc/*.html website/articles/.
394-
- rm website/articles/index.html
395390
## pkgdown merge
396391
- Rscript -e 'common_files<-function(path1, path2) intersect(list.files(path1, all.files=TRUE, no..=TRUE), list.files(path2, all.files=TRUE, no..=TRUE)); msg = if (length(f<-common_files("website","bus/integration/cran"))) paste(c("Following artifacts will be overwritten by pkgdown artifacts:", paste0(" ", f)), collapse="\n") else "No overlapping files from pkgdown artifacts"; message(msg); q("no")'
397392
- mv website/* bus/integration/cran/

DESCRIPTION

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,11 @@ Authors@R: c(
9292
person("Ivan", "Krylov", role="ctb"),
9393
person("Angel", "Feliz", role="ctb"),
9494
person("Michael","Young", role="ctb"),
95-
person("Mark", "Seeto", role="ctb")
95+
person("Mark", "Seeto", role="ctb"),
96+
person("Philippe", "Grosjean", role="ctb"),
97+
person("Vincent", "Runge", role="ctb"),
98+
person("Christian", "Wia", role="ctb"),
99+
person("Elise", "Maigné", role="ctb"),
100+
person("Vincent", "Rocher", role="ctb"),
101+
person("Vijay", "Lulla", role="ctb")
96102
)

NEWS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ rowwiseDT(
105105
106106
10. `DT[1, on=NULL]` now works for returning the first row, [#6579](https://github.com/Rdatatable/data.table/issues/6579). Thanks to @Kodiologist for the report and @tdhock for the PR.
107107
108+
11. `tables()` now returns the correct size for data.tables over 2GiB, [#6607](https://github.com/Rdatatable/data.table/issues/6607). Thanks to @vlulla for the report and the PR.
109+
108110
## NOTES
109111
110112
1. Tests run again when some Suggests packages are missing, [#6411](https://github.com/Rdatatable/data.table/issues/6411). Thanks @aadler for the note and @MichaelChirico for the fix.

R/tables.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ type_size = function(DT) {
55
# for speed and ram efficiency, a lower bound by not descending into character string lengths or list items
66
# if a more accurate and higher estimate is needed then user can pass object.size or alternative to mb=
77
# in case number of columns is very large (e.g. 1e6 columns) then we use a for() to avoid allocation of sapply()
8-
ans = 0L
8+
ans = 0.0
99
lookup = c("raw"=1L, "integer"=4L, "double"=8L, "complex"=16L)
1010
for (i in seq_along(DT)) {
1111
col = DT[[i]]

inst/tests/other.Rraw

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,3 +766,10 @@ if (loaded[["nanotime"]]) {
766766
# respect dec=',' for nanotime, related to #6446, corresponding to tests 2281.*
767767
test(31, fwrite(data.table(as.nanotime(.POSIXct(0))), dec=',', sep=';'), output="1970-01-01T00:00:00,000000000Z")
768768
}
769+
770+
# tables() with large environment #6607
771+
.e <- new.env() ## to not populate the .GlobalEnv
772+
.e[["DT"]] <- as.data.table(lapply(1:15,function(i) runif(20e6)))
773+
res <- tables(env=.e)
774+
test(32, res[, .(NAME,NROW,NCOL,MB)], data.table(NAME="DT",NROW=20000000L,NCOL=15L,MB=2288.0))
775+
rm(.e, res)

vignettes/.check.translations.R

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
library(data.table)
2+
translated.Rmd <- Sys.glob("*/*.Rmd")
3+
rm_suffix <- function(x)sub("[.][^.]+$", "", x)
4+
trans.dt <- data.table(
5+
lang=dirname(translated.Rmd),
6+
trans_file=rm_suffix(basename(translated.Rmd)))
7+
en.dt <- data.table(en.Rmd=Sys.glob("*.Rmd"))[
8+
, en_file := rm_suffix(en.Rmd)
9+
][]
10+
link.dt <- en.dt[, nc::capture_all_str(
11+
en.Rmd,
12+
"https://rdatatable.gitlab.io/data.table/articles/",
13+
lang=".*?",
14+
"/",
15+
trans_file=".*?html", rm_suffix
16+
), by=en_file]
17+
maybe_err <- function(dt,msg){
18+
if(nrow(dt)){
19+
cat(msg,":\n")
20+
print(dt)
21+
}
22+
}
23+
maybe_err(link.dt[en_file != trans_file],"typos in links")
24+
files.join <- trans.dt[en.dt, .(
25+
langs=paste(lang[!is.na(lang)],collapse=",")
26+
), on=.(trans_file=en_file), by=.EACHI]
27+
maybe_err(files.join[nchar(langs)<max(nchar(langs))], "missing translation files")

vignettes/datatable-benchmarking.Rmd

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ h2 {
2525
}
2626
</style>
2727

28+
Translations of this document are available in
29+
30+
* [French](https://rdatatable.gitlab.io/data.table/articles/fr/datatable-benchmarking.html)
31+
2832
This document is meant to guide on measuring performance of `data.table`. Single place to document best practices and traps to avoid.
2933

3034
# fread: clear caches

0 commit comments

Comments
 (0)