Changeset: e09cdc4142b3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e09cdc4142b3
Modified Files:
Branch: Jun2010
Log Message:
merge from Feb2010: fixed ref-counting for BAT-of-BATs result created by
TABLETcollect_bats
diffs (25 lines):
diff -r 4ef58a0f58e0 -r e09cdc4142b3 MonetDB5/src/modules/mal/tablet.mx
--- a/MonetDB5/src/modules/mal/tablet.mx Mon May 31 22:45:39 2010 +0200
+++ b/MonetDB5/src/modules/mal/tablet.mx Tue Jun 01 08:20:52 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
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
