MonetDB: default - Merge with Apr2012 branch.

[Sjoerd Mullender]

Changeset: dea6385b9083 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dea6385b9083
Modified Files:
        monetdb5/modules/mal/remote.c
        monetdb5/modules/mal/sample.c
        sql/backends/monet5/sql.mx
Branch: default
Log Message:

Merge with Apr2012 branch.


diffs (61 lines):

diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -1274,7 +1274,7 @@ RMTinternalcopyfrom(BAT **ret, char *hdr
                b->hdense = b->hkey = TRUE;
        b->tdense = bb.Tdense;
        if (bb.Ttype == TYPE_str && bb.size)
-               BATsetcapacity(b, bb.tailsize >> b->T->shift);
+               BATsetcapacity(b, (BUN) (bb.tailsize >> b->T->shift));
        BATsetcount(b, bb.size);
        b->batDirty = TRUE;
 
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -6825,7 +6825,7 @@ sql_storage(Client cntxt, MalBlkPtr mb, 
                                sql_base *bc = ncol->data;
                                sql_column *c= (sql_column *) ncol->data;
                                BAT *bn = store_funcs.bind_col(tr, c, 0);
-                               BUN sz;
+                               lng sz;
 
                                /*printf("schema %s.%s.%s" , b->name, bt->name, 
bc->name);*/
                                sch = BUNappend(sch, b->name, FALSE);
@@ -6867,7 +6867,7 @@ sql_storage(Client cntxt, MalBlkPtr mb, 
                                                sql_idx *c= (sql_idx *) 
ncol->data;
                                                if(c->type != no_idx){
                                                        BAT *bn = 
store_funcs.bind_idx(tr, c, 0);
-                                                       BUN sz;
+                                                       lng sz;
                        
                                                        /*printf("schema 
%s.%s.%s" , b->name, bt->name, bc->name);*/
                                                        sch = BUNappend(sch, 
b->name, FALSE);
@@ -7002,7 +7002,8 @@ str
 SQLmiddle(bat *res,  bat *val, bat *hist)
 {
        BAT *r,*v,*h;
-       wrd *sz, cnt, i;
+       wrd *sz;
+       BUN cnt, i;
        oid *gid;
 
        if( (h = BATdescriptor(*hist)) == NULL )
@@ -7025,7 +7026,7 @@ SQLmiddle(bat *res,  bat *val, bat *hist
 
                for(i=0;i<cnt;i++) {
                        BUN p = BUNfnd(h, gid);
-                       wrd s = *(sz+p);
+                       oid s = (oid) sz[p];
                        oid nid = id + (s-1)/2;
        
                        BUNins(r, gid, &nid, FALSE);
@@ -7037,7 +7038,7 @@ SQLmiddle(bat *res,  bat *val, bat *hist
 
                for(i=0;i<cnt;i++) {
                        BUN p = BUNfnd(h, gid);
-                       wrd s = *(sz+p);
+                       wrd s = sz[p];
        
                        BUNins(r, gid, id+((s-1)/2), FALSE);
                        gid += s;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list