rewrite set

Author: ben-schwen

R/data.table.R

@@ -2713,15 +2713,13 @@ setcolorder = function(x, neworder=key(x), before=NULL, after=NULL)  # before/af
   invisible(x)
 }
 
-set = function(x,i=NULL,j,value)  # low overhead, loopable
-{
-  if (is.character(j)) {
-    name = substitute(x)
-    x = .Call(Cassign,x,i,j,NULL,value)
-    if (is.name(name))
-      assign(as.character(name),x,parent.frame(),inherits=TRUE)
-  } else {
-    .Call(Cassign,x,i,j,NULL,value)
+set = function(x, i = NULL, j, value) {
+  name = as.chracter(substitute(x))
+  old_add = address(x)
+  x = .Call(Cassign, x, i, j, NULL, value)
+  if (old_add != address(x)) {
+    # assign is needed to replace x on address change due to possible new allocation
+    assign(name, x, envir = parent.frame(), inherits = TRUE)
   }
   invisible(x)
 }

inst/tests/tests.Rraw

@@ -18703,12 +18703,3 @@ test(2234.7, DT[, min(.SD), by=c(.I)], data.table(I=1L:5L, V1=c(1L, 2L, 3L, 2L,
 test(2234.8, DT[, min(.SD), by=.I%%2L], error="by.*contains .I.*supported")  # would be nice to support in future; i.e. by odd/even rows, and by=(.I+1L)%/%2L for pairs of rows; i.e. any expression of .I
 test(2234.9, DT[, min(.SD), by=somefun(.I)], error="by.*contains .I.*supported")
 
-# re-overallocate in set if quota is reached #496 #4100
-opt = options(datatable.alloccol=1L)
-n = getOption("datatable.alloccol")
-DT = data.table()
-for (i in seq(10*n)) set(DT, j = paste0("V",i), value = i)
-test(2235.1, ncol(DT), 10L*n)
-DT = structure(list(a = 1, b = 2), class = c("data.table", "data.frame"))
-test(2235.2, set(DT, j="c", value=3), data.table(a=1, b=2, c=3))
-options(opt)