Changeset: 3a2062583451 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3a2062583451
Modified Files:
MonetDB/src/gdk/gdk_logger.mx
Branch: Oct2010
Log Message:
Count correctly how much space we need + add assertion that we counted right.
diffs (21 lines):
diff -r e887a6f73795 -r 3a2062583451 MonetDB/src/gdk/gdk_logger.mx
--- a/MonetDB/src/gdk/gdk_logger.mx Mon Oct 18 17:12:52 2010 +0200
+++ b/MonetDB/src/gdk/gdk_logger.mx Mon Oct 18 17:13:40 2010 +0200
@@ -1006,7 +1006,8 @@
bm_subcommit(BAT *list, BAT *catalog, BAT *extra, int debug)
{
BUN p, q;
- bat *n = (bat*)GDKmalloc(sizeof(bat) * (2 + BATcount(list) * 2 + (extra
? BATcount(extra) : 0)));
+ BUN nn = 2 + (list->batFirst > list->batDeleted ? list->batFirst -
list->batDeleted : 0) + BATcount(list) + (extra ? BATcount(extra) : 0);
+ bat *n = (bat*)GDKmalloc(sizeof(bat) * nn);
int i = 0;
BATiter iter = bat_iterator(list);
int res;
@@ -1046,6 +1047,7 @@
}
/* now commit catalog, so it's also up to date on disk */
n[i++] = ABS(catalog->batCacheid);
+ assert((BUN) i <= nn);
BATcommit(catalog);
res = TMsubcommit_list(n, i);
GDKfree(n);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
