Skip to content
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

Non equi issue 2360 fix #2461

Merged
merged 6 commits into from
Nov 8, 2017
+200,067 −30
Merged

Non equi issue 2360 fix #2461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f1ef53d
non equi join bug fix as reported in #2360.
arunsrinivasan Nov 3, 2017
b92ae21
Moving and renaming nqnewindices to its own file, #2360.
arunsrinivasan Nov 3, 2017
6bc16d8
Merge branch 'master' into non-equi-issue-2360-fix
arunsrinivasan Nov 7, 2017
09ad8d1
Simplifying loop logic further and fixing a segfault using for-loop a…
arunsrinivasan Nov 7, 2017
8d2c3bf
minor comment fix.
arunsrinivasan Nov 7, 2017
ca7ab74
Adding test for #2275, since this PR fixes that issue as well. Update…
arunsrinivasan Nov 7, 2017
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
1 change: 1 addition & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@

23. Non-equi joins work as expected when `x` in `x[i, on=...]` is a 0-row data.table. Closes [#1986](https://github.com/Rdatatable/data.table/issues/1986).

24. Non-equi joins along with `by=.EACHI` returned incorrect result in some rare cases as reported under [#2360](https://github.com/Rdatatable/data.table/issues/2360). This is fixed now. This fix also takes care of [#2275](https://github.com/Rdatatable/data.table/issues/2275). Thanks to @ebs238 for the nice minimal reproducible report, @Mihael for asking on SO and to @Frank for following up on SO and filing an issue.

#### NOTES

Expand Down
2 changes: 1 addition & 1 deletion R/data.table.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ chmatch2 <- function(x, table, nomatch=NA_integer_) {
if (nqbyjoin) {
irows = if (length(xo)) xo[irows] else irows
xo = setorder(setDT(list(indices=rep.int(indices__, len__), irows=irows)))[["irows"]]
ans = .Call(Cnqnewindices, xo, len__, indices__, max(indices__))
ans = .Call(CnqRecreateIndices, xo, len__, indices__, max(indices__))
f__ = ans[[1L]]; len__ = ans[[2L]]
allLen1 = FALSE # TODO; should this always be FALSE?
irows = NULL # important to reset
Expand Down
Loading