Changeset: 14d241bcb5d7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=14d241bcb5d7
Modified Files:
monetdb5/modules/mal/Tests/xidlist.stable.out
monetdb5/modules/mal/xid.c
Branch: xid
Log Message:
xid.c: revert changeset 6d504fd277af, i.e., do not set BATcount for
xid-compressed BATs
thei content is not usable outside the xid code,
hence, let them appear empty
diffs (39 lines):
diff --git a/monetdb5/modules/mal/Tests/xidlist.stable.out
b/monetdb5/modules/mal/Tests/xidlist.stable.out
--- a/monetdb5/modules/mal/Tests/xidlist.stable.out
+++ b/monetdb5/modules/mal/Tests/xidlist.stable.out
@@ -153,7 +153,7 @@ end main;
[ 78@0, 1280@0 ]
[ 79@0, 1290@0 ]
#xid, 83, tail compress, 80,56, clk 3 usec
-column first 57, size 57,
+column first 57, size 0,
r+:0 3
p:5
p:7
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
@@ -241,7 +241,6 @@ XIDcompress(Client cntxt, MalBlkPtr mb,
BBPreleaseref(b->batCacheid);
throw(MAL,"xid.compress", MAL_MALLOC_FAIL);
}
- BATsetcount(bn, 0);
if ( tt == TYPE_oid){
p = (oid*)Tloc(b,BUNfirst(b));
@@ -264,7 +263,6 @@ XIDcompress(Client cntxt, MalBlkPtr mb,
mnstr_printf(cntxt->fdout,"#xid, %d, tail compress, " BUNFMT
"," BUNFMT ", clk " LLFMT " usec\n",
getArg(pci,0), BATcount(b), i, GDKusec()-clk);
- BATsetcount(bn, MAX(i+1, BATcount(bn)));
bn->T->heap.xidcompressed = 1;
bn->batDirty =1;
}
@@ -297,7 +295,6 @@ XIDcompress(Client cntxt, MalBlkPtr mb,
mnstr_printf(cntxt->fdout,"#xid, %d, head compress, " BUNFMT
"," BUNFMT ", clk " LLFMT " usec\n",
getArg(pci,0), BATcount(b), i, GDKusec()-clk);
- BATsetcount(bn, MAX(i+1, BATcount(bn)));
bn->H->heap.xidcompressed = 1;
bn->batDirty =1;
}
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
