Skip to content

Commit de20099

Browse files
Merge remote-tracking branch 'origin/master' into issue_5415
2 parents ff7f5d9 + 5bb6450 commit de20099

File tree

8 files changed

+677
-682
lines changed

8 files changed

+677
-682
lines changed

.ci/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# data.table continuous integration and deployment
22

3-
On each Pull Request opened in GitHub we run GitHub Actions test jobs to provide prompt feedback about the status of PR. Our more thorough main CI pipeline runs nightly on GitLab CI. GitLab repository automatically mirrors our GitHub repository and runs pipeline on `master` branch every night. It tests more environments and different configurations. It publishes a variety of artifacts such as our [homepage](https://rdatatable.gitlab.io/data.table/) and [CRAN-like website for dev version](https://rdatatable.gitlab.io/data.table/web/packages/data.table/index.html), including windows binaries for the dev version.
3+
On each Pull Request opened in GitHub we run GitHub Actions test jobs to provide prompt feedback about the status of PR. Our more thorough main CI pipeline runs nightly on GitLab CI. In addition to branches pushed directly, the GitLab repository automatically mirrors our GitHub repository and runs pipeline on the `master` branch every night. It tests more environments and different configurations. It publishes a variety of artifacts such as our [homepage](https://rdatatable.gitlab.io/data.table/) and [CRAN-like website for dev version](https://rdatatable.gitlab.io/data.table/web/packages/data.table/index.html), including windows binaries for the dev version.
44

55
## Environments
66

.devcontainer/r-ancient-gcc/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.gitlab.com/jangorecki/dockerfiles/r-3.4.0
1+
FROM registry.gitlab.com/rdatatable/dockerfiles/r-3.4.0
22

33
RUN apt-get -qq update \
44
&& apt-get install -y --no-install-recommends git

.devcontainer/r-devel-gcc/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.gitlab.com/jangorecki/dockerfiles/r-devel-gcc
1+
FROM registry.gitlab.com/rdatatable/dockerfiles/r-devel-gcc
22

33
RUN apt-get -qq update \
44
&& apt-get install -y --no-install-recommends git

NEWS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ rowwiseDT(
198198
199199
20. Fixed a memory issue causing segfaults in `forder`, [#6797](https://github.com/Rdatatable/data.table/issues/6797). Thanks @dkutner for the report and @MichaelChirico for the fix.
200200
201+
21. `setDT(get0('var'))` now correctly modifies `var` by reference, consistent with the long-standing behavior of `setDT(get('var'))`, [#6864](https://github.com/Rdatatable/data.table/issues/6864). Thanks to @rikivillalba for the report and @venom1204 for the fix.
202+
201203
### NOTES
202204
203205
1. There is a new vignette on joins! See `vignette("datatable-joins")`. Thanks to Angel Feliz for authoring it! Feedback welcome. This vignette has been highly requested since 2017: [#2181](https://github.com/Rdatatable/data.table/issues/2181).

R/data.table.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2982,7 +2982,7 @@ setDT = function(x, keep.rownames=FALSE, key=NULL, check.names=FALSE) {
29822982
} else if (.is_simple_extraction(name)) {
29832983
# common case is call from 'lapply()'
29842984
.reassign_extracted_table(name, x)
2985-
} else if (name %iscall% "get") { # #6725
2985+
} else if (name %iscall% c("get", "get0")) { # #6725
29862986
# edit 'get(nm, env)' call to be 'assign(nm, x, envir=env)'
29872987
name = match.call(get, name)
29882988
name[[1L]] = quote(assign)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![CRAN status](https://badges.cranchecks.info/flavor/release/data.table.svg)](https://cran.r-project.org/web/checks/check_results_data.table.html)
66
[![R-CMD-check](https://github.com/Rdatatable/data.table/workflows/R-CMD-check/badge.svg)](https://github.com/Rdatatable/data.table/actions)
77
[![Codecov test coverage](https://codecov.io/github/Rdatatable/data.table/coverage.svg?branch=master)](https://app.codecov.io/github/Rdatatable/data.table?branch=master)
8-
[![GitLab CI build status](https://gitlab.com/Rdatatable/data.table/badges/master/pipeline.svg)](https://gitlab.com/Rdatatable/data.table/-/pipelines)
8+
[![GitLab CI build status](https://gitlab.com/Rdatatable/data.table/badges/master/pipeline.svg)](https://rdatatable.gitlab.io/data.table/web/checks/check_results_data.table.html)
99
[![downloads](https://cranlogs.r-pkg.org/badges/data.table)](https://www.rdocumentation.org/trends)
1010
[![CRAN usage](https://jangorecki.gitlab.io/rdeps/data.table/CRAN_usage.svg?sanitize=true)](https://gitlab.com/jangorecki/rdeps)
1111
[![BioC usage](https://jangorecki.gitlab.io/rdeps/data.table/BioC_usage.svg?sanitize=true)](https://gitlab.com/jangorecki/rdeps)

inst/tests/tests.Rraw

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21184,6 +21184,15 @@ test(2317.7, DT1[DF2, on='a', e := i.e]$e, 5)
2118421184
test(2317.8, DT1[DF2, on='a', e2 := x.a + i.e]$e2, 6)
2118521185
test(2317.9, DT1[DF2, on='a', .(e = x.a + i.e)]$e, 6)
2118621186

21187+
#6864
21188+
dt_get = data.frame(a = 1:3, b = letters[1:3])
21189+
setDT(get("dt_get"))
21190+
test(2319.1, !is.null(attr(dt_get, ".internal.selfref")))
21191+
21192+
dt_get0 = data.frame(a = 1:3, b = letters[1:3])
21193+
setDT(get0("dt_get0"))
21194+
test(2319.2, !is.null(attr(dt_get0, ".internal.selfref")))
21195+
2118721196
# Improved fread error handling for cmd exe and decompression #5415
2118821197
test(2318.1, fread(cmd="false"), error="External command failed") # external command execution error handling
2118921198
if (test_R.utils) {

0 commit comments

Comments
 (0)