Changeset: 7a58128f4439 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7a58128f4439
Modified Files:
monetdb5/modules/mal/heapn.c
monetdb5/modules/mal/pp_hash.c
Branch: pp_hashjoin
Log Message:
small 32 bit fixes
diffs (33 lines):
diff --git a/monetdb5/modules/mal/heapn.c b/monetdb5/modules/mal/heapn.c
--- a/monetdb5/modules/mal/heapn.c
+++ b/monetdb5/modules/mal/heapn.c
@@ -1844,7 +1844,7 @@ HEAPorder(Client ctx, bat *rid, bat *hb,
if (offset > hp->size) {
BBPreclaim(hpb);
BBPreclaim(r);
- throw(MAL, "heapn.order", "offset (%lu) too high\n", offset);
+ throw(MAL, "heapn.order", "offset (%zu) too high\n", offset);
}
size_t used = hp->used-1, i = 0;
BUN j = 0;
diff --git a/monetdb5/modules/mal/pp_hash.c b/monetdb5/modules/mal/pp_hash.c
--- a/monetdb5/modules/mal/pp_hash.c
+++ b/monetdb5/modules/mal/pp_hash.c
@@ -468,7 +468,7 @@ OAHASHhashmark_init(Client ctx, bat *res
if (hp)
h = (hash_table*)hp->pl_io;
/* assert(h && h->pl_io.type == PIPELINE_IO_HASH_TABLE); */
- BUN sz = h?h->last:BATcount(ht); /* no hash ie outer cross product case
*/
+ BUN sz = h?(BUN)h->last:BATcount(ht); /* no hash ie outer cross product
case */
r = COLnew(0, TYPE_bit, sz, TRANSIENT);
if (!r) {
@@ -536,7 +536,7 @@ UHASHext(Client cntxt, MalBlkPtr m, MalS
BBPreclaim(i);
return createException(MAL, "hash.ext", SQLSTATE(HY002)
"Missing hash table");
}
- BAT *r = BATdense(0, 0, h->last);
+ BAT *r = BATdense(0, 0, (BUN)h->last);
BBPreclaim(i);
if (!r) {
return createException(MAL, "hash.ext", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
