Skip to content

restore nomatch=NA_character_ #5216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattdowle merged 2 commits into from
Oct 12, 2021
Merged

restore nomatch=NA_character_ #5216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f9850c
restore nomatch=NA_character_
mattdowle Oct 12, 2021
aa0d7fd
add PR number, and strengthen nomatchArg checks at C level
mattdowle Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion R/data.table.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,10 @@ replace_dot_alias = function(e) {
missingnomatch = missing(nomatch)
nomatch0 = identical(nomatch,0) || identical(nomatch,0L) || identical(nomatch, FALSE) # for warning with row-numbers in i; #4353
if (nomatch0) nomatch=NULL # retain nomatch=0|FALSE backwards compatibility, #857 #5214
if (!(is.null(nomatch) || (length(nomatch)==1L && is.na(nomatch)))) stopf("nomatch= must be either NA or NULL (or 0 for backwards compatibility which is the same as NULL but please use NULL)")
if (!is.null(nomatch)) {
if (!(length(nomatch)==1L && is.na(nomatch))) stopf("nomatch= must be either NA or NULL (or 0 for backwards compatibility which is the same as NULL but please use NULL)")
nomatch=NA # convert NA_character_ to NA-logical, PR#5216
}
if (!is.logical(which) || length(which)>1L) stopf("which= must be a logical vector length 1. Either FALSE, TRUE or NA.")
if ((isTRUE(which)||is.na(which)) && !missing(j)) stopf("which==%s (meaning return row numbers) but j is also supplied. Either you need row numbers or the result of j, but only one type of result can be returned.", which)
if (is.null(nomatch) && is.na(which)) stopf("which=NA with nomatch=0|NULL would always return an empty vector. Please change or remove either which or nomatch.")
Expand Down
5 changes: 3 additions & 2 deletions inst/tests/tests.Rraw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18271,7 +18271,8 @@ DT = data.table(A=1:3)
class(DT) = "data.table"
test(2222, print(DT), output="A.*3")

# retain nomatch=FALSE backwards compatibility, #5214
# retain nomatch=FALSE backwards compatibility #5214, and nomatch=NA_character_ PR#5216
DT = data.table(A=1:3, key="A")
test(2223, DT[.(4), nomatch=FALSE], data.table(A=integer(), key="A"))
test(2223.1, DT[.(4), nomatch=FALSE], data.table(A=integer(), key="A"))
test(2223.2, DT[.(4), nomatch=NA_character_], data.table(A=4L, key="A"))

10 changes: 9 additions & 1 deletion src/bmerge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,15 @@ SEXP bmerge(SEXP idt, SEXP xdt, SEXP icolsArg, SEXP xcolsArg, SEXP isorted, SEXP
error(_("rollends must be a length 2 logical vector"));
rollends = LOGICAL(rollendsArg);

nomatch = isNull(nomatchArg) ? 0 : INTEGER(nomatchArg)[0];
if (isNull(nomatchArg)) {
nomatch=0;
} else {
if (length(nomatchArg)!=1 || (!isLogical(nomatchArg) && !isInteger(nomatchArg)))
error(_("Internal error: nomatchArg must be NULL or length-1 logical/integer")); // # nocov
nomatch = INTEGER(nomatchArg)[0];
if (nomatch!=NA_INTEGER && nomatch!=0)
error(_("Internal error: nomatchArg must be NULL, NA, NA_integer_ or 0L")); // # nocov
}

// mult arg
if (!strcmp(CHAR(STRING_ELT(multArg, 0)), "all")) mult = ALL;
Expand Down