Changeset: 5467106eacae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5467106eacae
Modified Files:
gdk/gdk_bbp.c
gdk/gdk_logger.c
Branch: default
Log Message:
More cleanup due to VOID head columns.
diffs (47 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1519,14 +1519,12 @@ new_bbpentry(FILE *fp, bat i)
assert(BBP_desc(i));
assert(BBP_desc(i)->B.batCacheid == i);
assert(BBP_desc(i)->S.role == PERSISTENT);
+ assert(BBP_desc(i)->H.type == TYPE_void);
assert(0 <= BBP_desc(i)->H.heap.farmid && BBP_desc(i)->H.heap.farmid <
MAXFARMS);
assert(BBPfarms[BBP_desc(i)->H.heap.farmid].roles & (1 << PERSISTENT));
assert(0 <= BBP_desc(i)->T.heap.farmid && BBP_desc(i)->T.heap.farmid <
MAXFARMS);
assert(BBPfarms[BBP_desc(i)->T.heap.farmid].roles & (1 << PERSISTENT));
- if (BBP_desc(i)->H.vheap) {
- assert(0 <= BBP_desc(i)->H.vheap->farmid &&
BBP_desc(i)->H.vheap->farmid < MAXFARMS);
- assert(BBPfarms[BBP_desc(i)->H.vheap->farmid].roles & (1 <<
PERSISTENT));
- }
+ assert(BBP_desc(i)->H.vheap == NULL);
if (BBP_desc(i)->T.vheap) {
assert(0 <= BBP_desc(i)->T.vheap->farmid &&
BBP_desc(i)->T.vheap->farmid < MAXFARMS);
assert(BBPfarms[BBP_desc(i)->T.vheap->farmid].roles & (1 <<
PERSISTENT));
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -523,10 +523,7 @@ la_bat_destroy(logger *lg, logaction *la
assert(BBP_desc(bid)->S.role == PERSISTENT);
assert(0 <= BBP_desc(bid)->H.heap.farmid &&
BBP_desc(bid)->H.heap.farmid < MAXFARMS);
assert(BBPfarms[BBP_desc(bid)->H.heap.farmid].roles &
(1 << PERSISTENT));
- if (BBP_desc(bid)->H.vheap) {
- assert(0 <= BBP_desc(bid)->H.vheap->farmid &&
BBP_desc(bid)->H.vheap->farmid < MAXFARMS);
-
assert(BBPfarms[BBP_desc(bid)->H.vheap->farmid].roles & (1 << PERSISTENT));
- }
+ assert(BBP_desc(bid)->H.vheap == NULL);
assert(0 <= BBP_desc(bid)->T.heap.farmid &&
BBP_desc(bid)->T.heap.farmid < MAXFARMS);
assert(BBPfarms[BBP_desc(bid)->T.heap.farmid].roles &
(1 << PERSISTENT));
if (BBP_desc(bid)->T.vheap) {
@@ -2346,10 +2343,7 @@ log_bat_transient(logger *lg, const char
assert(BBP_desc(bid)->S.role == PERSISTENT);
assert(0 <= BBP_desc(bid)->H.heap.farmid &&
BBP_desc(bid)->H.heap.farmid < MAXFARMS);
assert(BBPfarms[BBP_desc(bid)->H.heap.farmid].roles & (1 <<
PERSISTENT));
- if (BBP_desc(bid)->H.vheap) {
- assert(0 <= BBP_desc(bid)->H.vheap->farmid &&
BBP_desc(bid)->H.vheap->farmid < MAXFARMS);
- assert(BBPfarms[BBP_desc(bid)->H.vheap->farmid].roles &
(1 << PERSISTENT));
- }
+ assert(BBP_desc(bid)->H.vheap == NULL);
assert(0 <= BBP_desc(bid)->T.heap.farmid &&
BBP_desc(bid)->T.heap.farmid < MAXFARMS);
assert(BBPfarms[BBP_desc(bid)->T.heap.farmid].roles & (1 <<
PERSISTENT));
if (BBP_desc(bid)->T.vheap) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
