MonetDB: Jul2021 - My mistake, avoid unfixing twice

[Pedro Ferreira]

Changeset: 3476183447bf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3476183447bf
Modified Files:
        monetdb5/modules/mal/mat.c
Branch: Jul2021
Log Message:

My mistake, avoid unfixing twice


diffs (28 lines):

diff --git a/monetdb5/modules/mal/mat.c b/monetdb5/modules/mal/mat.c
--- a/monetdb5/modules/mal/mat.c
+++ b/monetdb5/modules/mal/mat.c
@@ -118,7 +118,7 @@ MATpackIncrement(Client cntxt, MalBlkPtr
 {
        bat *ret = getArgReference_bat(stk,p,0);
        int     pieces;
-       BAT *b, *bb, *bn, *nb;
+       BAT *b, *bb, *bn;
        size_t newsize;
 
        (void) cntxt;
@@ -198,13 +198,8 @@ MATpackIncrement(Client cntxt, MalBlkPtr
                }
                BBPunfix(bb->batCacheid);
                b->unused--;
-               if (b->unused == 0) {
-                       if (!(nb = BATsetaccess(b, BAT_READ))) {
-                               BBPunfix(b->batCacheid);
-                               throw(MAL, "mat.pack", GDK_EXCEPTION);
-                       }
-                       b = nb;
-               }
+               if (b->unused == 0 && !(b = BATsetaccess(b, BAT_READ)))
+                       throw(MAL, "mat.pack", GDK_EXCEPTION);
                if (b->tnil && b->tnonil) {
                        BBPunfix(b->batCacheid);
                        throw(MAL, "mat.pack", "INTERNAL ERROR" " b->tnil or  
b->tnonil fails ");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list