MonetDB: default - merge from Jun2010:

[Stefan Manegold]

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

merge from Jun2010:
"
 changeset:   35946:a5ef8be5bf23
 branch:      Jun2010
 tag:         tip
 parent:      35943:cf520f1ac2ab
 parent:      35945:4e039e33fe3c
 user:        Stefan Manegold <stefan.maneg...@cwi.nl>
 date:        Fri May 14 13:39:41 2010 +0200
 files:       MonetDB5/src/modules/kernel/group.mx
 description:
 merge from Feb2010:
 "
  changeset:   35945:4e039e33fe3c
  branch:      Feb2010
  tag:         tip
  parent:      35938:890a902526af
  user:        Stefan Manegold <stefan.maneg...@cwi.nl>
  date:        Fri May 14 13:38:23 2010 +0200
  files:       MonetDB5/src/modules/kernel/group.mx
  description:
  added missing BATaccessEnd()
 "
"


diffs (27 lines):

diff -r 967528656691 -r 3f211aa4b36c MonetDB5/src/modules/kernel/group.mx
--- a/MonetDB5/src/modules/kernel/group.mx      Fri May 14 12:42:40 2010 +0200
+++ b/MonetDB5/src/modules/kernel/group.mx      Fri May 14 13:40:35 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