MonetDB: Feb2013 - Fix the incremental matpack

[Martin Kersten]

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

Fix the incremental matpack
(transplanted from 35f0c0e5a49ce808681eedd634970bd90a82a2a3)


diffs (25 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
@@ -147,9 +147,6 @@ MATpackIncrement(Client cntxt, MalBlkPtr
        b = BATdescriptor( bid = stk->stk[getArg(p,1)].val.ival);
        if ( b == NULL)
                throw(MAL, "mat.pack", RUNTIME_OBJECT_MISSING);
-       if ( bid < 0 )
-               b = BATmirror(b);
-       assert(BAThdense(b));
 
        if ( getArgType(mb,p,2) == TYPE_int){
                /* first step */
@@ -160,10 +157,10 @@ MATpackIncrement(Client cntxt, MalBlkPtr
                BATseqbase(bn, b->H->seq);
                BATseqbase(BATmirror(bn), b->T->seq);
                BATappend(bn,b,FALSE);
-               BBPreleaseref(b->batCacheid);
                assert(!bn->H->nil || !bn->H->nonil);
                assert(!bn->T->nil || !bn->T->nonil);
                BBPkeepref(*ret = bn->batCacheid);
+               BBPreleaseref(b->batCacheid);
        } else {
                /* remaining steps */
                bb = BATdescriptor(stk->stk[getArg(p,2)].val.ival);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list