Skip to content

Nqjoin efficiency 2 #2733

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

Merged
mattdowle merged 2 commits into from
Apr 9, 2018
Merged

Nqjoin efficiency 2 #2733

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55dc4c5
Gather row numbers and then select them all once, rather than rbindli…
mattdowle Apr 9, 2018
74ecdfb
Merge branch 'master' into nqjoin_efficiency_2
mattdowle Apr 9, 2018
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
22 changes: 12 additions & 10 deletions inst/tests/tests.Rraw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8830,28 +8830,30 @@ nqjoin_test <- function(x, y, k=1L, test_no, mult="all") {
expr = lapply(seq_along(cols), function(i) {
GT_or_LT = ops[i]==">" || ops[i]=="<"
if (inherits(vals[[i]], "integer64")) {
if (is.na.integer64(vals[[i]])) if (GT_or_LT) quote(integer(0)) else as.call(list(quote(is.na.integer64), as.name(cols[[i]])))
if (is.na.integer64(vals[[i]])) if (GT_or_LT) quote(logical()) else as.call(list(quote(is.na.integer64), as.name(cols[[i]])))
else as.call(list(as.name(ops[[i]]), as.name(cols[[i]]), as.integer(vals[[i]])))
# don't know how to construct a call with int64 -- vals[[i]] gets converted to NAN
} else {
if (is.nan(vals[[i]])) if (GT_or_LT) quote(integer(0)) else as.call(list(quote(is.nan), as.name(cols[[i]])))
else if (is_only_na(vals[[i]])) if (GT_or_LT) quote(integer(0)) else as.call(list(quote(is_only_na), as.name(cols[[i]])))
if (is.nan(vals[[i]])) if (GT_or_LT) quote(logical(0)) else as.call(list(quote(is.nan), as.name(cols[[i]])))
else if (is_only_na(vals[[i]])) if (GT_or_LT) quote(logical()) else as.call(list(quote(is_only_na), as.name(cols[[i]])))
else as.call(list(as.name(ops[[i]]), as.name(cols[[i]]), vals[[i]]))
}
})
Reduce(function(x,y)call("&",x,y), expr)
}
check <- function(x, y, cols, ops, mult="all") {
rbindlist(lapply(1:nrow(y), function(i) {
# gather just row numbers here and then select all rows once afterwards, rather than rbindlist
rowNums = unlist(lapply(1:nrow(y), function(i) {
e = construct(cols, y[i, ..cols], ops)
val = x[eval(e)]
if (!nrow(val) || mult=="all")
val
rowNums = which(with(x, eval(e))) # raw expression, isolated from both [.data.table overhead and subset optimization
if (!length(rowNums) || mult=="all")
rowNums
else if (mult=="first")
val[1L]
rowNums[1L]
else # mult=="last"
val[.N]
rowNums[length(rowNums)]
}))
x[rowNums]
}
nq <- function(x, y, cols, ops, nomatch=0L, mult="all") {
sd_cols = c(paste0("x.", cols), setdiff(names(x), cols))
Expand All @@ -8868,7 +8870,7 @@ nqjoin_test <- function(x, y, k=1L, test_no, mult="all") {
test_no = test_no + .001
test(test_no, ans1, ans2)
}
gc() # attempt to free heap earlier for the 50 nrow(y) tables created and then rbindlist'd in check(), repeated for each of the 91 runcmb
gc() # no longer needed but left in place just in case, no harm
}

if (TRUE) { # turn off temporarily using FALSE when using valgrind, as very slow
Expand Down