Changeset: 456224efaa6e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/456224efaa6e
Modified Files:
gdk/gdk_private.h
Branch: Jan2022
Log Message:
Protect against half destroyed bats in debug print.
diffs (21 lines):
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -392,7 +392,7 @@ ilog2(BUN x)
b->hseqbase, \
ATOMname(b->ttype), \
b->ttype==TYPE_str?b->twidth==1?"1":b->twidth==2?"2":b->twidth==4?"4":"8":"", \
- !b->batTransient ? "P" : b->theap->parentid != b->batCacheid ? "V" :
b->tvheap && b->tvheap->parentid != b->batCacheid ? "v" : "T", \
+ !b->batTransient ? "P" : b->theap && b->theap->parentid !=
b->batCacheid ? "V" : b->tvheap && b->tvheap->parentid != b->batCacheid ? "v" :
"T", \
BATtdense(b) ? "D" : b->ttype == TYPE_void && b->tvheap ? "X" :
ATOMstorage(b->ttype) == TYPE_str && GDK_ELIMDOUBLES(b->tvheap) ? "E" : "", \
b->tsorted ? "S" : b->tnosorted ? "!s" : "", \
b->trevsorted ? "R" : b->tnorevsorted ? "!r" : "", \
@@ -400,7 +400,7 @@ ilog2(BUN x)
b->tnonil ? "N" : "", \
b->thash ? "H" : "", \
b->torderidx ? "O" : "", \
- b->timprints ? "I" : b->theap->parentid &&
BBP_cache(b->theap->parentid)->timprints ? "(I)" : ""
+ b->timprints ? "I" : b->theap && b->theap->parentid &&
BBP_cache(b->theap->parentid)->timprints ? "(I)" : ""
/* use ALGOOPTBAT* when BAT is optional (can be NULL) */
#define ALGOOPTBATFMT "%s%s" BUNFMT "%s" OIDFMT "%s%s%s%s%s%s%s%s%s%s%s%s%s"
#define ALGOOPTBATPAR(b) \
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
