Update of /cvsroot/monetdb/MonetDB/src/gdk
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10220/src/gdk
Modified Files:
gdk_batop.mx gdk.mx
Log Message:
make sure we use a large enough type too hold head/tail size (ie use size_t)
(solves a problem in loading the 100G skyserver)
Index: gdk.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/gdk/gdk.mx,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- gdk.mx 21 Oct 2007 20:08:10 -0000 1.240
+++ gdk.mx 26 Oct 2007 13:59:38 -0000 1.241
@@ -1339,8 +1339,8 @@
#define Tsize(b) ((b)->T->width)
/* new semantics ! */
-#define headsize(b,p) (b->H->type?(p)<<b->H->shift:0)
-#define tailsize(b,p) (b->T->type?(p)<<b->T->shift:0)
+#define headsize(b,p) (b->H->type?((size_t)(p))<<b->H->shift:0)
+#define tailsize(b,p) (b->T->type?((size_t)(p))<<b->T->shift:0)
#define Hloc(b,p) ((b)->H->heap.base+((p)<<(b)->H->shift))
#define Tloc(b,p) ((b)->T->heap.base+((p)<<(b)->T->shift))
Index: gdk_batop.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/gdk/gdk_batop.mx,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- gdk_batop.mx 4 Oct 2007 10:58:36 -0000 1.142
+++ gdk_batop.mx 26 Oct 2007 13:59:38 -0000 1.143
@@ -534,7 +534,7 @@
that just reuses the memory of the source.
@c
if (BAThrestricted(b) == BAT_READ && BATtrestricted(b) == BAT_READ) {
- int cnt = h-l;
+ size_t cnt = h-l;
bn = VIEWcreate_(b, b, TRUE);
bn->batFirst = bn->batDeleted = bn->batInserted = 0;
bn->H->heap.base = (bn->htype)?BUNhloc(bi,l):NULL;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
