Skip to content

assign 'clamp' to intermediate variable for error readability #5443

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
MichaelChirico wants to merge 2 commits into from
Closed

assign 'clamp' to intermediate variable for error readability #5443

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2470b1f
assign 'clamp' to intermediate variable for error readability
MichaelChirico Aug 22, 2022
44377a0
Merge branch 'master' into MichaelChirico-patch-5
MichaelChirico Dec 14, 2023
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
15 changes: 9 additions & 6 deletions R/data.table.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,12 +527,15 @@ replace_dot_alias = function(e) {
# Really, `anyDuplicated` in base is AWESOME!
# allow.cartesian shouldn't error if a) not-join, b) 'i' has no duplicates
if (verbose) {last.started.at=proc.time();catf("Constructing irows for '!byjoin || nqbyjoin' ... ");flush.console()}
irows = if (allLen1) f__ else vecseq(f__,len__,
if (allow.cartesian ||
notjoin || # #698. When notjoin=TRUE, ignore allow.cartesian. Rows in answer will never be > nrow(x).
!anyDuplicated(f__, incomparables = c(0L, NA_integer_))) {
NULL # #742. If 'i' has no duplicates, ignore
} else as.double(nrow(x)+nrow(i))) # rows in i might not match to x so old max(nrow(x),nrow(i)) wasn't enough. But this limit now only applies when there are duplicates present so the reason now for nrow(x)+nrow(i) is just to nail it down and be bigger than max(nrow(x),nrow(i)).
if (allLen1)
irows = f__
else {
# notjoin condition for #698. When notjoin=TRUE, ignore allow.cartesian. Rows in answer will never be > nrow(x).
# anyDuplicated condition for # #742. If 'i' has no duplicates, no clamp needed.
# rows in i might not match to x so old max(nrow(x),nrow(i)) wasn't enough. But this limit now only applies when there are duplicates present so the reason now for nrow(x)+nrow(i) is just to nail it down and be bigger than max(nrow(x),nrow(i)).
clamp = if (!allow.cartesian && !notjoin && anyDuplicated(f__, incomparables = c(0L, NA_integer_))) as.double(nrow(x) + nrow(i))
irows = vecseq(f__, len__, clamp)
}
if (verbose) {cat(timetaken(last.started.at),"\n"); flush.console()}
# Fix for #1092 and #1074
# TODO: implement better version of "any"/"all"/"which" to avoid
Expand Down