Changeset: 48e12cc53918 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/48e12cc53918
Modified Files:
gdk/gdk_logger.c
Branch: default
Log Message:
Merge with Sep2022 branch.
diffs (70 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -571,36 +571,38 @@ log_read_updates(logger *lg, trans *tr,
GDKfree(hv);
}
- if (res == LOG_OK && tr_grow(tr) == GDK_SUCCEED) {
- tr->changes[tr->nr].type = l->flag;
- if (l->flag==LOG_UPDATE_BULK && offset == -1) {
- assert(cands); // bat r is part of a group of
bats logged together.
- struct canditer ci;
- canditer_init(&ci, NULL, *cands);
- const oid first = canditer_peek(&ci);
- const oid last = canditer_last(&ci);
- offset = (lng) first;
- pnr = (lng) (last - first) + 1;
- if (!lg->flushing ) {
- assert(uid == NULL);
- uid = *cands;
- BBPfix((*cands)->batCacheid);
- tr->changes[tr->nr].type = LOG_UPDATE;
+ if (res == LOG_OK) {
+ if (tr_grow(tr) == GDK_SUCCEED) {
+ tr->changes[tr->nr].type = l->flag;
+ if (l->flag==LOG_UPDATE_BULK && offset == -1) {
+ assert(cands); // bat r is part of a
group of bats logged together.
+ struct canditer ci;
+ canditer_init(&ci, NULL, *cands);
+ const oid first = canditer_peek(&ci);
+ const oid last = canditer_last(&ci);
+ offset = (lng) first;
+ pnr = (lng) (last - first) + 1;
+ if (!lg->flushing ) {
+ assert(uid == NULL);
+ uid = *cands;
+ BBPfix((*cands)->batCacheid);
+ tr->changes[tr->nr].type =
LOG_UPDATE;
+ }
}
- }
- if (l->flag==LOG_UPDATE_CONST) {
- assert(!cands); // TODO: This might change in
the future.
- tr->changes[tr->nr].type = LOG_UPDATE_BULK;
+ if (l->flag==LOG_UPDATE_CONST) {
+ assert(!cands); // TODO: This might
change in the future.
+ tr->changes[tr->nr].type =
LOG_UPDATE_BULK;
+ }
+ tr->changes[tr->nr].nr = pnr;
+ tr->changes[tr->nr].tt = tpe;
+ tr->changes[tr->nr].cid = id;
+ tr->changes[tr->nr].offset = offset;
+ tr->changes[tr->nr].b = r;
+ tr->changes[tr->nr].uid = uid;
+ tr->nr++;
+ } else {
+ res = LOG_ERR;
}
- tr->changes[tr->nr].nr = pnr;
- tr->changes[tr->nr].tt = tpe;
- tr->changes[tr->nr].cid = id;
- tr->changes[tr->nr].offset = offset;
- tr->changes[tr->nr].b = r;
- tr->changes[tr->nr].uid = uid;
- tr->nr++;
- } else {
- res = LOG_ERR;
}
if (res == LOG_ERR) {
if (r)
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
