MonetDB: Jul2015 - BATconstant should look at base type, not sto...

[Sjoerd Mullender]

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

BATconstant should look at base type, not storage type.


diffs (20 lines):

diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1703,7 +1703,7 @@ BATconstant(int tailtype, const void *v,
        if (bn == NULL)
                return NULL;
        p = Tloc(bn, bn->batFirst);
-       switch (ATOMstorage(tailtype)) {
+       switch (ATOMbasetype(tailtype)) {
        case TYPE_void:
                v = &oid_nil;
                BATseqbase(BATmirror(bn), oid_nil);
@@ -1732,7 +1732,6 @@ BATconstant(int tailtype, const void *v,
        case TYPE_hge:
                for (i = 0; i < n; i++)
                        ((hge *) p)[i] = *(hge *) v;
-               bn->T->nil = n >= 1 && *(hge *) v == hge_nil;
                break;
 #endif
        default:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list