Changeset: 5cc92e942005 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5cc92e942005
Modified Files:
gdk/gdk.h
gdk/gdk_select.c
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (24 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2096,7 +2096,7 @@ gdk_export gdk_return BAThash(BAT *b, BU
/* low level functions */
-#define BATprepareHash(X) ((X)->T->hash == NULL && BAThash((X), 0) == GDK_FAIL)
+#define BATprepareHash(X) (BAThash((X), 0) == GDK_FAIL)
/*
* @- Column Imprints Functions
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -185,7 +185,7 @@ BAT_hashselect(BAT *b, BAT *s, BAT *bn,
seq = b->hseqbase;
if (VIEWtparent(b)) {
BAT *b2 = BBPdescriptor(-VIEWtparent(b));
- l = ((b->T->heap.base - b2->T->heap.base) >> b->T->shift) +
BUNfirst(b);
+ l = (BUN) ((b->T->heap.base - b2->T->heap.base) >> b->T->shift)
+ BUNfirst(b);
h = l + BATcount(b);
b = b2;
} else {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
