Changeset: 8ebd217cb2f1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ebd217cb2f1
Modified Files:
        gdk/gdk_relop.mx
Branch: default
Log Message:

Use more efficient comparison method for oid values.


diffs (19 lines):

diff --git a/gdk/gdk_relop.mx b/gdk/gdk_relop.mx
--- a/gdk/gdk_relop.mx
+++ b/gdk/gdk_relop.mx
@@ -969,13 +969,11 @@ batfetchjoin(BAT *l, BAT *r, BUN estimat
                oid r_hi = *(oid *) BUNhead(ri, BUNlast(r) - 1);
                oid l_lo = *(oid *) BUNtail(li, BUNfirst(l));
                oid l_hi = *(oid *) BUNtail(li, BUNlast(l) - 1);
-               int empty = ATOMcmp(TYPE_oid, &r_lo, &l_hi) > 0 || 
ATOMcmp(TYPE_oid, &r_hi, &l_lo) < 0;
+               int empty = r_lo > l_hi || r_hi < l_lo;
                ALGODEBUG THRprintf(GDKout, "#BATfetchjoin: BATtordered(l)\n");
                ALGODEBUG THRprintf(GDKout, "#r_lo=" OIDFMT ", r_hi=" OIDFMT ", 
l_lo=" OIDFMT ", l_hi=" OIDFMT ".\n", r_lo, r_hi, l_lo, l_hi);
 
-               if (!empty &&
-                   (ATOMcmp(TYPE_oid, &r_lo, &l_lo) > 0 ||
-                    ATOMcmp(TYPE_oid, &r_hi, &l_hi) < 0)) {
+               if (!empty && (r_lo > l_lo || r_hi < l_hi)) {
                        ALGODEBUG THRprintf(GDKout, "#shrinking!\n");
                        ALGODEBUG THRprintf(GDKout, "#BATfetchjoin: l = 
BATselect(l, &r_lo, &r_hi);\n");
 
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to