Changeset: b0178e0de49d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b0178e0de49d
Modified Files:
monetdb5/modules/mal/xid.c
Branch: xid
Log Message:
xid.c: properly cast oid to xid (in case eventually xid != oid)
diffs (72 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
@@ -56,7 +56,7 @@ XIDencode(XIDcolumn col, oid *p, oid *q)
case XIDBASE:
col[i].tag = XIDPOINT;
assert(v <= XID_VAL_MAX);
- col[i].value = v;
+ col[i].value = (xid) v;
//mnstr_printf(GDKout,"xidpoint " BUNFMT " " OIDFMT
"\n",i,v);
break;
case XIDSET:
@@ -72,20 +72,20 @@ XIDencode(XIDcolumn col, oid *p, oid *q)
if (scnt == 1) {
col[i].tag = XIDPOINT;
assert(prev <= XID_VAL_MAX);
- col[i].value = prev;
+ col[i].value = (xid) prev;
scnt =0;
}
i++;
col[i].tag = XIDPOINT;
assert(v <= XID_VAL_MAX);
- col[i].value = v;
+ col[i].value = (xid) v;
//mnstr_printf(GDKout,"xidpoint " BUNFMT " " OIDFMT
"\n",i,v);
//point++;
break;
case XIDRANGE:
if ( col[i].value + 1 == v){
assert(v <= XID_VAL_MAX);
- col[i].value = v;
+ col[i].value = (xid) v;
//mnstr_printf(GDKout,"xidrange " BUNFMT " %ld
" OIDFMT "\n",i,(xid) col[i-1].value, v);
break;
}
@@ -93,7 +93,7 @@ XIDencode(XIDcolumn col, oid *p, oid *q)
i++;
col[i].tag = XIDPOINT;
assert(v <= XID_VAL_MAX);
- col[i].value = v;
+ col[i].value = (xid) v;
//mnstr_printf(GDKout,"xidpoint " BUNFMT " " OIDFMT
"\n",i,v);
//point++;
break;
@@ -103,7 +103,7 @@ XIDencode(XIDcolumn col, oid *p, oid *q)
col[i].tag = XIDRANGE;
col[++i].tag = XIDRANGE;
assert(v <= XID_VAL_MAX);
- col[i].value = v;
+ col[i].value = (xid) v;
//mnstr_printf(GDKout,"xidrange " BUNFMT " %ld
" OIDFMT "\n",i,(xid) col[i-1].value, v);
//range++;
break;
@@ -114,7 +114,7 @@ XIDencode(XIDcolumn col, oid *p, oid *q)
col[i].tag = XIDSET;
scnt = 1;
prev = v;
- col[i].value = (1 << (v -col[i-1].value));
+ col[i].value = ((xid)1) << (v -col[i-1].value);
//mnstr_printf(GDKout,"xidset " BUNFMT "
%ld\n",i,(xid) (v- col[i-1].value));
//set++;
break;
@@ -122,7 +122,7 @@ XIDencode(XIDcolumn col, oid *p, oid *q)
i++;
col[i].tag = XIDPOINT;
assert(v <= XID_VAL_MAX);
- col[i].value = v;
+ col[i].value = (xid) v;
//mnstr_printf(GDKout,"xidpoint " BUNFMT " " OIDFMT
"\n",i,v);
}
}
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
