Skip to content

Refactor do_j_names to reuse logic from setDT (#6702) #6802

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

Closed
yuzhengcong wants to merge 2 commits into from
Closed

Refactor do_j_names to reuse logic from setDT (#6702) #6802

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1918128
Refactor do_j_names to reuse logic from setDT (#6702)
yuzhengcong Feb 8, 2025
0d9a3c0
Merge branch 'master' into issue#6702
yuzhengcong Feb 8, 2025
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
68 changes: 38 additions & 30 deletions R/data.table.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,6 +936,42 @@ replace_dot_alias = function(e) {
else
x
}
# extract the same codes from setDT() and do_j_names() for #6702
simple_extract <- function(name, x, checkSingleChar = TRUE, envir = parent.frame()) {
k = eval(name[[2L]], envir, envir)
if (is.list(k)) {
origj = j = if (name[[1L]] == "$") {
Copy link
Member

@MichaelChirico MichaelChirico Feb 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

try and match the original style of the code, it's much harder to read when the diff is larger than necessary

as.character(name[[3L]])
} else {
eval(name[[3L]], envir, envir)
}
if (is.character(j)) {
if (checkSingleChar) {
if (length(j) != 1L) {
stopf("Cannot assign to an under-allocated recursively indexed list -- L[[i]][,:=] syntax is only valid when i is length 1, but its length is %d", length(j))
}
j2 = match(j, names(k))
if (is.na(j2)) {
Copy link
Member

@MichaelChirico MichaelChirico Feb 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in both branches, we do the j2 = match() and if (is.na()) checks -- move them outside checkSingleChar. Try and think through if that applies elsewhere also.

internal_error("item '%s' not found in names of list", origj)
}
j = j2
} else {
if (length(j) == 1L) {
j2 = match(j, names(k))
if (is.na(j2)) {
stopf("Item '%s' not found in names of input list", origj)
}
j = j2
}
}
}
.Call(Csetlistelt, k, as.integer(j), x)
} else if (is.environment(k) && exists(as.character(name[[3L]]), k)) {
assign(as.character(name[[3L]]), x, k, inherits = FALSE)
} else if (isS4(k)) {
.Call(CsetS4elt, k, as.character(name[[3L]]), x)
}
}
# handle auto-naming of last item of j (e.g. within {} or if/else, #2478)
# e.g. DT[, .(a=sum(v), v, .N), by=] should create columns named a, v, N
do_j_names = function(q) {
Expand Down Expand Up @@ -1216,20 +1252,7 @@ replace_dot_alias = function(e) {
if (is.name(name)) {
assign(as.character(name),x,parent.frame(),inherits=TRUE)
} else if (.is_simple_extraction(name)) { # TODO(#6702): use a helper here as the code is very similar to setDT().
k = eval(name[[2L]], parent.frame(), parent.frame())
if (is.list(k)) {
origj = j = if (name[[1L]] == "$") as.character(name[[3L]]) else eval(name[[3L]], parent.frame(), parent.frame())
if (is.character(j)) {
if (length(j)!=1L) stopf("Cannot assign to an under-allocated recursively indexed list -- L[[i]][,:=] syntax is only valid when i is length 1, but its length is %d", length(j))
j = match(j, names(k))
if (is.na(j)) internal_error("item '%s' not found in names of list", origj) # nocov
}
.Call(Csetlistelt,k,as.integer(j), x)
} else if (is.environment(k) && exists(as.character(name[[3L]]), k)) {
assign(as.character(name[[3L]]), x, k, inherits=FALSE)
} else if (isS4(k)) {
.Call(CsetS4elt, k, as.character(name[[3L]]), x)
}
simple_extract(name, x, checkSingleChar = TRUE, envir = parent.frame())
} # TO DO: else if env$<- or list$<-
}
}
Expand Down Expand Up @@ -2962,22 +2985,7 @@ setDT = function(x, keep.rownames=FALSE, key=NULL, check.names=FALSE) {
assign(name, x, parent.frame(), inherits=TRUE)
} else if (.is_simple_extraction(name)) {
# common case is call from 'lapply()'
k = eval(name[[2L]], parent.frame(), parent.frame())
if (is.list(k)) {
origj = j = if (name[[1L]] == "$") as.character(name[[3L]]) else eval(name[[3L]], parent.frame(), parent.frame())
if (length(j) == 1L) {
if (is.character(j)) {
j = match(j, names(k))
if (is.na(j))
stopf("Item '%s' not found in names of input list", origj)
}
}
.Call(Csetlistelt, k, as.integer(j), x)
} else if (is.environment(k) && exists(as.character(name[[3L]]), k)) {
assign(as.character(name[[3L]]), x, k, inherits=FALSE)
} else if (isS4(k)) {
.Call(CsetS4elt, k, as.character(name[[3L]]), x)
}
simple_extract(name, x, checkSingleChar = FALSE, envir = parent.frame())
} else if (name %iscall% "get") { # #6725
# edit 'get(nm, env)' call to be 'assign(nm, x, envir=env)'
name = match.call(get, name)
Expand Down
Loading