Update of /cvsroot/monetdb/MonetDB5/src/modules/kernel
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30750
Modified Files:
bat5.mx
Log Message:
Revert changes to previous state.
Index: bat5.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/bat5.mx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- bat5.mx 12 Sep 2007 06:13:46 -0000 1.23
+++ bat5.mx 13 Sep 2007 19:17:15 -0000 1.24
@@ -1850,7 +1850,7 @@
str
BKCinsert_bat(int *r, int *bid, int *sid)
{
- BAT *b, *bn, *s;
+ BAT *b, *s;
(void) r;
if ((b = BATdescriptor(*bid)) == NULL) {
@@ -1860,21 +1860,20 @@
BBPreleaseref(b->batCacheid);
throw(MAL, "bat.insert", "Cannot access descriptor");
}
- bn= BATins(b, s, FALSE);
- BBPreleaseref(s->batCacheid);
- if(bn == NULL) {
+ if (BATins(b, s,FALSE) == NULL) {
BBPreleaseref(b->batCacheid);
- throw(MAL, "bat.insert", "GDKerror, different BAT returned");
+ BBPreleaseref(s->batCacheid);
+ throw(MAL, "bat.insert", "Failed");
}
- assert(b->batCacheid==bn->batCacheid);
- BBPkeepref(*r=bn->batCacheid);
+ BBPreleaseref(b->batCacheid);
+ BBPreleaseref(s->batCacheid);
return MAL_SUCCEED;
}
str
BKCinsert_bat_force(int *r, int *bid, int *sid, bit *force)
{
- BAT *bn,*b, *s;
+ BAT *b, *s;
(void) r;
if ((b = BATdescriptor(*bid)) == NULL) {
@@ -1884,14 +1883,13 @@
BBPreleaseref(b->batCacheid);
throw(MAL, "bat.insert", "Cannot access descriptor");
}
- bn= BATins(b, s, *force);
- BBPreleaseref(s->batCacheid);
- if(bn == NULL) {
+ if (BATins(b, s, *force) == NULL) {
BBPreleaseref(b->batCacheid);
- throw(MAL, "bat.insert", "GDKerror, different BAT returned");
+ BBPreleaseref(s->batCacheid);
+ throw(MAL, "bat.insert", "Failed");
}
- assert(b->batCacheid==bn->batCacheid);
- BBPkeepref(*r=bn->batCacheid);
+ BBPreleaseref(b->batCacheid);
+ BBPreleaseref(s->batCacheid);
return MAL_SUCCEED;
}
@@ -1930,12 +1928,12 @@
}
bn=BATreplace(b, s, 0);
BBPreleaseref(s->batCacheid);
- if(bn==NULL){
+ if(bn==NULL )
BBPreleaseref(b->batCacheid);
+ else
+ BBPreleaseref(bn->batCacheid);
+ if(bn && bn->batCacheid != b->batCacheid)
throw(MAL, "bat.replace", "GDKerror, different BAT returned");
- }
- assert(b->batCacheid==bn->batCacheid);
- BBPkeepref(*r=bn->batCacheid);
return MAL_SUCCEED;
}
@@ -1975,12 +1973,12 @@
}
bn= BATreplace(b, s, *force);
BBPreleaseref(s->batCacheid);
- if(bn==NULL ){
+ if(bn==NULL )
BBPreleaseref(b->batCacheid);
+ else
+ BBPreleaseref(bn->batCacheid);
+ if(bn && bn->batCacheid != b->batCacheid)
throw(MAL, "bat.replace_bat", "GDKerror, different BAT
returned");
- }
- assert(b->batCacheid==bn->batCacheid);
- BBPkeepref(*r=bn->batCacheid);
return MAL_SUCCEED;
}
@@ -2060,14 +2058,14 @@
throw(MAL, "bat.delete", "Cannot access descriptor");
}
- bn=BATdel(b, s, FALSE);
- BBPreleaseref(s->batCacheid);
- if( bn ==0){
+ bn=BATdel(b, s,FALSE);
+ if(bn==NULL )
BBPreleaseref(b->batCacheid);
+ else
+ BBPreleaseref(bn->batCacheid);
+ BBPreleaseref(s->batCacheid);
+ if(bn && bn->batCacheid != b->batCacheid)
throw(MAL, "bat.delete_bat_buns", "GDKerror, different BAT
returned");
- }
- assert(b->batCacheid==bn->batCacheid);
- BBPkeepref(*r= bn->batCacheid);
return MAL_SUCCEED;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
