Skip to content

move the coercion of i into .dt_coerce_i() #7945

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

Open
ben-schwen wants to merge 1 commit into from
+46 −27
Open

move the coercion of i into .dt_coerce_i() #7945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 36 additions & 23 deletions R/data.table.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,41 @@ replace_dot_alias = function(e) {
invisible()
}

# coerce the evaluated i: a one-column numeric matrix becomes integer, a logical i absorbs a not-join, and character, factor,
# list and data.frame i become a data.table to join to. Returns .dt_done(null.data.table()) when i is NULL.
.dt_coerce_i = function(q) {
i = q$i
notjoin = q$notjoin
isnull_inames = q$isnull_inames
if (is.matrix(i)) {
if (is.numeric(i) && ncol(i)==1L) { # #826 - subset DT on single integer vector stored as matrix
i = as.integer(i)
} else {
stopf("i is invalid type (matrix). Perhaps in future a 2 column matrix could return a list of elements of DT (in the spirit of A[B] in FAQ 2.14). Please report to data.table issue tracker if you'd like this, or add your comments to FR #657.")
}
}
if (is.logical(i)) {
if (notjoin) {
notjoin = FALSE
i = !i
}
}
if (is.null(i)) return(.dt_done(null.data.table()))
if (is.character(i) || is.factor(i)) {
isnull_inames = TRUE
i = data.table(V1=i) # for user convenience; e.g. DT["foo"] without needing DT[.("foo")]
} else if (identical(class(i),"list") && length(i)==1L && is.data.frame(i[[1L]])) { i = as.data.table(i[[1L]]) }
else if (identical(class(i),"data.frame")) { i = as.data.table(i) } # TO DO: avoid these as.data.table() and use a flag instead
else if (identical(class(i),"list")) {
isnull_inames = is.null(names(i))
i = as.data.table(i)
}
q$i = i
q$notjoin = notjoin
q$isnull_inames = isnull_inames
invisible()
}

# rows of x covered by the groups: f__/len__ index o__ if x was reordered for grouping, and irows if i subset x
.dt_group_rows = function(f__, len__, o__, irows) {
rows = vecseq(f__,len__,NULL)
Expand Down Expand Up @@ -994,29 +1029,7 @@ replace_dot_alias = function(e) {
xo = NULL
isnull_inames = FALSE
if (.is_dt_done(r <- .dt_eval_isub(q, isub))) return(.dt_done_value(r))
if (is.matrix(i)) {
if (is.numeric(i) && ncol(i)==1L) { # #826 - subset DT on single integer vector stored as matrix
i = as.integer(i)
} else {
stopf("i is invalid type (matrix). Perhaps in future a 2 column matrix could return a list of elements of DT (in the spirit of A[B] in FAQ 2.14). Please report to data.table issue tracker if you'd like this, or add your comments to FR #657.")
}
}
if (is.logical(i)) {
if (notjoin) {
notjoin = FALSE
i = !i
}
}
if (is.null(i)) return( null.data.table() )
if (is.character(i) || is.factor(i)) {
isnull_inames = TRUE
i = data.table(V1=i) # for user convenience; e.g. DT["foo"] without needing DT[.("foo")]
} else if (identical(class(i),"list") && length(i)==1L && is.data.frame(i[[1L]])) { i = as.data.table(i[[1L]]) }
else if (identical(class(i),"data.frame")) { i = as.data.table(i) } # TO DO: avoid these as.data.table() and use a flag instead
else if (identical(class(i),"list")) {
isnull_inames = is.null(names(i))
i = as.data.table(i)
}
if (.is_dt_done(r <- .dt_coerce_i(q))) return(.dt_done_value(r))

if (is.data.frame(i)) {
if (missing_on) {
Expand Down
14 changes: 10 additions & 4 deletions inst/tests/bracket.Rraw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,14 @@ test(3.10, class(naive(DT[2:3, ])), c("data.table","data.frame"))
test(3.11, tryCatch(naive(DT[, a := 1L]), error=conditionCall)[[1L]], quote(`[.data.table`)) # not .dt_cedta_fallback
rm(DT, DF, naive)

# evaluation of i moved into .dt_eval_isub(), #852: its errors still report [.data.table
DT = data.table(x=1:3)
test(4.1, DT[x == 2L, verbose=TRUE], DT[2L], output="Constructing irows for '!byjoin || nqbyjoin'")
test(4.2, DT[!(x == 2L), verbose=TRUE], DT[c(1L, 3L)], output="Inverting irows for notjoin")
# evaluation of i moved into .dt_eval_isub()
# coercion of the evaluated i moved into .dt_coerce_i()
DT = data.table(a=1:3, b=c("x","y","z"))
test(4.1, DT[a == 2L, verbose=TRUE], DT[2L], output="Constructing irows for '!byjoin || nqbyjoin'")
test(4.2, DT[!(a == 2L), verbose=TRUE], DT[c(1L, 3L)], output="Inverting irows for notjoin")
test(4.3, DT[matrix(1:2, ncol=1)], DT[1:2])
test(4.4, tryCatch(DT[matrix(1:4, ncol=2L)], error=conditionCall)[[1L]], quote(`[.data.table`))
test(4.5, DT[!c(TRUE, FALSE, TRUE),], DT[2L])
test(4.6, DT[list(data.frame(b="y")), on="b",], DT[2L])
test(4.7, DT[factor("z"), on="b",], DT[3L])
rm(DT)
Loading