MonetDB: Apr2011 - Merge with Mar2011 branch.

[Sjoerd Mullender]

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

Merge with Mar2011 branch.


diffs (35 lines):

diff --git a/gdk/gdk_bat.mx b/gdk/gdk_bat.mx
--- a/gdk/gdk_bat.mx
+++ b/gdk/gdk_bat.mx
@@ -1430,6 +1430,13 @@
                                                }
                                        }
                                }
+                               if (b->tkey == TRUE && cmp <= 0) {
+                                       /* cmp==0: definitely not key,
+                                        * cmd<0: we don't know */
+                                       b->T->nokey[0] = i - 1;
+                                       b->T->nokey[1] = i;
+                                       b->tkey = bm->hkey = b->tdense = FALSE;
+                               }
                        } else if (b->tsorted == (bit) GDK_SORTED_REV) {
                                ptr prv = BUNtail(bi, p - 1);
 
@@ -1438,8 +1445,15 @@
                                        b->T->nosorted_rev = i;
                                        b->tsorted = FALSE;
                                }
-                       }
-                       if (b->tkey == TRUE && cmp <= 0) {
+                               if (b->tkey == TRUE && cmp >= 0) {
+                                       /* cmp==0: definitely not key,
+                                        * cmd>0: we don't know */
+                                       b->T->nokey[0] = i - 1;
+                                       b->T->nokey[1] = i;
+                                       b->tkey = bm->hkey = b->tdense = FALSE;
+                               }
+                       } else if (b->tkey == TRUE) {
+                               /* we don't know anything, so unset key */
                                b->T->nokey[0] = i - 1;
                                b->T->nokey[1] = i;
                                b->tkey = bm->hkey = b->tdense = FALSE;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list