Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@

4. `dcast()` and `melt()` "just work" when passed a data.frame, not just data.tables, with no need for coercion, [#7614](https://github.com/Rdatatable/data.table/issues/7614). Thanks @MichaelChirico for the suggestion and @manmita for the PR. Note that to avoid potential conflicts with {reshape2}'s data.frame methods, we do the dispatch to the data.table method manually.

5. `setnames()` now supports a global option `datatable.unique.names` to control the creation of duplicate column names. Users can choose between `"off"` (default), `"warn"`, `"error"`, or `"rename"`. This addresses long-standing ambiguity issues when duplicate names were created silently, [#4044](https://github.com/Rdatatable/data.table/issues/4044). Thanks to @venom1204 for the PR.

### BUG FIXES

1. `fread()` with `skip=0` and `(header=TRUE|FALSE)` no longer skips the first row when it has fewer fields than subsequent rows, [#7463](https://github.com/Rdatatable/data.table/issues/7463). Thanks @emayerhofer for the report and @ben-schwen for the fix.
Expand Down
9 changes: 8 additions & 1 deletion R/data.table.R
Original file line number Diff line number Diff line change
Expand Up @@ -2943,12 +2943,19 @@ setnames = function(x,old,new,skip_absent=FALSE) {
if (!length(new)) return(invisible(x)) # no changes
if (length(i) != length(new)) internal_error("length(i)!=length(new)") # nocov
}

# NEW: Check for duplicates using the centralized helper in utils.R
full_names = names(x)
full_names[i] = new
full_names = process_name_policy(full_names)
new = full_names[i]

# update the key if the column name being change is in the key
Copy link
Member

Choose a reason for hiding this comment

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

please dont delete comments

m = chmatch(names(x)[i], key(x))
w = which(!is.na(m))
if (length(w))
.Call(Csetcharvec, attr(x, "sorted", exact=TRUE), m[w], new[w])

# update secondary keys
idx = attr(x, "index", exact=TRUE)
for (k in names(attributes(idx))) {
Expand Down
3 changes: 2 additions & 1 deletion R/onLoad.R
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@
datatable.auto.index=TRUE, # DT[col=="val"] to auto add index so 2nd time faster
datatable.use.index=TRUE, # global switch to address #1422
datatable.prettyprint.char=NULL, # FR #1091
datatable.old.matrix.autoname=FALSE # #7145: how data.table(x=1, matrix(1)) is auto-named set to change
datatable.old.matrix.autoname=FALSE, # #7145: how data.table(x=1, matrix(1)) is auto-named set to change
datatable.unique.names = NULL
)
opts = opts[!names(opts) %chin% names(options())]
options(opts)
Expand Down
23 changes: 23 additions & 0 deletions R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,29 @@ check_duplicate_names = function(x, table_name=deparse(substitute(x))) {
table_name, brackify(duplicate_names), domain=NA)
}

process_name_policy = function(names_vec) {
policy = getOption("datatable.unique.names")
if (is.null(policy) || policy == "off") return(names_vec)
Copy link
Member

Choose a reason for hiding this comment

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

on a second thought NULL might be a better default for "off"

# onLoad.R
datatable.unique.names = NULL   # NULL means off


allowed = c("warn", "error", "rename")
if (!policy %in% allowed) {
warningf("Invalid value for 'datatable.unique.names': [%s]. Falling back to 'off'. Allowed values are: 'off', 'warn', 'error', 'rename'.", as.character(policy))
return(names_vec)
}

if (anyDuplicated(names_vec)) {
dups = unique(names_vec[duplicated(names_vec)])
msg = paste0("Duplicate column names created: ", brackify(dups), ". This may cause ambiguity.")

switch(policy,
warn = warningf(msg),
error = stopf(msg),
rename = return(make.unique(names_vec))
)
}
names_vec
}

duplicated_values = function(x) {
# fast anyDuplicated for the typical/non-error case; second duplicated() pass for (usually) error case
if (!anyDuplicated(x)) return(vector(typeof(x)))
Expand Down
19 changes: 19 additions & 0 deletions inst/tests/tests.Rraw
Original file line number Diff line number Diff line change
Expand Up @@ -21520,3 +21520,22 @@ test(2365.1, melt(df_melt, id.vars=1:2), melt(dt_melt, id.vars=1:2))
df_dcast = data.frame(a = c("x", "y"), b = 1:2, v = 3:4)
dt_dcast = data.table(a = c("x", "y"), b = 1:2, v = 3:4)
test(2365.2, dcast(df_dcast, a ~ b, value.var = "v"), dcast(dt_dcast, a ~ b, value.var = "v"))

#4044
DT = as.data.table(iris)
test(2366.1, names(setnames(copy(DT), "Petal.Length", "Sepal.Length")),
c("Sepal.Length", "Sepal.Width", "Sepal.Length", "Petal.Width", "Species"),
options = list(datatable.unique.names = "off"))

test(2366.2, names(setnames(copy(DT), "Petal.Length", "Sepal.Length")),
c("Sepal.Length", "Sepal.Width", "Sepal.Length", "Petal.Width", "Species"),
warning = "Duplicate column names created",
options = list(datatable.unique.names = "warn"))

test(2366.3, setnames(copy(DT), "Petal.Length", "Sepal.Length"),
error = "Duplicate column names created",
options = list(datatable.unique.names = "error"))

test(2366.4, names(setnames(copy(DT), "Petal.Length", "Sepal.Length")),
c("Sepal.Length", "Sepal.Width", "Sepal.Length.1", "Petal.Width", "Species"),
options = list(datatable.unique.names = "rename"))
3 changes: 3 additions & 0 deletions man/data.table-options.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@
\item{\code{datatable.enlist}}{Experimental feature. Default is \code{NULL}. If set to a function
(e.g., \code{list}), the \code{j} expression can return a \code{list}, which will then
be "enlisted" into columns in the result.}
\item{\code{datatable.unique.names}}{A character string, default \code{NULL} (same as \code{"off"}).
Controls the behavior when operations (\bold{currently only \code{setnames}})
would result in duplicate column names.}
}
}

Expand Down