Changeset: ee249e4efeea for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ee249e4efeea
Modified Files:
gdk/gdk_join.c
gdk/gdk_orderidx.c
Branch: leftmart
Log Message:
idxaccess msg
diffs (42 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -3079,7 +3079,7 @@ hashjoin(BAT *r1, BAT *r2, BAT *l, BAT *
r2 && r2->tdense ? "-dense" : "",
r2 && r2->tkey & 1 ? "-key" : "",
GDKusec() - t0);
- IDXACCESS fprintf(stderr, "[%d,%d]:%d (" BUNFMT ") #hashjoin: hash join
l=[%d,%d]:%d (" BUNFMT ") (ms=" LLFMT
+ IDXACCESS fprintf(stderr, "[%d,%d]:%d (" BUNFMT ") #hashjoin: hash join
l=[%d,%d]:%d (" BUNFMT ") (usec " LLFMT
")\n", r->batCacheid,-VIEWtparent(r), r->ttype,
BATcount(r), l->batCacheid,-VIEWtparent(l), l->ttype, BATcount(l), GDKusec() -
t0);
return GDK_SUCCEED;
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -93,7 +93,7 @@ BATcheckorderidx(BAT *b)
close(fd);
b->torderidx = hp;
ALGODEBUG fprintf(stderr,
"#BATcheckorderidx: reusing persisted orderidx %d\n", b->batCacheid);
- IDXACCESS fprintf(stderr, "[%d,%d]:%c
(" BUNFMT ") #BATcheckorderidx: load persistent order index (ms=" LLFMT
+ IDXACCESS fprintf(stderr, "[%d,%d]:%d
(" BUNFMT ") #BATcheckorderidx: load persistent order index (usec " LLFMT
")\n",
b->batCacheid,-VIEWtparent(b), b->ttype, BATcount(b), GDKusec() - t);
MT_lock_unset(&GDKhashLock(abs(b->batCacheid)));
return 1;
@@ -206,7 +206,7 @@ BATorderidx(BAT *b, int stable)
t1 = GDKusec();
MT_lock_unset(&GDKhashLock(abs(b->batCacheid)));
- IDXACCESS fprintf(stderr, "[%d,%d]:%d (" BUNFMT ") #BATorderidx: create
order index (ms=" LLFMT ")\n", b->batCacheid,-VIEWtparent(b), b->ttype,
BATcount(b), t1 - t0);
+ IDXACCESS fprintf(stderr, "[%d,%d]:%d (" BUNFMT ") #BATorderidx: create
order index (usec " LLFMT ")\n", b->batCacheid,-VIEWtparent(b), b->ttype,
BATcount(b), t1 - t0);
return GDK_SUCCEED;
}
@@ -427,7 +427,7 @@ GDKmergeidx(BAT *b, BAT**a, int n_ar)
b->torderidx = m;
t1 = GDKusec();
MT_lock_unset(&GDKhashLock(abs(b->batCacheid)));
- IDXACCESS fprintf(stderr, "[%d,%d]:%d (" BUNFMT ") #GDKmergeidx: merge
order index (ms=" LLFMT ")\n", b->batCacheid,-VIEWtparent(b), b->ttype,
BATcount(b), t1 - t0);
+ IDXACCESS fprintf(stderr, "[%d,%d]:%d (" BUNFMT ") #GDKmergeidx: merge
order index (usec " LLFMT ")\n", b->batCacheid,-VIEWtparent(b), b->ttype,
BATcount(b), t1 - t0);
return GDK_SUCCEED;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
