MonetDB: default - Move count setting to improve property analyse

[Martin Kersten]

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

Move count setting to improve property analyse


diffs (36 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
@@ -91,6 +91,8 @@ MATpackInternal(Client cntxt, MalBlkPtr 
        BUN cap = 0;
        int tt = TYPE_any;
        int sorted =1, keyed=1, voidheaded=1;
+       (void) cntxt;
+       (void) mb;
 
        for (i = 1; i < p->argc; i++) {
                int bid = stk->stk[getArg(p,i)].val.ival;
@@ -515,6 +517,7 @@ MATmergepack(Client cntxt, MalBlkPtr mb,
                        }
                        top--;
                } else{
+                       // resort priority queue
                        onxt= *o_src[0];
                        for( j=1; j< top && onxt > *o_src[j]; j++){
                                oo = o_src[j]; o_src[j]= o_src[j-1]; 
o_src[j-1]= oo;
@@ -525,13 +528,13 @@ MATmergepack(Client cntxt, MalBlkPtr mb,
        }
        for( i=0; i< top; i++)
                BBPunfix(bats[i]->batCacheid);
+    BATsetcount(bn, (BUN) (o - (oid *) Tloc(bn, BUNfirst(bn))));
+    BATseqbase(bn, 0);
        BATsettrivprop(bn);
        GDKfree(bats);
        GDKfree(o_src);
        GDKfree(o_end);
     /* properties */
-    BATsetcount(bn, (BUN) (o - (oid *) Tloc(bn, BUNfirst(bn))));
-    BATseqbase(bn, 0);
     bn->trevsorted = 0;
     bn->tsorted = 1;
     bn->tkey = 1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list