MonetDB: default - Merge with Feb2013 branch.

[Sjoerd Mullender]

Changeset: 8245f3aef958 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8245f3aef958
Modified Files:
        gdk/gdk_bat.c
Branch: default
Log Message:

Merge with Feb2013 branch.


diffs (21 lines):

diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -974,7 +974,7 @@ BATcopy(BAT *b, int ht, int tt, int writ
        } else if (ATOMtype(ATOMstorage(ht)) == 
ATOMtype(ATOMstorage(b->htype))) {
                bn->hsorted = b->hsorted || (cnt <= 1 && 
BATatoms[b->htype].linear);
                bn->hrevsorted = b->hrevsorted || (cnt <= 1 && 
BATatoms[b->htype].linear);
-               bn->hdense = b->hdense;
+               bn->hdense = b->hdense && ATOMtype(bn->htype) == TYPE_oid;
                if (b->hkey)
                        BATkey(bn, TRUE);
                bn->H->nonil = b->H->nonil;
@@ -987,7 +987,7 @@ BATcopy(BAT *b, int ht, int tt, int writ
        } else if (ATOMtype(ATOMstorage(tt)) == 
ATOMtype(ATOMstorage(b->ttype))) {
                bn->tsorted = b->tsorted || (cnt <= 1 && 
BATatoms[b->ttype].linear);
                bn->trevsorted = b->trevsorted || (cnt <= 1 && 
BATatoms[b->ttype].linear);
-               bn->tdense = b->tdense;
+               bn->tdense = b->tdense && ATOMtype(bn->ttype) == TYPE_oid;
                if (b->tkey)
                        BATkey(BATmirror(bn), TRUE);
                bn->T->nonil = b->T->nonil;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list