Changeset: 366ec92ab4eb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=366ec92ab4eb
Modified Files:
monetdb5/modules/mal/xid.c
Branch: xid
Log Message:
XIDcompress(): relax range check to activate XIDBASE encoding / handling
diffs (18 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
@@ -422,11 +422,11 @@ XIDcompress(Client cntxt, MalBlkPtr mb,
getMinMax( b->H, cnt, (oid*)Hloc(b,BUNfirst(b)), &hmin, &hmax );
if (ttx == TYPE_oid)
getMinMax( b->T, cnt, (oid*)Tloc(b,BUNfirst(b)), &tmin, &tmax );
- skip_h = (ATOMtype(ht) != TYPE_oid || (htx == TYPE_oid && hmax - hmin >
XID_VAL_MAX));
- skip_t = (ATOMtype(tt) != TYPE_oid || (ttx == TYPE_oid && tmax - tmin >
XID_VAL_MAX));
+ skip_h = (ATOMtype(ht) != TYPE_oid || (htx == TYPE_oid && hmax >
XID_CNT_MAX));
+ skip_t = (ATOMtype(tt) != TYPE_oid || (ttx == TYPE_oid && tmax >
XID_CNT_MAX));
if ((skip_h || ht == TYPE_void) && (skip_t || tt == TYPE_void)) {
/* cannot (yet?) compress */
- mnstr_printf(cntxt->fdout,"#xid NIL or too large OID " OIDFMT
":" OIDFMT", variable %d\n", hmax - hmin, tmax - tmin, getArg(pci,1));
+ mnstr_printf(cntxt->fdout,"#xid NIL or too large OID " OIDFMT
":" OIDFMT", variable %d\n", hmax, tmax, getArg(pci,1));
BBPkeepref(*ret = b->batCacheid);
return MAL_SUCCEED;
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
