MonetDB: default - sql.c / BATleftproject: use correct types, BU...

[Stefan Manegold]

Changeset: 2f4a315d6852 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f4a315d6852
Modified Files:
        sql/backends/monet5/sql.c
Branch: default
Log Message:

sql.c / BATleftproject: use correct types, BUN & oid instead of size_t

BATcount() returns BUN, not size_t
seqbase is oid, not size_t

(found by Microsoft compiler on 64-bit Windows with 32-bit OIDs)


diffs (33 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -2472,7 +2472,7 @@ BATleftproject(bat *Res, const bat *Col,
 {
        BAT *c, *l, *r, *res;
        oid *p, *lp, *rp;
-       size_t cnt = 0, i;
+       BUN cnt = 0, i;
 
        c = BATdescriptor(*Col);
        if (c)
@@ -2501,9 +2501,9 @@ BATleftproject(bat *Res, const bat *Col,
        lp = (oid*)Tloc(l, 0);
        rp = (oid*)Tloc(r, 0);
        if (l->ttype == TYPE_void) {
-               size_t lp = l->tseqbase;
+               oid lp = l->tseqbase;
                if (r->ttype == TYPE_void) {
-                       size_t rp = r->tseqbase;
+                       oid rp = r->tseqbase;
                        for(i=0;i<cnt; i++, lp++, rp++) 
                                p[lp] = rp;
                } else {
@@ -2512,7 +2512,7 @@ BATleftproject(bat *Res, const bat *Col,
                }
        }
        if (r->ttype == TYPE_void) {
-               size_t rp = r->tseqbase;
+               oid rp = r->tseqbase;
                for(i=0;i<cnt; i++, rp++) 
                        p[lp[i]] = rp;
        } else {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list