MonetDB: default - Merge with Jan2022 branch.

[Sjoerd Mullender]

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

Merge with Jan2022 branch.


diffs (41 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -752,3 +752,4 @@ 9fbec5dab8167d2189582fbe75e5f9c8bef82380
 9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_release
 97e76b882f9fb28327393d21708fb22f2f6c22f1 Jan2022_7
 f458e1c71c73d6bd9636369c1406eadb74f016bf Jan2022_9
+f458e1c71c73d6bd9636369c1406eadb74f016bf Jan2022_SP1_release
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -3750,6 +3750,7 @@ BBPbackup(BAT *b, bool subcommit)
        long_str nme;
        const char *s = BBP_physical(b->batCacheid);
        size_t slen;
+       bool locked = false;
 
        if (BBPprepare(subcommit) != GDK_SUCCEED) {
                return GDK_FAIL;
@@ -3770,6 +3771,8 @@ BBPbackup(BAT *b, bool subcommit)
        memcpy(nme, s, slen + 1);
        srcdir[s - srcdir] = 0;
 
+       MT_lock_set(&b->theaplock);
+       locked = true;
        if (b->ttype != TYPE_void &&
            do_backup(srcdir, nme, gettailname(b), b->theap,
                      b->batDirtydesc || b->theap->dirty,
@@ -3780,9 +3783,12 @@ BBPbackup(BAT *b, bool subcommit)
                      b->batDirtydesc || b->tvheap->dirty,
                      subcommit) != GDK_SUCCEED)
                goto fail;
+       MT_lock_unset(&b->theaplock);
        GDKfree(srcdir);
        return GDK_SUCCEED;
   fail:
+       if (locked)
+               MT_lock_unset(&b->theaplock);
        if(srcdir)
                GDKfree(srcdir);
        return GDK_FAIL;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org