MonetDB: default - merging

[Niels Nes]

Changeset: ffc6ce2421d2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ffc6ce2421d2
Modified Files:
        monetdb5/modules/mal/mat.c
Branch: default
Log Message:

merging


diffs (39 lines):

diff --git a/monetdb5/modules/mal/mat.c b/monetdb5/modules/mal/mat.c
--- a/monetdb5/modules/mal/mat.c
+++ b/monetdb5/modules/mal/mat.c
@@ -89,7 +89,7 @@ MATpackInternal(MalStkPtr stk, InstrPtr 
        int i, *ret = (int*) getArgReference(stk,p,0);
        BAT *b, *bn;
        BUN cap = 0;
-       int ht = TYPE_any, tt = TYPE_any;
+       int tt = TYPE_any;
 
        for (i = 1; i < p->argc; i++) {
                int bid = stk->stk[getArg(p,i)].val.ival;
@@ -97,8 +97,8 @@ MATpackInternal(MalStkPtr stk, InstrPtr 
                if (b && bid < 0)
                        b = BATmirror(b);
                if( b ){
-                       if (ht == TYPE_any){
-                               ht = b->htype;
+                       assert(BAThdense(b));
+                       if (tt == TYPE_any){
                                tt = b->ttype;
                        }
                        if (!tt && tt != b->ttype)
@@ -106,13 +106,12 @@ MATpackInternal(MalStkPtr stk, InstrPtr 
                        cap += BATcount(b);
                }
        }
-       if (ht == TYPE_any){
+       if (tt == TYPE_any){
                *ret = 0;
                return MAL_SUCCEED;
        }
 
-       assert(ht == TYPE_void);
-       bn = BATnew(ht, tt, cap);
+       bn = BATnew(TYPE_void, tt, cap);
        if (bn == NULL)
                throw(MAL, "mat.pack", MAL_MALLOC_FAIL);
        BATsettrivprop(bn);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list