Martin Kersten wrote:

Update of /cvsroot/monetdb/MonetDB5/src/mal In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28477

Modified Files: Tag: MonetDB_5-6 mal_recycle.mx Log Message: Protect the garbage collector against removing NULL bats. The recycler is feature and it is used in the current branch.

It is not tested in the stable and it might stop to be compiled in the stable. All the implementation related to the recycler should be checked in at the current one and not in the stable one. This avoids problems in the stable and saves time in the recycler development (I do not need to wait for the propagations to have an actualized code)... I am going to revert this change, and do it in the current Note: Martin is aware of this... :) Regards, Romulo

U mal_recycle.mx Index: mal_recycle.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_recycle.mx,v retrieving revision 1.75.2.2 retrieving revision 1.75.2.3 diff -u -d -r1.75.2.2 -r1.75.2.3 --- mal_recycle.mx 31 May 2008 20:06:48 -0000 1.75.2.2 +++ mal_recycle.mx 2 Jun 2008 17:55:04 -0000 1.75.2.3 @@ -273,7 +273,8 @@ for(j=0; j< q->argc; j++){ v= &getVarConstant(mb,getArg(q,j)); if(getArgType(mb,q,j)==TYPE_bat || isaBatType(getArgType(mb, q,j)) ){ - BBPdecref(ABS(v->val.bval), TRUE); + if( v->val.bval || !BBP_lrefs(v->val.bval)) + BBPdecref(ABS(v->val.bval), TRUE); v->val.bval= 0; } if( v->vtype == TYPE_str) {

------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins