MonetDB: Oct2020 - Merged with Jun2020

[Pedro Ferreira]

Changeset: fe9fe36d3530 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe9fe36d3530
Modified Files:
        gdk/gdk_project.c
Branch: Oct2020
Log Message:

Merged with Jun2020


diffs (20 lines):

diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -305,7 +305,7 @@ project_str(BAT *restrict l, struct cand
        var_t v;
 
        if ((bn = COLnew(l->hseqbase, TYPE_str, ci ? ci->ncand : BATcount(l),
-                        TRANSIENT)) != NULL)
+                        TRANSIENT)) == NULL)
                return NULL;
 
        v = (var_t) r1->tvheap->free;
@@ -329,6 +329,7 @@ project_str(BAT *restrict l, struct cand
                        memset(bn->tvheap->base + r1->tvheap->free, 0, h1off - 
r1->tvheap->free);
 #endif
                memcpy(bn->tvheap->base + h1off, r2->tvheap->base, 
r2->tvheap->free);
+               bn->tvheap->free = h1off + r2->tvheap->free;
        }
 
        if (v >= ((var_t) 1 << (8 * bn->twidth)) &&
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list