Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19668/modules/pftijah
Modified Files:
serialize_pftijah.mx
Log Message:
propagated changes of Wednesday Mar 25 2009
from the Feb2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/03/25 - hrode: modules/pftijah/serialize_pftijah.mx,1.68.2.1
try to fix indexing bug on 64bit systems
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: serialize_pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/serialize_pftijah.mx,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- serialize_pftijah.mx 19 Feb 2009 13:31:59 -0000 1.70
+++ serialize_pftijah.mx 25 Mar 2009 17:01:35 -0000 1.71
@@ -157,15 +157,15 @@
newsize =
MAX(MIN(MAX(MINCHUNK,dbat->raw_max*2),(BUN)(dbat->raw_max+MAXCHUNK)),(BUN)min_i);
}
- /* first check if the number of BUN's < INT_MAX. If this was the case
- * and the previous time INT_MAX was returned this means the BAT cannot
+ /* first check if the number of BUN's < GDK_oid_max. If this was the case
+ * and the previous time GDK_oid_max was returned this means the BAT cannot
* grow any longer.
*/
- if ( newsize > INT_MAX ) {
- newsize = INT_MAX;
+ if ( newsize > GDK_oid_max ) {
+ newsize = GDK_oid_max;
- if ( dbat->raw_max == INT_MAX ) {
- GDKerror("dbat_extend: BATextend[\"%s\"](size>INT_MAX)
fails\n","incomplete");
+ if ( dbat->raw_max == GDK_oid_max ) {
+ GDKerror("dbat_extend: BATextend[\"%s\"](size>GDK_oid_max)
fails\n","incomplete");
return -1;
}
}
------------------------------------------------------------------------------
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
