MonetDB: default - Merge the branches

[mk]

Changeset: b4a7028a803d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b4a7028a803d
Modified Files:
        
Branch: default
Log Message:

Merge the branches


diffs (27 lines):

diff -r b31bd6cf23a7 -r b4a7028a803d MonetDB5/src/modules/kernel/group.mx
--- a/MonetDB5/src/modules/kernel/group.mx      Fri May 14 13:31:05 2010 +0200
+++ b/MonetDB5/src/modules/kernel/group.mx      Fri May 14 15:57:49 2010 +0200
@@ -522,9 +522,11 @@
        if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ);
        if (hash)
                GDKfree(hash);
+       BATaccessEnd(map, USE_HEAD|USE_TAIL, MMAP_WILLNEED);
        BATaccessEnd(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
        return map2histo(map);
 bunins_failed:
+       BATaccessEnd(map, USE_HEAD|USE_TAIL, MMAP_WILLNEED);
        BATaccessEnd(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
        BBPreclaim(bn);
        if (hash)
@@ -811,9 +813,11 @@
        if (hash)
                GDKfree(hash);
        if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ);
+       BATaccessEnd(map, USE_HEAD|USE_TAIL, MMAP_WILLNEED);
        BATaccessEnd(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
        return map2histo(map);
 bunins_failed:
+       BATaccessEnd(map, USE_HEAD|USE_TAIL, MMAP_WILLNEED);
        BATaccessEnd(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
        if (hash)
                GDKfree(hash);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list