Changeset: 96c617603f81 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=96c617603f81
Modified Files:
testing/Mtest.py.in
Branch: oscar
Log Message:
Merge with Jun2020 branch.
diffs (86 lines):
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -258,39 +258,40 @@ BAT *virtualize(BAT *bn)
/* some macros to help print info about BATs when using ALGODEBUG */
#define ALGOBATFMT "%s#" BUNFMT "@" OIDFMT "[%s]%s%s%s%s%s%s%s%s%s"
-#define ALGOBATPAR(b) BATgetId(b), \
- BATcount(b), \
- b->hseqbase, \
- ATOMname(b->ttype), \
- !b->batTransient ? "P" : isVIEW(b) ? "V" : "T", \
- BATtdense(b) ? "D" : b->ttype == TYPE_void && b->tvheap
? "X" :"", \
- b->tsorted ? "S" : "", \
- b->trevsorted ? "R" : "", \
- b->tkey ? "K" : "", \
- b->tnonil ? "N" : "", \
- b->thash ? "H" : "", \
- b->torderidx ? "O" : "", \
- b->timprints ? "I" : b->theap.parentid &&
BBP_cache(b->theap.parentid)->timprints ? "(I)" : ""
+#define ALGOBATPAR(b) \
+ BATgetId(b), \
+ BATcount(b), \
+ b->hseqbase, \
+ ATOMname(b->ttype), \
+ !b->batTransient ? "P" : isVIEW(b) ? "V" : "T", \
+ BATtdense(b) ? "D" : b->ttype == TYPE_void && b->tvheap ? "X" :"", \
+ b->tsorted ? "S" : b->tnosorted ? "!s" : "", \
+ b->trevsorted ? "R" : b->tnorevsorted ? "!r" : "", \
+ b->tkey ? "K" : b->tnokey[1] ? "!k" : "", \
+ b->tnonil ? "N" : "", \
+ b->thash ? "H" : "", \
+ b->torderidx ? "O" : "", \
+ b->timprints ? "I" : 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"
#define ALGOOPTBATPAR(b) \
- b ? BATgetId(b) : "", \
- b ? "#" : "", \
- b ? BATcount(b) : 0, \
- b ? "@" : "", \
- b ? b->hseqbase : 0, \
- b ? "[" : "", \
- b ? ATOMname(b->ttype) : "", \
- b ? "]" : "", \
- b ? !b->batTransient ? "P" : isVIEW(b) ? "V" : "T" :
"", \
- b && BATtdense(b) ? "D" : b && b->ttype == TYPE_void &&
b->tvheap ? "X" :"", \
- b && b->tsorted ? "S" : "", \
- b && b->trevsorted ? "R" : "", \
- b && b->tkey ? "K" : "", \
- b && b->tnonil ? "N" : "", \
- b && b->thash ? "H" : "", \
- b && b->torderidx ? "O" : "", \
- b ? b->timprints ? "I" : b->theap.parentid &&
BBP_cache(b->theap.parentid)->timprints ? "(I)" : "" : ""
+ b ? BATgetId(b) : "", \
+ b ? "#" : "", \
+ b ? BATcount(b) : 0, \
+ b ? "@" : "", \
+ b ? b->hseqbase : 0, \
+ b ? "[" : "", \
+ b ? ATOMname(b->ttype) : "", \
+ b ? "]" : "", \
+ b ? !b->batTransient ? "P" : isVIEW(b) ? "V" : "T" : "", \
+ b ? BATtdense(b) ? "D" : b->ttype == TYPE_void && b->tvheap ? "X" : ""
: "", \
+ b ? b->tsorted ? "S" : b->tnosorted ? "!s" : "" : "", \
+ b ? b->trevsorted ? "R" : b->tnorevsorted ? "!r" : "" : "", \
+ b ? b->tkey ? "K" : b->tnokey[1] ? "!k" : "" : "", \
+ b && b->tnonil ? "N" : "", \
+ b && b->thash ? "H" : "", \
+ b && b->torderidx ? "O" : "", \
+ b ? b->timprints ? "I" : b->theap.parentid &&
BBP_cache(b->theap.parentid)->timprints ? "(I)" : "" : ""
#define BBP_BATMASK (128 * SIZEOF_SIZE_T - 1)
#define BBP_THREADMASK 63
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3666,7 +3666,7 @@ os.environ['VERSION'] = VERSION
if 'HTMLTITLE' in os.environ:
HTMLTITLE = os.environ['HTMLTITLE']
else:
- HTMLTITLE = ""+THISFILE+" results on "+DISTVER #"+ ("`date`")"
+ HTMLTITLE = "{} results on {} ({})".format(THISFILE, HOST, DISTVER)
#"+ ("`date`")"
URLPREFIX = 'http://dev.monetdb.org/hg/MonetDB/file/'
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
