Changeset: f5e7def67518 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f5e7def67518
Modified Files:
gdk/gdk_select.c
Branch: Oct2014
Log Message:
Make sure oids are normalized as oids, not (signed) integers.
diffs (54 lines):
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -1233,28 +1233,29 @@ BATsubselect(BAT *b, BAT *s, const void
}
}
- switch (ATOMtype(t)) {
- case TYPE_bte:
- NORMALIZE(bte);
- break;
- case TYPE_sht:
- NORMALIZE(sht);
- break;
- case TYPE_int:
- NORMALIZE(int);
- break;
- case TYPE_lng:
- NORMALIZE(lng);
- break;
- case TYPE_flt:
- NORMALIZE(flt);
- break;
- case TYPE_dbl:
- NORMALIZE(dbl);
- break;
- case TYPE_oid:
+ if (ATOMtype(b->ttype) == TYPE_oid) {
NORMALIZE(oid);
- break;
+ } else {
+ switch (t) {
+ case TYPE_bte:
+ NORMALIZE(bte);
+ break;
+ case TYPE_sht:
+ NORMALIZE(sht);
+ break;
+ case TYPE_int:
+ NORMALIZE(int);
+ break;
+ case TYPE_lng:
+ NORMALIZE(lng);
+ break;
+ case TYPE_flt:
+ NORMALIZE(flt);
+ break;
+ case TYPE_dbl:
+ NORMALIZE(dbl);
+ break;
+ }
}
if (b->tsorted || b->trevsorted) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
