Martin, is this restore of monetdb5/modules/kernel/kprelude.mx to the version of the default branch intended or by accident?
This changset effectively reverts all changes in monetdb5/modules/kernel/kprelude.mx on the headless branch, i.e., changeset: 39263:0a6235e74915 branch: headless user: [email protected] date: Sat Feb 26 11:47:18 2011 +0100 summary: Interface to CBPkeepref/releasref changeset: 39248:0be44c56c26d branch: headless parent: 39236:41ca1754b6b5 user: [email protected] date: Fri Feb 25 21:06:42 2011 +0100 summary: BBP ->CBP changeset: 39236:41ca1754b6b5 branch: headless user: [email protected] date: Fri Feb 25 16:26:30 2011 +0100 summary: More simple BAT* replacements changeset: 39235:a10485eb6234 branch: headless parent: 39233:6e8ee7a572ed user: [email protected] date: Fri Feb 25 16:05:16 2011 +0100 summary: Finalize easy rewrite of BAT* changeset: 39233:6e8ee7a572ed branch: headless user: [email protected] date: Fri Feb 25 15:11:49 2011 +0100 summary: BAT* renamings Stefan On Sun, Apr 03, 2011 at 10:50:02AM +0200, [email protected] wrote: > Changeset: 560e473805fe for MonetDB > URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=560e473805fe > Modified Files: > monetdb5/modules/kernel/kprelude.mx > Branch: headless > Log Message: > > Restore > > > diffs (74 lines): > > diff --git a/monetdb5/modules/kernel/kprelude.mx > b/monetdb5/modules/kernel/kprelude.mx > --- a/monetdb5/modules/kernel/kprelude.mx > +++ b/monetdb5/modules/kernel/kprelude.mx > @@ -20,8 +20,8 @@ > @- > The Mx macros below are used in many places throughout the code base. > > -@= getCOLdescriptor > - if( (@2= COLdescriptor(*@1)) == NULL ){ @4; > +@= getBATdescriptor > + if( (@2= BATdescriptor(*@1)) == NULL ){ @4; > throw(MAL, @3, RUNTIME_OBJECT_MISSING); > } > @= tstBAT > @@ -29,7 +29,7 @@ > throw(MAL, @1, MAL_MALLOC_FAIL);} > > @= resBAT > - bn = BATnew(ATOMtype(b->htype), TYPE_@1, COLcount(b)); > + bn = BATnew(ATOMtype(b->htype), TYPE_@1, BATcount(b)); > if ( bn== NULL) { > @3 > throw(MAL, @2, MAL_MALLOC_FAIL); > @@ -38,14 +38,14 @@ > bn->tsorted = b->tsorted; > bn->H->nonil = b->H->nonil; > bn->T->nonil = b->T->nonil; > - COLkey(bn, BAThkey(b)); > + BATkey(bn, BAThkey(b)); > > @= resultBAT > if (BAThvoid(b)) { > - bn = BATnew(TYPE_void, TYPE_@1, COLcount(b)); > - COLseqbase(bn, b->hseqbase); > + bn = BATnew(TYPE_void, TYPE_@1, BATcount(b)); > + BATseqbase(bn, b->hseqbase); > } else { > - bn = BATnew(b->htype, TYPE_@1, COLcount(b)); > + bn = BATnew(b->htype, TYPE_@1, BATcount(b)); > } > if ( bn== NULL) { > @3 > @@ -56,11 +56,11 @@ > if (!BAThvoid(b)) > bn->H->nonil = b->H->nonil; > bn->T->nonil = b->T->nonil; > - COLkey(bn, BAThkey(b)); > + BATkey(bn, BAThkey(b)); > > @= voidresultBAT > - bn = BATnew(TYPE_void, @1, COLcount(b)); > - COLseqbase(bn, b->hseqbase); > + bn = BATnew(TYPE_void, @1, BATcount(b)); > + BATseqbase(bn, b->hseqbase); > if (bn == NULL) { > @3 > throw(MAL, @2, MAL_MALLOC_FAIL); > @@ -71,11 +71,12 @@ > bn->T->nonil = b->T->nonil; > > @= Pseudo > - if (CBPindex("view_@1_@2") <= 0) > - COLname(b, "@2"); > + if (BBPindex("view_@1_@2") <= 0) > + BATname(b, "@2"); > BATroles(b,"@1","@2"); > - COLmode(b,TRANSIENT); > - *ret = CBPkeepref(b); > + BATmode(b,TRANSIENT); > + BBPkeepref(b->batCacheid); > BATfakeCommit(b); > + *ret = b->batCacheid; > > > _______________________________________________ > Checkin-list mailing list > [email protected] > http://mail.monetdb.org/mailman/listinfo/checkin-list > -- | Stefan.Manegold @ CWI.nl | DB Architectures (INS1) | | http://CWI.nl/~manegold/ | Science Park 123 (L321) | | Tel.: +31 (0)20 592-4212 | 1098 XG Amsterdam (NL) | _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
