MonetDB: mutation - merge with default

[Martin Kersten]

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

merge with default


diffs (52 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
@@ -483,7 +483,7 @@ MATmergepack(Client cntxt, MalBlkPtr mb,
                                        bats[j] = bats[j-1];
                                }
                                o_src[j] = (oid*) Tloc(b,BUNfirst(b));
-                               o_end[j] = o_src[top] + BATcount(b);
+                               o_end[j] = o_src[j] + BATcount(b);
                                bats[j] = b;
                                top++;
                        }
diff --git a/monetdb5/modules/mal/pqueue.c b/monetdb5/modules/mal/pqueue.c
--- a/monetdb5/modules/mal/pqueue.c
+++ b/monetdb5/modules/mal/pqueue.c
@@ -1067,10 +1067,10 @@ PQinit(int *ret, int *bid, wrd *maxsize)
 }
 
 static void
-PQtopn_sorted_min( BAT **bn, BAT *b, wrd _N )
+PQtopn_sorted_min( BAT **bn, BAT *b, wrd NN )
 {
-       BUN cnt = BATcount(b), N = (BUN) _N;
-       assert(_N >= 0);
+       BUN cnt = BATcount(b), N = (BUN) NN;
+       assert(NN >= 0);
        if (b->tsorted) {
                b = BATslice(b, N>=cnt?0:cnt-N, cnt);
                *bn = BATsort_rev(b);
@@ -1080,10 +1080,10 @@ PQtopn_sorted_min( BAT **bn, BAT *b, wrd
 }
 
 static void
-PQtopn_sorted_max( BAT **bn, BAT *b, wrd _N )
+PQtopn_sorted_max( BAT **bn, BAT *b, wrd NN )
 {
-       BUN cnt = BATcount(b), N = (BUN) _N;
-       assert(_N >= 0);
+       BUN cnt = BATcount(b), N = (BUN) NN;
+       assert(NN >= 0);
        if (b->tsorted) 
                *bn = BATslice(b, 0, N>=cnt?cnt:N);
        else {
@@ -1300,7 +1300,7 @@ PQtopn_sorted_max( BAT **bn, BAT *b, wrd
 
 
 PQminmax(bte)
-       PQminmax(sht)
+PQminmax(sht)
 PQminmax(int)
 PQminmax(oid)
 PQminmax(wrd)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list