MonetDB: Oct2012 - Merge with Jul2012 branch.

[Sjoerd Mullender]

Changeset: 40ff0bfd5b3d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=40ff0bfd5b3d
Modified Files:
        gdk/gdk_bat.c
        monetdb5/modules/mal/iterator.c
Branch: Oct2012
Log Message:

Merge with Jul2012 branch.


diffs (27 lines):

diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2198,18 +2198,17 @@ BATseqbase(BAT *b, oid o)
                /* adapt keyness */
                if (BAThvoid(b)) {
                        if (o == oid_nil) {
-                               if (b->hkey)
-                                       b->hkey = FALSE;
-                               b->H->nonil = 0;
-                               b->H->nil = 1;
+                               b->hkey = b->U->count <= 1;
+                               b->H->nonil = b->U->count == 0;
+                               b->H->nil = b->U->count > 0;
                                b->hsorted = b->hrevsorted = 1;
                        } else {
                                if (!b->hkey) {
                                        b->hkey = TRUE;
                                        b->H->nokey[0] = b->H->nokey[1] = 0;
-                                       b->H->nonil = 1;
-                                       b->H->nil = 0;
                                }
+                               b->H->nonil = 1;
+                               b->H->nil = 0;
                                b->hsorted = 1;
                                b->hrevsorted = b->U->count <= 1;
                        }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list