MonetDB: Jul2021 - merged

[Niels Nes]

Changeset: d7cafd414569 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d7cafd414569
Branch: Jul2021
Log Message:

merged


diffs (24 lines):

diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2295,6 +2295,8 @@ BATmode(BAT *b, bool transient)
        /* can only make a bat PERSISTENT if its role is already
         * PERSISTENT */
        assert(transient || b->batRole == PERSISTENT);
+       /* cannot make a view PERSISTENT */
+       assert(transient || !isVIEW(b));
 
        if (b->batRole == TRANSIENT && !transient) {
                GDKerror("cannot change mode of BAT in TRANSIENT farm.\n");
@@ -2308,11 +2310,6 @@ BATmode(BAT *b, bool transient)
                        check_type(b->ttype);
                }
 
-               if (!transient && isVIEW(b)) {
-                       if (VIEWreset(b) != GDK_SUCCEED) {
-                               return GDK_FAIL;
-                       }
-               }
                /* persistent BATs get a logical reference */
                if (!transient) {
                        BBPretain(bid);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list