Changeset: ffac5d51ac0f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ffac5d51ac0f
Modified Files:
Branch: default
Log Message:
merge from Jun2010: fixed ref-counting for BAT-of-BATs result created by
TABLETcollect_bats
diffs (25 lines):
diff -r 7f8845f6d39f -r ffac5d51ac0f MonetDB5/src/modules/mal/tablet.mx
--- a/MonetDB5/src/modules/mal/tablet.mx Mon May 31 22:46:25 2010 +0200
+++ b/MonetDB5/src/modules/mal/tablet.mx Tue Jun 01 08:21:49 2010 +0200
@@ -2180,8 +2180,9 @@
tablet_load(&bn, names, seps, types, *filename, nr);
if (bn == NULL)
throw(MAL, "tablet.load", MAL_MALLOC_FAIL);
+ *ret = bn->batCacheid;
BBPincref(*ret, TRUE);
- *ret = bn->batCacheid;
+ BBPunfix(*ret);
BBPunfix(names->batCacheid);
BBPunfix(seps->batCacheid);
BBPunfix(types->batCacheid);
@@ -2258,8 +2259,9 @@
BBPunfix(types->batCacheid);
throw(MAL, "tablet.load", OPERATION_FAILED);
}
+ *ret = bn->batCacheid;
BBPincref(*ret, TRUE);
- *ret = bn->batCacheid;
+ BBPunfix(*ret);
BBPunfix(names->batCacheid);
BBPunfix(seps->batCacheid);
BBPunfix(types->batCacheid);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
