Changeset: b17308d04b57 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b17308d04b57 Modified Files: MonetDB5/src/optimizer/opt_mergetable.mx Branch: Jun2010 Log Message:
hub/hlb tub/tlb 's are oid's not lng's should solve problems with 32bit oids diffs (65 lines): diff -r 893f5c3b933e -r b17308d04b57 MonetDB5/src/optimizer/opt_mergetable.mx --- a/MonetDB5/src/optimizer/opt_mergetable.mx Fri Aug 13 14:23:29 2010 +0200 +++ b/MonetDB5/src/optimizer/opt_mergetable.mx Fri Aug 13 16:09:43 2010 +0200 @@ -177,20 +177,20 @@ return 1; } /* perfect match */ - if (lub->value.val.lval == rub->value.val.lval && - llb->value.val.lval == rlb->value.val.lval) + if (lub->value.val.oval == rub->value.val.oval && + llb->value.val.oval == rlb->value.val.oval) return 1; - if ((rub->value.val.lval != (lng)oid_nil && - rub->value.val.lval <= llb->value.val.lval) || - (lub->value.val.lval != (lng)oid_nil && - lub->value.val.lval <= rlb->value.val.lval)) + if ((rub->value.val.oval != oid_nil && + rub->value.val.oval <= llb->value.val.oval) || + (lub->value.val.oval != oid_nil && + lub->value.val.oval <= rlb->value.val.oval)) return 0; - if ((rub->value.val.lval == (lng)oid_nil && - rlb->value.val.lval > lub->value.val.lval) || - (lub->value.val.lval == (lng)oid_nil && - llb->value.val.lval > rub->value.val.lval)) { + if ((rub->value.val.oval == oid_nil && + rlb->value.val.oval > lub->value.val.oval) || + (lub->value.val.oval == oid_nil && + llb->value.val.oval > rub->value.val.oval)) { return 0; } return 1; @@ -207,20 +207,20 @@ return 1; } /* perfect match */ - if (lub->value.val.lval == rub->value.val.lval && - llb->value.val.lval == rlb->value.val.lval) + if (lub->value.val.oval == rub->value.val.oval && + llb->value.val.oval == rlb->value.val.oval) return 1; - if ((rub->value.val.lval != (lng)oid_nil && - rub->value.val.lval <= llb->value.val.lval) || - (lub->value.val.lval != (lng)oid_nil && - lub->value.val.lval <= rlb->value.val.lval)) + if ((rub->value.val.oval != oid_nil && + rub->value.val.oval <= llb->value.val.oval) || + (lub->value.val.oval != oid_nil && + lub->value.val.oval <= rlb->value.val.oval)) return 0; - if ((rub->value.val.lval == (lng)oid_nil && - rlb->value.val.lval > lub->value.val.lval) || - (lub->value.val.lval == (lng)oid_nil && - llb->value.val.lval > rub->value.val.lval)) { + if ((rub->value.val.oval == oid_nil && + rlb->value.val.oval > lub->value.val.oval) || + (lub->value.val.oval == oid_nil && + llb->value.val.oval > rub->value.val.oval)) { return 0; } return 1; _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list