MonetDB: Sep2022 - Merge with Jan2022 branch.

[Sjoerd Mullender]

Changeset: 0d1ed8ad3f50 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0d1ed8ad3f50
Modified Files:
        gdk/gdk_heap.c
Branch: Sep2022
Log Message:

Merge with Jan2022 branch.


diffs (30 lines):

diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -139,6 +139,7 @@ HEAPgrow(Heap **hp, size_t size, bool ma
 gdk_return
 HEAPalloc(Heap *h, size_t nitems, size_t itemsize, size_t itemsizemmap)
 {
+       (void) itemsizemmap;
        h->base = NULL;
        h->size = 1;
        if (itemsize) {
@@ -168,8 +169,6 @@ HEAPalloc(Heap *h, size_t nitems, size_t
                if (nme == NULL)
                        return GDK_FAIL;
                h->storage = STORE_MMAP;
-               if (itemsizemmap > itemsize)
-                       h->size = MAX(1, nitems) * itemsizemmap;
                h->base = HEAPcreatefile(NOFARM, &h->size, nme);
                GDKfree(nme);
        }
@@ -288,7 +287,8 @@ HEAPextend(Heap *h, size_t size, bool ma
                                h->base = HEAPcreatefile(h->farmid, &h->size, 
h->filename);
                                if (h->base) {
                                        h->newstorage = h->storage = STORE_MMAP;
-                                       memcpy(h->base, bak.base, bak.free);
+                                       if (bak.free > 0)
+                                               memcpy(h->base, bak.base, 
bak.free);
                                        HEAPfree(&bak, false);
                                        return GDK_SUCCEED;
                                }
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org