Changeset: be4e522cf6d4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be4e522cf6d4
Modified Files:
monetdb5/modules/mal/mosaic.c
monetdb5/modules/mal/mosaic_delta.c
monetdb5/modules/mal/mosaic_dictionary.c
Branch: mosaic
Log Message:
Fix compilation errors
diffs (45 lines):
diff --git a/monetdb5/modules/mal/mosaic.c b/monetdb5/modules/mal/mosaic.c
--- a/monetdb5/modules/mal/mosaic.c
+++ b/monetdb5/modules/mal/mosaic.c
@@ -1466,7 +1466,7 @@ MOSanalyseReport(Client cntxt, BAT *b, B
xf[i]= task->ratio;
if( xf[i] == 0)
continue;
- xsize = task->bsrc->T->mosaic->free;
+ xsize = (BUN) task->bsrc->T->mosaic->free;
BUNappend(boutput,&xsize,FALSE);
t= technique;
diff --git a/monetdb5/modules/mal/mosaic_delta.c
b/monetdb5/modules/mal/mosaic_delta.c
--- a/monetdb5/modules/mal/mosaic_delta.c
+++ b/monetdb5/modules/mal/mosaic_delta.c
@@ -244,7 +244,7 @@ MOScompress_delta(Client cntxt, MOStask
*(lng*)task->dst = val;
task->dst += sizeof(lng);
for(v++, i =1; i<limit; i++, v++){
- hdr->checksum.sumint += *v;
+ hdr->checksum.sumlng += *v;
delta = *v -val;
if ( delta < -127 || delta >127)
break;
diff --git a/monetdb5/modules/mal/mosaic_dictionary.c
b/monetdb5/modules/mal/mosaic_dictionary.c
--- a/monetdb5/modules/mal/mosaic_dictionary.c
+++ b/monetdb5/modules/mal/mosaic_dictionary.c
@@ -328,7 +328,7 @@ MOSestimate_dictionary(Client cntxt, MOS
// insert a series of values into the compressor block using dictionary
#define dictcompress(Vector,I,Bits,Value)\
{int cid,lshift,rshift;\
- cid = (I * Bits)/64;\
+ cid = (int) (I * Bits)/64;\
lshift= 63 -((I * Bits) % 64) ;\
if ( lshift >= Bits){\
Vector[cid]= Vector[cid] | (((unsigned long) Value) << (lshift-
Bits));\
@@ -1024,7 +1024,7 @@ MOSjoin_dictionary(Client cntxt, MOStas
for( o=0, n= task->elm; n-- > 0; o++,w++ ){
for(oo = task->start,i=0; i < limit; i++,oo++){
//dictdecompress(i);
- cid = (i * hdr->bits)/64;
+ cid = (int) (i * hdr->bits)/64;
lshift= 63 -((i * hdr->bits) % 64) ;
if ( lshift >= hdr->bits){
j = (base[cid]>>
(lshift-hdr->bits)) & ((unsigned long)hdr->mask);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
