MonetDB: Jun2010 - merge Feb2010: prevent double release of the ...

[Stefan Manegold]

Changeset: d1e944df83a4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d1e944df83a4
Modified Files:
        MonetDB5/src/modules/kernel/batcalc.mx
Branch: Jun2010
Log Message:

merge Feb2010: prevent double release of the same BAT


diffs (39 lines):

diff -r c65daeac480b -r d1e944df83a4 MonetDB5/src/modules/kernel/batcalc.mx
--- a/MonetDB5/src/modules/kernel/batcalc.mx    Sun Jun 20 15:25:16 2010 +0200
+++ b/MonetDB5/src/modules/kernel/batcalc.mx    Mon Jun 21 17:39:00 2010 +0200
@@ -727,10 +727,7 @@
        BATkey(BATmirror(bn),FALSE);
 
     if (b->htype != bn->htype) {
-        BAT *r = VIEWcreate(b,bn);
-
-        BBPreleaseref(bn->batCacheid);
-        bn = r;
+        bn = VIEWcreate(b,bn);
     }
 
        BBPkeepref(*ret = bn->batCacheid);
@@ -784,10 +781,7 @@
        BATkey(BATmirror(bn),FALSE);
 
     if (b->htype != bn->htype) {
-        BAT *r = VIEWcreate(b,bn);
-
-        BBPreleaseref(bn->batCacheid);
-        bn = r;
+        bn = VIEWcreate(b,bn);
     }
        BBPkeepref(*ret = bn->batCacheid);
        if (b != bn)
@@ -834,10 +828,7 @@
        BATkey(BATmirror(bn),FALSE);
 
     if (b->htype != bn->htype) {
-        BAT *r = VIEWcreate(b,bn);
-
-        BBPreleaseref(bn->batCacheid);
-        bn = r;
+        bn = VIEWcreate(b,bn);
     }
        BBPkeepref(*ret = bn->batCacheid);
        if (b != bn)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list