MonetDB: Feb2010 - prevent double release of the same BAT

[Stefan Manegold]

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

prevent double release of the same BAT


diffs (39 lines):

diff -r eac5288e73f4 -r 46a051e335de MonetDB5/src/modules/kernel/batcalc.mx
--- a/MonetDB5/src/modules/kernel/batcalc.mx    Sun Jun 20 13:30:52 2010 +0200
+++ b/MonetDB5/src/modules/kernel/batcalc.mx    Mon Jun 21 17:37:38 2010 +0200
@@ -725,10 +725,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);
@@ -782,10 +779,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)
@@ -832,10 +826,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