Merge branch 'issue_1916' of https://github.com/Rdatatable/data.table into issue_1916

Author: Mukulyadav2004

R/as.data.table.R

@@ -138,29 +138,24 @@ as.data.table.list = function(x,
   empty_atomic = FALSE
 
   # Handle keep.rownames for vectors (mimicking data.frame behavior)
-  vector_rownames = NULL
+  rownames_ = NULL
   check_rownames = !isFALSE(keep.rownames)
-  
+
   for (i in seq_len(n)) {
     xi = x[[i]]
     if (is.null(xi)) next    # eachncol already initialized to 0 by integer() above
-    if (check_rownames && is.null(vector_rownames)) {
-      # Check for named vectors
-      if (is.atomic(xi) && !is.null(names(xi)) && is.null(dim(xi))) {
-        valid_names = names(xi) 
-        if (any(nzchar(valid_names))) {
-          vector_rownames = valid_names
+    if (check_rownames && is.null(rownames_)) {
+      if (is.null(dim(xi))) {
+        if (!is.null(nm <- names(xi)) && any(nzchar(nm))) {
+          rownames_ = nm
           x[[i]] = unname(xi)
         }
-      }
-      # Check for data.frames or matrices with explicit rownames
-      else if (!is.null(dim(xi)) && !is.null(rownames(xi))) {
-        valid_names = rownames(xi)
-        if (any(nzchar(valid_names))) {
-          vector_rownames = valid_names
+      } else {
+        if (!is.null(nm <- rownames(xi)) && any(nzchar(nm))) {
+          rownames_ = nm
         }
       }
-    }  
+    }
     if (!is.null(dim(xi)) && missing.check.names) check.names=TRUE
     if ("POSIXlt" %chin% class(xi)) {
       warningf("POSIXlt column type detected and converted to POSIXct. We do not recommend use of POSIXlt at all because it uses 40 bytes to store one date.")
@@ -170,8 +165,7 @@ as.data.table.list = function(x,
         if (is.matrix(xi) && NCOL(xi)<=1L && is.null(colnames(xi))) { # 1 column matrix naming #4124
           xi = x[[i]] = c(xi)
         } else {
-          xi = x[[i]] = as.data.table(xi, keep.rownames=FALSE)  # we will never allow a matrix to be a column; always unpack the columns
-          xi = x[[i]] = as.data.table(xi, keep.rownames=FALSE)  # we will never allow a matrix to be a column; always unpack the columns
+          xi = x[[i]] = as.data.table(xi, keep.rownames=keep.rownames)  # we will never allow a matrix to be a column; always unpack the columns
         }
       }
       # else avoid dispatching to as.data.table.data.table (which exists and copies)
@@ -228,10 +222,15 @@ as.data.table.list = function(x,
   if (check.names) vnames = make.names(vnames, unique=TRUE)
 
   # Add rownames column when vector names were found
-  if (!is.null(vector_rownames)) {
+  if (!is.null(rownames_)) {
     rn_name = if (is.character(keep.rownames)) keep.rownames[1L] else "rn"
-    ans = c(list(recycle(vector_rownames, nrow)), ans)
-    vnames = c(rn_name, vnames)
+    if (!is.na(idx <- chmatch(rn_name, vnames)[1L])) {
+      ans = c(list(ans[[idx]]), ans[-idx])
+      vnames = c(vnames[idx], vnames[-idx])
+    } else {
+      ans = c(list(recycle(rownames_, nrow)), ans)
+      vnames = c(rn_name, vnames)
+    }
   }
   setattr(ans, "names", vnames)
   setDT(ans, key=key) # copy ensured above; also, setDT handles naming

inst/tests/tests.Rraw

@@ -21408,20 +21408,20 @@ dt = data.table(a = NA_integer_, b = NaN)
 test(2329.3, print(dt, col.names = "none"), output = "1: NA NaN\n")
 
 # Row name extraction from multiple vectors, #7136
-x <- c(1, 2, 3)  
-y <- setNames(c(4, 5, 6), c("A", "B", "C"))  
-test(2330.1, as.data.table.list(list(x, y), keep.rownames=TRUE), data.table(rn=c("A", "B", "C"), V1=c(1, 2, 3), V2=c(4, 5, 6)))
-test(2330.2, as.data.table.list(list(x, y), keep.rownames="custom"), data.table(custom=c("A", "B", "C"), V1=c(1, 2, 3), V2=c(4, 5, 6)))
-test(2330.3, as.data.table.list(list(y, x), keep.rownames=TRUE), data.table(rn=c("A", "B", "C"), V1=c(4, 5, 6), V2=c(1, 2, 3))) 
+x <- 1:3 
+y <- setNames(4:6, c("A", "B", "C"))  
+test(2330.1, as.data.table(list(x, y), keep.rownames=TRUE), data.table(rn=c("A", "B", "C"), V1=1:3, V2=4:6))
+test(2330.2, as.data.table(list(x, y), keep.rownames="custom"), data.table(custom=c("A", "B", "C"), V1=1:3, V2=4:6))
+test(2330.3, as.data.table(list(y, x), keep.rownames=TRUE), data.table(rn=c("A", "B", "C"), V1=4:6, V2=1:3)) 
 
 # Behavior under data.frame()
-test(2330.4, as.data.table(data.frame(x, y), keep.rownames=TRUE), data.table(rn=c("A", "B", "C"), V1=c(1, 2, 3), V2=c(4, 5, 6)))
-test(2330.5, as.data.table(data.frame(y, x), keep.rownames=TRUE), data.table(rn=c("A", "B", "C"), V1=c(4, 5, 6), V2=c(1, 2, 3)))
+test(2330.4, as.data.table(data.frame(x, y), keep.rownames=TRUE), data.table(rn=c("A", "B", "C"), x=1:3, y=4:6))
+test(2330.5, as.data.table(data.frame(y, x), keep.rownames=TRUE), data.table(rn=c("A", "B", "C"), y=4:6, x=1:3))
 
-a <- setNames(c(7, 8, 9), c("", "", ""))    # test condition about any(nzchar(valid_names))
-test(2330.6, as.data.table.list(list(a), keep.rownames=TRUE), data.table(V1=c(7, 8, 9)))
-b <- setNames(c(10, 11, 12), c("", "B", ""))
-test(2330.7, as.data.table.list(list(b), keep.rownames=TRUE), data.table(rn=c("", "B", ""), V1=c(10, 11, 12)))
+a <- setNames(7:9, c("", "", ""))    # test condition about any(nzchar(valid_names))
+test(2330.6, as.data.table(list(a), keep.rownames=TRUE), data.table(V1=7:9))
+b <- setNames(10:12, c("", "B", ""))
+test(2330.7, as.data.table(list(b), keep.rownames=TRUE), data.table(rn=c("", "B", ""), V1=10:12))
 
 DF <- data.frame(row.names = letters[1:6], V = 1:6)     # Test data.frame with explicit rownames
-test(2330.8, as.data.table(list(a = 6:1, DF), keep.rownames=TRUE), data.table(rn=c("a", "b", "c", "d", "e", "f"), a=c(6, 5, 4, 3, 2, 1), V=c(1, 2, 3, 4, 5, 6)))
+test(2330.8, as.data.table(list(a = 6:1, DF), keep.rownames=TRUE), data.table(rn=letters[1:6], a=6:1, V=1:6))