MonetDB: Oct2014 - Set some trivial properties for bats of lengt...

[Sjoerd Mullender]

Changeset: a30076b7cc44 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a30076b7cc44
Modified Files:
        gdk/gdk_join.c
Branch: Oct2014
Log Message:

Set some trivial properties for bats of length at most 1.


diffs (22 lines):

diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -3077,9 +3077,15 @@ BATproject(BAT *l, BAT *r)
        }
        /* some properties follow from certain combinations of input
         * properties */
-       bn->tkey |= l->tkey && r->tkey;
-       bn->tsorted |= (l->tsorted & r->tsorted) | (l->trevsorted & 
r->trevsorted);
-       bn->trevsorted |= (l->tsorted & r->trevsorted) | (l->trevsorted & 
r->tsorted);
+       if (BATcount(bn) <= 1) {
+               bn->tkey = 1;
+               bn->tsorted = 1;
+               bn->trevsorted = 1;
+       } else {
+               bn->tkey |= l->tkey && r->tkey;
+               bn->tsorted |= (l->tsorted & r->tsorted) | (l->trevsorted & 
r->trevsorted);
+               bn->trevsorted |= (l->tsorted & r->trevsorted) | (l->trevsorted 
& r->tsorted);
+       }
        bn->T->nonil |= l->T->nonil & r->T->nonil;
 
        BATseqbase(bn, l->hseqbase);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list