MonetDB: Oct2020 - Merge with Jun2020 branch.

[Sjoerd Mullender]

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

Merge with Jun2020 branch.


diffs (33 lines):

diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -346,7 +346,8 @@ project_str(BAT *restrict l, struct cand
                        oid o = canditer_next(ci);
                        if (o < r1seq || o >= r2end) {
                                GDKerror("does not match always\n");
-                               return GDK_FAIL;
+                               BBPreclaim(bn);
+                               return NULL;
                        }
                        if (o < r1end) {
                                r = r1;
@@ -392,7 +393,8 @@ project_str(BAT *restrict l, struct cand
                        oid o = l->tseqbase + lo;
                        if (o < r1seq || o >= r2end) {
                                GDKerror("does not match always\n");
-                               return GDK_FAIL;
+                               BBPreclaim(bn);
+                               return NULL;
                        }
                        if (o < r1end) {
                                r = r1;
@@ -439,7 +441,8 @@ project_str(BAT *restrict l, struct cand
                        oid o = ot[lo];
                        if (o < r1seq || o >= r2end) {
                                GDKerror("does not match always\n");
-                               return GDK_FAIL;
+                               BBPreclaim(bn);
+                               return NULL;
                        }
                        if (o < r1end) {
                                r = r1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list