Changeset: 5b809437fb50 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b809437fb50
Modified Files:
gdk/gdk_imprints.c
gdk/gdk_orderidx.c
gdk/gdk_private.h
gdk/gdk_select.c
Branch: Mar2018
Log Message:
ALGODEBUG refinements.
diffs (146 lines):
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -247,7 +247,7 @@ BATcheckimprints(BAT *b)
close(fd);
imprints->imprints.parentid =
b->batCacheid;
b->timprints = imprints;
- ALGODEBUG fprintf(stderr,
"#BATcheckimprints: reusing persisted imprints %d\n", b->batCacheid);
+ ALGODEBUG fprintf(stderr,
"#BATcheckimprints(" ALGOBATFMT "): reusing persisted imprints\n",
ALGOBATPAR(b));
MT_lock_unset(&GDKimprintsLock(b->batCacheid));
return true;
@@ -262,7 +262,7 @@ BATcheckimprints(BAT *b)
}
ret = b->timprints != NULL;
MT_lock_unset(&GDKimprintsLock(b->batCacheid));
- ALGODEBUG if (ret) fprintf(stderr, "#BATcheckimprints: already has
imprints %d\n", b->batCacheid);
+ ALGODEBUG if (ret) fprintf(stderr, "#BATcheckimprints(" ALGOBATFMT "):
already has imprints\n", ALGOBATPAR(b));
return ret;
}
@@ -299,9 +299,9 @@ BATimpsync(void *arg)
#endif
}
close(fd);
- ALGODEBUG fprintf(stderr, "#BATimpsync(%s): "
+ ALGODEBUG fprintf(stderr, "#BATimpsync(" ALGOBATFMT "):
"
"imprints persisted "
- "(" LLFMT " usec)\n", BATgetId(b),
+ "(" LLFMT " usec)\n", ALGOBATPAR(b),
GDKusec() - t0);
}
}
@@ -343,6 +343,7 @@ BATimprints(BAT *b)
if (VIEWtparent(b)) {
/* views always keep null pointer and need to obtain
* the latest imprint from the parent at query time */
+ s2 = b; /* remember for ALGODEBUG print */
b = BBPdescriptor(VIEWtparent(b));
assert(b);
if (BATcheckimprints(b))
@@ -356,8 +357,18 @@ BATimprints(BAT *b)
const char *nme = BBP_physical(b->batCacheid);
size_t pages;
- ALGODEBUG fprintf(stderr, "#BATimprints(b=" ALGOBATFMT "): "
- "creating imprints\n", ALGOBATPAR(b));
+ ALGODEBUG {
+ if (s2)
+ fprintf(stderr, "#BATimprints(b=" ALGOBATFMT
+ "): creating imprints on parent "
+ ALGOBATFMT "\n",
+ ALGOBATPAR(s2), ALGOBATPAR(b));
+ else
+ fprintf(stderr, "#BATimprints(b=" ALGOBATFMT
+ "): creating imprints\n",
+ ALGOBATPAR(b));
+ }
+ s2 = NULL;
imprints = GDKzalloc(sizeof(Imprints));
if (imprints == NULL) {
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -148,7 +148,7 @@ persistOIDX(BAT *b)
if (MT_create_thread(&tid, BATidxsync, b, MT_THR_DETACHED) < 0)
BBPunfix(b->batCacheid);
} else
- ALGODEBUG fprintf(stderr, "#BATorderidx(%s): NOT persisting
index\n", BATgetId(b));
+ ALGODEBUG fprintf(stderr, "#persistOIDX(" ALGOBATFMT "): NOT
persisting order index\n", ALGOBATPAR(b));
#else
(void) b;
#endif
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -241,7 +241,7 @@ void BBPdump(void); /* never called: fo
b->tnonil ? "N" : "", \
b->thash ? "H" : "", \
b->torderidx ? "O" : "", \
- b->timprints ? "I" : ""
+ 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%s%s%s%s%s%s%s%s%s%s%s"
#define ALGOOPTBATPAR(b) \
@@ -259,7 +259,7 @@ void BBPdump(void); /* never called: fo
b && b->tnonil ? "N" : "", \
b && b->thash ? "H" : "", \
b && b->torderidx ? "O" : "", \
- b && b->timprints ? "I" : ""
+ b ? b->timprints ? "I" : b->theap.parentid &&
BBP_cache(b->theap.parentid)->timprints ? "(I)" : "" : ""
#define BBP_BATMASK 511
#define BBP_THREADMASK 63
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -1316,7 +1316,7 @@ BATselect(BAT *b, BAT *s, const void *tl
anti = false;
ALGODEBUG fprintf(stderr, "#BATselect(b=" ALGOBATFMT
",s=" ALGOOPTBATFMT ",anti=%d): "
- "anti: switch ranges\n",
+ "anti: switch ranges...\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
anti);
} else if (!lval && !hval) {
@@ -1339,7 +1339,7 @@ BATselect(BAT *b, BAT *s, const void *tl
hval = false;
ALGODEBUG fprintf(stderr, "#BATselect(b=" ALGOBATFMT
",s=" ALGOOPTBATFMT ",anti=0): "
- "anti-nil\n",
+ "anti-nil...\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s));
} else if (equi) {
equi = false;
@@ -1353,7 +1353,7 @@ BATselect(BAT *b, BAT *s, const void *tl
ALGODEBUG fprintf(stderr, "#BATselect(b="
ALGOBATFMT ",s="
ALGOOPTBATFMT ",anti=0): "
- "anti-nothing\n",
+ "anti-nothing...\n",
ALGOBATPAR(b),
ALGOOPTBATPAR(s));
}
@@ -1366,7 +1366,7 @@ BATselect(BAT *b, BAT *s, const void *tl
hval = false;
ALGODEBUG fprintf(stderr, "#BATselect(b=" ALGOBATFMT
",s=" ALGOOPTBATFMT ",anti=0): "
- "anti-nil\n",
+ "anti-nil...\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s));
}
}
@@ -1819,9 +1819,9 @@ BATselect(BAT *b, BAT *s, const void *tl
if (hash) {
ALGODEBUG fprintf(stderr, "#BATselect(b=" ALGOBATFMT
- ",s=" ALGOOPTBATFMT ",anti=%d): "
+ ",s=" ALGOOPTBATFMT "): "
"hash select\n",
- ALGOBATPAR(b), ALGOOPTBATPAR(s), anti);
+ ALGOBATPAR(b), ALGOOPTBATPAR(s));
bn = hashselect(b, s, bn, tl, maximum, phash);
} else {
/* use imprints if
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
