Changeset: da0c8f0b60d7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da0c8f0b60d7
Modified Files:
monetdb5/modules/mal/xid.c
Branch: xid
Log Message:
Trace some activity behavior
diffs (79 lines):
diff --git a/monetdb5/modules/mal/xid.c b/monetdb5/modules/mal/xid.c
--- a/monetdb5/modules/mal/xid.c
+++ b/monetdb5/modules/mal/xid.c
@@ -278,7 +278,7 @@ XIDencode(BUN *rtrn, XIDcolumn col, oid
}
static str
-XIDcompressCol( Client cntxt, InstrPtr pci, COLrec *c, COLrec *cn, BUN cnt,
str s, int t, oid *p, oid *q, oid min )
+XIDcompressCol( Client cntxt, MalBlkPtr mb, InstrPtr pci, COLrec *c, COLrec
*cn, BUN cnt, str s, int t, oid *p, oid *q, oid min )
{
XIDcolumn col;
lng clk;
@@ -294,8 +294,8 @@ XIDcompressCol( Client cntxt, InstrPtr p
return msg;
if (i == BUN_NONE) {
/* compressed size > MAX_COMPRESSED_SIZE => abandon */
- mnstr_printf(cntxt->fdout,"#xid, %d, %s compress, "
BUNFMT ", > " STR(MAX_COMPRESSED_SIZE) " => abandoned clk " LLFMT " usec\n",
- getArg(pci,0), s, cnt, GDKusec()-clk);
+ mnstr_printf(cntxt->fdout,"#xid, pc %d var %d, %s
compress, " BUNFMT ", > " STR(MAX_COMPRESSED_SIZE) " => abandoned clk " LLFMT
" usec\n",
+ getPC(mb,pci), getArg(pci,0), s, cnt,
GDKusec()-clk);
return MAL_SUCCEED;
}
col[XID_IDX_ORIG].count = (xid)cnt; /* keep original size */
@@ -446,7 +446,7 @@ XIDcompress(Client cntxt, MalBlkPtr mb,
}
if (!skip_h) {
- msg = XIDcompressCol( cntxt, pci, b->H, bn->H, cnt, "head",
htx, (oid*)Hloc(b,BUNfirst(b)), (oid*)Hloc(b,BUNlast(b)), hmin );
+ msg = XIDcompressCol( cntxt, mb, pci, b->H, bn->H, cnt, "head",
htx, (oid*)Hloc(b,BUNfirst(b)), (oid*)Hloc(b,BUNlast(b)), hmin );
if (msg != MAL_SUCCEED) {
BBPreleaseref(b->batCacheid);
BBPreleaseref(bn->batCacheid);
@@ -454,7 +454,7 @@ XIDcompress(Client cntxt, MalBlkPtr mb,
}
}
if (!skip_t) {
- msg = XIDcompressCol( cntxt, pci, b->T, bn->T, cnt, "tail",
ttx, (oid*)Tloc(b,BUNfirst(b)), (oid*)Tloc(b,BUNlast(b)), tmin );
+ msg = XIDcompressCol( cntxt, mb, pci, b->T, bn->T, cnt, "tail",
ttx, (oid*)Tloc(b,BUNfirst(b)), (oid*)Tloc(b,BUNlast(b)), tmin );
if (msg != MAL_SUCCEED) {
BBPreleaseref(b->batCacheid);
BBPreleaseref(bn->batCacheid);
@@ -566,7 +566,7 @@ XIDdecode(BUN *rtrn, XIDcolumn col, oid
}
static str
-XIDdecompressCol( Client cntxt, InstrPtr pci, COLrec *c, COLrec *cn, str s,
BUN cap, oid *o )
+XIDdecompressCol( Client cntxt, MalBlkPtr mb, InstrPtr pci, COLrec *c, COLrec
*cn, str s, BUN cap, oid *o )
{
BUN cnt = 0, lim;
XIDcolumn col;
@@ -584,8 +584,8 @@ XIDdecompressCol( Client cntxt, InstrPtr
msg = XIDdecode(&cnt,col,o,lim,cap,min);
if (msg != MAL_SUCCEED)
return msg;
- mnstr_printf(cntxt->fdout,"#xid, %d, %s decompress, " BUNFMT ",
" BUNFMT ", clk " LLFMT " sec " LLFMT " usec\n",
- getArg(pci,1), s, lim, cnt, GDKusec()/1000000,
GDKusec()-clk);
+ mnstr_printf(cntxt->fdout,"#xid, pc %d var %d, %s decompress, "
BUNFMT ", " BUNFMT ", clk " LLFMT " sec " LLFMT " usec\n",
+ getPC(mb,pci), getArg(pci,1), s, lim, cnt,
GDKusec()/1000000, GDKusec()-clk);
if (cnt != cap)
throw(MAL, "xid.decompress", "decompressed %s count
does not match original count: "BUNFMT" != "BUNFMT"", s, cnt, cap);
@@ -652,7 +652,7 @@ XIDdecompress(Client cntxt, MalBlkPtr mb
}
if (b->H->heap.xidcompressed || b->htype == TYPE_void) {
- msg = XIDdecompressCol( cntxt, pci, b->H, bn->H, "head", cap,
(oid*)Hloc(bn,BUNfirst(bn)) );
+ msg = XIDdecompressCol( cntxt, mb, pci, b->H, bn->H, "head",
cap, (oid*)Hloc(bn,BUNfirst(bn)) );
if (msg != MAL_SUCCEED) {
BBPreleaseref(b->batCacheid);
BBPreleaseref(bn->batCacheid);
@@ -660,7 +660,7 @@ XIDdecompress(Client cntxt, MalBlkPtr mb
}
}
if (b->T->heap.xidcompressed || b->ttype == TYPE_void) {
- msg = XIDdecompressCol( cntxt, pci, b->T, bn->T, "tail", cap,
(oid*)Tloc(bn,BUNfirst(bn)) );
+ msg = XIDdecompressCol( cntxt, mb, pci, b->T, bn->T, "tail",
cap, (oid*)Tloc(bn,BUNfirst(bn)) );
if (msg != MAL_SUCCEED) {
BBPreleaseref(b->batCacheid);
BBPreleaseref(bn->batCacheid);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
