MonetDB: Jul2021 - small cleanup

[Niels Nes]

Changeset: b75436bf1300 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b75436bf1300
Modified Files:
        gdk/gdk_logger.c
Branch: Jul2021
Log Message:

small cleanup


diffs (30 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1479,7 +1479,6 @@ bm_subcommit(logger *lg)
                assert(col);
                sizes[i] = cnts?(BUN)cnts[p]:0;
                n[i++] = col;
-
        }
        /* now commit catalog, so it's also up to date on disk */
        sizes[i] = lg->cnt;
@@ -1594,6 +1593,9 @@ bm_subcommit(logger *lg)
 
                lg->catalog_cnt = ncnts;
                lg->catalog_lid = nlids;
+               lg->cnt = BATcount(lg->catalog_bid);
+               lg->deleted -= cleanup;
+               assert(lg->deleted == BATcount(lg->dcatalog));
        }
        if (lg->seqs_id) {
                sizes[i] = BATcount(lg->seqs_id);
@@ -2836,7 +2838,7 @@ logger_del_bat(logger *lg, log_bid bid)
        if (BUNreplace(lg->catalog_lid, p, &lid, false) != GDK_SUCCEED)
                return GDK_FAIL;
        if (BUNappend(lg->dcatalog, &pos, false) == GDK_SUCCEED) {
-               lg->cnt--;
+               lg->deleted++;
                return GDK_SUCCEED;
        }
        return GDK_FAIL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list