MonetDB: default - Merge with Feb2013 branch.

[Stefan Manegold]

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

Merge with Feb2013 branch.


diffs (23 lines):

diff --git a/gdk/gdk_relop.mx b/gdk/gdk_relop.mx
--- a/gdk/gdk_relop.mx
+++ b/gdk/gdk_relop.mx
@@ -1164,11 +1164,15 @@ batfetchjoin(BAT *l, BAT *r, BUN estimat
                        ret = NULL;
                        goto ready;
                }
-               bn->hsorted = l->hsorted;
-               bn->hrevsorted = l->hrevsorted;
+               bn->hsorted = (BATcount(bn) <= 1) || l->hsorted;
+               bn->hrevsorted = (BATcount(bn) <= 1) || l->hrevsorted;
        }
-       bn->tsorted = BATtordered(l) & BATtordered(r);
-       bn->trevsorted = BATcount(bn) <= 1;
+       bn->tsorted = (BATcount(bn) <= 1) || \
+                     (BATtordered(l) & BATtordered(r)) || \
+                     (BATtrevordered(l) & BATtrevordered(r));
+       bn->trevsorted = (BATcount(bn) <= 1) || \
+                        (BATtordered(l) & BATtrevordered(r)) || \
+                        (BATtrevordered(l) & BATtordered(r));
        if (BATtkey(l)) {
                /* if BATtkey(l) elements of r match at most once */
                if (BATtordered(l) && BATcount(bn) == rcount) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list