15 May
2008
15 May
'08
4:27 p.m.
Hi Jan,
Your checkin breaks the compilation due to the following error:
$SRCBASE_DIR/pathfinder/modules/pftijah/serialize_pftijah.mx: In
function 'dbat_extend':
$SRCBASE_DIR/pathfinder/modules/pftijah/serialize_pftijah.mx:175:
error: too few arguments to function 'BATmmap'
BATmmap has recently got an extra argument (please see Niels' checkin
yesterday), so you might want to update your MonetDB modules firstly :)
Regards,
Jennie
On May 15, 2008, at 11:59 , Jan Flokstra wrote:
> Update of /cvsroot/monetdb/pathfinder/modules/pftijah
> In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12778
>
> Modified Files:
> serialize_pftijah.mx
> Log Message:
> + repair pftijah direct memory acces problem which caused Henning's
> vitalis
> collection problems.
>
>
>
> U serialize_pftijah.mx
> Index: serialize_pftijah.mx
> ===================================================================
> RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/
> serialize_pftijah.mx,v
> retrieving revision 1.60
> retrieving revision 1.61
> diff -u -d -r1.60 -r1.61
> --- serialize_pftijah.mx 17 Apr 2008 10:29:10 -0000 1.60
> +++ serialize_pftijah.mx 15 May 2008 09:59:43 -0000 1.61
> @@ -135,9 +135,22 @@
> #define MINCHUNK 8192
> #define MAXCHUNK 67108864
>
> -int dbat_extend(dbat* dbat, oid min_i /*raw-index*/, size_t
> forced_size) {
> +static void
> +dbat_setcount(dbat *dbat, oid n)
> +{
> + BAT *b = dbat->bat;
> + BATsetcount(b, n);
> + if (b->ttype) {
> + b->tsorted = 0;
> + b->tdense = 0;
> + }
> +}
> +
> +static int
> +dbat_extend(dbat* dbat, oid min_i /*raw-index*/, size_t
> forced_size) {
> size_t newsize;
>
> + dbat_setcount(dbat, dbat->raw_max);
> if ( forced_size ) {
> newsize = forced_size;
> } else {
> @@ -156,10 +169,19 @@
> return -1;
> }
> }
> +#if 1
> + /* copied this form shredder.mx, keep it here ??? */
> + if (newsize+newsize > (size_t) REMAP_PAGE_MAXSIZE) { /* try to
> use mmap() */
> + BATmmap(dbat->bat, STORE_MMAP, STORE_MMAP, STORE_MMAP);
> + }
> +
> +#endif
> +
> #if 0
> stream_printf(GDKout,"dbat_extend[%s](%d -> %d)\n",dbat-
> >name,dbat->raw_max,newsize);
> #endif
> - dbat->raw_max= newsize;
> +
> + dbat->raw_max = newsize;
> dbat->seq_max = dbat->raw_max + dbat->seqbase;
> if ( !(dbat->bat = BATextend(dbat->bat,newsize)) ) {
> GDKerror("dbat_extend: BATextend[\"%s\"](to %d) fails
> \n","incomplete",newsize);
> @@ -169,17 +191,30 @@
> return 1;
> }
>
> -int dbat_sizeHint(dbat* dbat, int sizeHint_mark) {
> +#if 0
> +static int
> +dbat_sizeHint(dbat* dbat, int sizeHint_mark) {
> int sizeHint = sizeHint_mark - dbat->seqbase;
> int estimate = dbat->raw_max + sizeHint;
>
> return dbat_extend(dbat, estimate, 0);
> }
> +#endif
>
> #define dbat_set_oid(DBAT,I,V) (DBAT)->cast.oidCAST[I-(DBAT)-
> >seqbase] = V
>
> #define dbat_set_int(DBAT,I,V) (DBAT)->cast.intCAST[I-(DBAT)-
> >seqbase] = V
>
> +#if 0
> +static void
> +dbat_int_debug(char* t, dbat* dbat) {
> + stream_printf(GDKout,"+ DEBUGGING INT DBAT[sz=%d]@=[%s]:\n",dbat-
> >seq_max,t);
> + for(int i=0; i<10; i++) {
> + stream_printf(GDKout,"+ dbat[%d] = %d\n",i,dbat-
> >cast.intCAST[i]);
> + }
> +}
> +#endif
> +
> /************************************************
> *
> * The Tijah-Pathfinder index creation context
> @@ -391,7 +426,7 @@
> if ( (tjPre = tj_newPre(tjctx) ) == oid_nil )
> return 0;
> dbat_set_oid(&tjctx->dbat_collPre, tjPre, termOid);
> - dbat_set_int(&tjctx->dbat_collSize,(int)tjPre,0);
> + dbat_set_int(&tjctx->dbat_collSize,tjPre,0);
> #ifdef TJ_TRACE
> if ( TJ_TRACE ) stream_printf(GDKout,"C[%s]:TERM: \"%s
> \", termoid=%d, tjPre=%d\n",tjctx->name,term,termOid,tjPre);
> #endif
> @@ -1230,7 +1265,7 @@
> return GDK_FAIL;
> if ( dbat_finalize(&tjctx->dbat_collSize, tjctx->tijahPre) < 0 )
> return GDK_FAIL;
> -
> +
> tjctx->b_collPre->batDirty = TRUE;
> tjctx->b_collSize->batDirty = TRUE;
> tjctx->b_collPfPre->batDirty = TRUE;
>
>
> -------------------------------------------------------------------------
> 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-pf-checkins mailing list
> Monetdb-pf-checkins@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins