Changeset: c66bbf462922 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c66bbf462922
Modified Files:
gdk/gdk_join.c
Branch: default
Log Message:
Backout of changeset 0a6586678e39. We forgot to take I/O into account.
diffs (25 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -2267,8 +2267,8 @@ BATsubjoin(BAT **r1p, BAT **r2p, BAT *l,
else
return mergejoin(r2, r1, r, l, sr, sl, nil_matches, 0,
0, 0);
} else if (l->T->hash && r->T->hash) {
- /* both have hash, largest on right */
- swap = lcount > rcount;
+ /* both have hash, smallest on right */
+ swap = lcount < rcount;
} else if (l->T->hash) {
/* only left has hash, swap */
swap = 1;
@@ -2289,8 +2289,8 @@ BATsubjoin(BAT **r1p, BAT **r2p, BAT *l,
* large (i.e. prefer hash over binary search, but
* only if the hash table doesn't cause thrashing) */
return mergejoin(r1, r2, l, r, sl, sr, nil_matches, 0, 0, 0);
- } else if (BATcount(l) > BATcount(r)) {
- /* no hashes, not sorted, create hash on largest BAT */
+ } else if (BATcount(l) < BATcount(r)) {
+ /* no hashes, not sorted, create hash on smallest BAT */
swap = 1;
}
if (swap) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
