Changeset: fe3bfe7aa7b1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe3bfe7aa7b1
Modified Files:
gdk/gdk_bbp.c
gdk/gdk_imprints.c
Branch: Jul2015
Log Message:
Layout.
diffs (46 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -3870,19 +3870,18 @@ BBPdiskscan(const char *parent)
} else if (strncmp(p + 1, "theap", 5) == 0) {
BAT *b = getdesc(bid);
delete = (b == NULL || !b->T->vheap ||
b->batCopiedtodisk == 0);
- } else if (strncmp(p + 1, "hhash", 5) == 0) {
+ } else if (strncmp(p + 1, "hhash", 5) == 0 ||
+ strncmp(p + 1, "thash", 5) == 0) {
BAT *b = getdesc(bid);
delete = b == NULL;
- } else if (strncmp(p + 1, "thash", 5) == 0) {
+ } else if (strncmp(p + 1, "himprints", 9) == 0 ||
+ strncmp(p + 1, "timprints", 9) == 0) {
BAT *b = getdesc(bid);
delete = b == NULL;
- } else if (strncmp(p + 1, "himprints", 9) == 0) {
- BAT *b = getdesc(bid);
- delete = b == NULL;
- } else if (strncmp(p + 1, "timprints", 9) == 0) {
- BAT *b = getdesc(bid);
- delete = b == NULL;
- } else if (strncmp(p + 1, "priv", 4) != 0 && strncmp(p + 1,
"new", 3) != 0 && strncmp(p + 1, "head", 4) != 0 && strncmp(p + 1, "tail", 4)
!= 0) {
+ } else if (strncmp(p + 1, "priv", 4) != 0 &&
+ strncmp(p + 1, "new", 3) != 0 &&
+ strncmp(p + 1, "head", 4) != 0 &&
+ strncmp(p + 1, "tail", 4) != 0) {
ok = FALSE;
}
if (!ok) {
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -968,8 +968,9 @@ IMPSremove(BAT *b)
if ((imprints = b->T->imprints) != NULL) {
b->T->imprints = NULL;
- if (* (size_t *) imprints->imprints->base & (1 << 16))
- ALGODEBUG fprintf(stderr, "#IMPSremove: removing
persisted imprints\n");
+ if ((GDKdebug & ALGOMASK) &&
+ * (size_t *) imprints->imprints->base & (1 << 16))
+ fprintf(stderr, "#IMPSremove: removing persisted
imprints\n");
if (HEAPdelete(imprints->imprints, BBP_physical(b->batCacheid),
b->batCacheid > 0 ? "timprints" : "himprints"))
IODEBUG fprintf(stderr, "#IMPSremove(%s): imprints
heap\n", BATgetId(b));
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
