Changeset: 75a744e66ebb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/75a744e66ebb
Modified Files:
gdk/gdk_align.c
gdk/gdk_bbp.c
monetdb5/modules/mal/iterator.c
monetdb5/modules/mal/pcre.c
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (61 lines):
diff --git a/gdk/ChangeLog.Jan2022 b/gdk/ChangeLog.Jan2022
--- a/gdk/ChangeLog.Jan2022
+++ b/gdk/ChangeLog.Jan2022
@@ -5,6 +5,9 @@
- Fixed a race condition which could cause a too large size being written
for a .theap file to the BBP.dir file after the correct size file had
been saved to disk.
+- We now ignore the size and capacity columns in the BBP.dir file.
+ These values are essential during run time, but not useful in the
+ on-disk image of the database.
* Wed Mar 9 2022 Sjoerd Mullender <sjo...@acm.org>
- Fixed a bug in the append code for msk (bit mask) bats.
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -363,6 +363,7 @@ VIEWbounds(BAT *b, BAT *view, BUN l, BUN
view->tmaxpos -= l;
else
view->tmaxpos = BUN_NONE;
+ view->tkey |= cnt <= 1;
}
/*
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2854,7 +2854,7 @@ BBPcold(bat i)
}
/* This function can fail if the input parameter (i) is incorrect
- * (unlikely), of if the bat is a view, this is a physical (not
+ * (unlikely), or, if the bat is a view, this is a physical (not
* logical) incref (i.e. called through BBPfix(), and it is the first
* reference (refs was 0 and should become 1). It can fail in this
* case if the parent bat cannot be loaded.
diff --git a/monetdb5/modules/mal/iterator.c b/monetdb5/modules/mal/iterator.c
--- a/monetdb5/modules/mal/iterator.c
+++ b/monetdb5/modules/mal/iterator.c
@@ -101,7 +101,8 @@ ITRnextChunk(lng *res, bat *vid, bat *bi
}
/* printf("set bat chunk bound to " BUNFMT " - " BUNFMT " \n",
i, i+(BUN) *granule-1); */
- VIEWbounds(b, view, i, i + (BUN) * granule);
+ VIEWbounds(b, view, i, i + (BUN) *granule);
+ view->tkey = b->tkey | (*granule <= 1);
BAThseqbase(view, is_oid_nil(b->hseqbase) ? oid_nil : b->hseqbase + i);
BBPkeepref(*vid = view->batCacheid);
BBPunfix(b->batCacheid);
diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -1940,7 +1940,7 @@ PCRElikeselect(bat *ret, const bat *bid,
bn->tkey = true;
bn->tnil = false;
bn->tnonil = true;
- bn->tseqbase = rcnt == 0 ? 0 : rcnt == 1 || rcnt ==
b->batCount ? b->hseqbase : oid_nil;
+ bn->tseqbase = rcnt == 0 ? 0 : rcnt == 1 ? *(const
oid*)Tloc(bn, 0) : rcnt == b->batCount ? b->hseqbase : oid_nil;
}
}
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
