Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20666/src/modules/mal
Modified Files:
bpm.mx
Log Message:
use new BAT_select interface
Index: bpm.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/bpm.mx,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- bpm.mx 10 Feb 2008 23:48:47 -0000 1.125
+++ bpm.mx 6 Mar 2008 08:38:47 -0000 1.126
@@ -814,8 +814,7 @@
return MAL_SUCCEED;
assureSpace();
b= BATdescriptor(p->bid);
- bn= BAT_select_(b, VALptr(&p->tlow),VALptr(&p->thgh),
- TRUE, FALSE, TRUE, FALSE);
+ bn= BATselect_(b, VALptr(&p->tlow),VALptr(&p->thgh), TRUE, FALSE);
BBPunfix(b->batCacheid);
if( bn== NULL)
throw(MAL,"bpm.materialize","Could not create BAT");
@@ -1133,11 +1132,11 @@
#endif
/* we can enter a new partition */
@:getBATdescriptor(&bpmcat[i]->bid,b,"bpm.splitPartition");
- if( *bid > 0)
- bn= BAT_select_(b, val, nilptr, TRUE, FALSE, TRUE,
FALSE);
- else{
- bn= BAT_select_(BATmirror(b), val, nilptr, TRUE, FALSE,
TRUE, FALSE);
- bn= BATcopy(BATmirror(bn), bn->ttype,bn->htype,1);
+ if( *bid > 0) {
+ bn= BATselect_(b, val, nilptr, TRUE, FALSE);
+ } else {
+ bn= BATselect_(BATmirror(b), val, nilptr, TRUE, FALSE);
+ bn= BATcopy(BATmirror(bn), bn->ttype, bn->htype,1);
}
if( bn == 0){
@@ -1989,7 +1988,7 @@
Beware, now B contains elements <low and >=hgh.
So we may have to split it further
@c
- bs2 = BAT_select_(b, hgh, nilptr, FALSE, FALSE, TRUE, FALSE);
+ bs2 = BATselect_(b, hgh, nilptr, FALSE, FALSE);
if( BATcount(bs2) > 0){
BATdel(b,bs2,FALSE);
if( BATcount(bs1)==0){
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
