Changeset: 551f7e55406b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/551f7e55406b
Modified Files:
monetdb5/modules/mal/mkey.c
Branch: default
Log Message:
Treat void bat values the same as oid in batmkey.rotate_xor_hash.
diffs (29 lines):
diff --git a/monetdb5/modules/mal/mkey.c b/monetdb5/modules/mal/mkey.c
--- a/monetdb5/modules/mal/mkey.c
+++ b/monetdb5/modules/mal/mkey.c
@@ -470,6 +470,25 @@ MKEYbulk_rotate_xor_hash(Client cntxt, M
}
break;
}
+ case TYPE_void: {
+ const ulng *restrict h = (const ulng *) hbi.base;
+ if (ci1.tpe == cand_dense && ci2.tpe == cand_dense) {
+ for (BUN i = 0; i < ci1.ncand; i++) {
+ oid p1 = (canditer_next_dense(&ci1) -
off1),
+ p2 = (canditer_next_dense(&ci2)
- off2);
+ r[i] = GDK_ROTATE(h[p1], lbit,
+ rbit)
^ (ulng) MKEYHASH_oid(BUNtoid(b, p2));
+ }
+ } else {
+ for (BUN i = 0; i < ci1.ncand; i++) {
+ oid p1 = (canditer_next(&ci1) - off1),
+ p2 = (canditer_next(&ci2) -
off2);
+ r[i] = GDK_ROTATE(h[p1], lbit,
+ rbit)
^ (ulng) MKEYHASH_oid(BUNtoid(b, p2));
+ }
+ }
+ break;
+ }
case TYPE_dbl:
MKEYbulk_rotate_xor_hashloop(lng);
break;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
