Changeset: c57e0509c83a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c57e0509c83a
Modified Files:
gdk/gdk_join.c
Branch: Mar2018
Log Message:
Make sure [lr]slots is set when [lr]hash is.
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
@@ -3868,7 +3868,9 @@ BATjoin(BAT **r1p, BAT **r2p, BAT *l, BA
}
if (sl == NULL) {
lhash = BATcheckhash(l);
- if (!lhash && (parent = VIEWtparent(l)) != 0) {
+ if (lhash) {
+ lslots = ((size_t *) l->thash->heap.base)[5];
+ } else if ((parent = VIEWtparent(l)) != 0) {
BAT *b = BBPdescriptor(parent);
/* use hash on parent if the average chain
* length times the number of required probes
@@ -3887,7 +3889,9 @@ BATjoin(BAT **r1p, BAT **r2p, BAT *l, BA
}
if (sr == NULL) {
rhash = BATcheckhash(r);
- if (!rhash && (parent = VIEWtparent(r)) != 0) {
+ if (rhash) {
+ rslots = ((size_t *) r->thash->heap.base)[5];
+ } else if ((parent = VIEWtparent(r)) != 0) {
BAT *b = BBPdescriptor(parent);
/* use hash on parent if the average chain
* length times the number of required probes
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
