Changeset: 8071fb876f4f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8071fb876f4f
Modified Files:
gdk/gdk_logger.c
Branch: Sep2022
Log Message:
Merge with Jan2022 branch.
diffs (35 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1614,11 +1614,12 @@ cleanup_and_swap(logger *lg, int *r, con
return rcnt;
}
+/* this function is called with log_lock() held; it releases the lock
+ * before returning */
static gdk_return
bm_subcommit(logger *lg)
{
BUN p, q;
- log_lock(lg);
BAT *catalog_bid = lg->catalog_bid;
BAT *catalog_id = lg->catalog_id;
BAT *dcatalog = lg->dcatalog;
@@ -1928,6 +1929,8 @@ log_load(int debug, const char *fn, cons
BBPretain(lg->catalog_id->batCacheid);
BBPretain(lg->dcatalog->batCacheid);
+ log_lock(lg);
+ /* bm_subcommit releases the lock */
if (bm_subcommit(lg) != GDK_SUCCEED) {
/* cannot commit catalog, so remove log */
MT_remove(filename);
@@ -3063,7 +3066,7 @@ bm_commit(logger *lg)
fprintf(stderr, "#bm_commit: create %d (%d)\n",
bid, BBP_lrefs(bid));
}
- log_unlock(lg);
+ /* bm_subcommit releases the lock */
return bm_subcommit(lg);
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
