Changeset: 9a6503190531 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a6503190531
Modified Files:
gdk/gdk_join.c
Branch: default
Log Message:
Comments.
diffs (28 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -347,10 +347,12 @@ mergejoin(BAT *r1, BAT *r2, BAT *l, BAT
/* if next value in r too far away (more than
* lscan from current position in l), use
* binary search on l to skip over
- * non-matching values
+ * non-matching values, but only if l is
+ * sorted (lscan > 0) and we don't have to
+ * insert nils (outer join)
*
- * next value to match is first if equal_order
- * is set, last otherwise */
+ * next value to match in r is first if
+ * equal_order is set, last otherwise */
if (rcand) {
v = VALUE(r, (equal_order ? rcand[0] :
rcandend[-1]) - r->hseqbase);
} else if (rvals) {
@@ -359,7 +361,7 @@ mergejoin(BAT *r1, BAT *r2, BAT *l, BAT
rval = oid_nil;
v = (const char *) &rval;
} else if (roff != 0) {
- rval = * (const oid *) v + roff;
+ rval = *(const oid *)v + roff;
v = (const char *) &rval;
}
} else {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
