Changeset: cf71414d7cbb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf71414d7cbb
Modified Files:
monetdb5/modules/mal/mosaic.c
monetdb5/modules/mal/mosaic_dictionary.c
monetdb5/modules/mal/mosaic_runlength.c
Branch: mosaic
Log Message:
Fix some compilation issues
diffs (47 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
@@ -66,7 +66,7 @@ MOSdumpTask(Client cntxt,MOStask task)
int i;
mnstr_printf(cntxt->fdout,"# ");
- mnstr_printf(cntxt->fdout,"clk "LLFMT"\tsizes "BUNFMT"\t%3.0fx\t",
+ mnstr_printf(cntxt->fdout,"clk "LLFMT"\tsizes "SZFMT"\t%3.0fx\t",
task->timer, task->bsrc->T->mosaic->free, (flt)
task->bsrc->T->heap.free/task->bsrc->T->mosaic->free);
for ( i=0; i < MOSAIC_METHODS -1; i++)
if( task->filter[i])
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
@@ -90,15 +90,16 @@ MOSdump_dictionary(Client cntxt, MOStask
void
MOSlayout_dictionary_hdr(Client cntxt, MOStask task, BAT *btech, BAT *bcount,
BAT *binput, BAT *boutput, BAT *bproperties)
{
- lng cnt=0,i;
+ lng zero=0;
+ int i;
char buf[BUFSIZ];
(void) cntxt;
for(i=0; i< task->hdr->dictsize; i++){
MOSdump_dictionaryInternal(buf, BUFSIZ, task,i);
BUNappend(btech, "dictionary_hdr", FALSE);
- BUNappend(bcount, &i, FALSE);
- BUNappend(binput, &cnt, FALSE);
+ BUNappend(bcount, &zero, FALSE);
+ BUNappend(binput, &zero, FALSE);
BUNappend(boutput, &task->hdr->dictfreq[i], FALSE);
BUNappend(bproperties, buf, FALSE);
}
diff --git a/monetdb5/modules/mal/mosaic_runlength.c
b/monetdb5/modules/mal/mosaic_runlength.c
--- a/monetdb5/modules/mal/mosaic_runlength.c
+++ b/monetdb5/modules/mal/mosaic_runlength.c
@@ -263,7 +263,7 @@ MOScompress_runlength(Client cntxt, MOSt
for(v++,i = 1; i<limit; i++, v++)
if ( *v != val)
break;
- hdr->checksum.sumint += i * val;
+ hdr->checksum.sumint += (int)(i * val);
MOSsetCnt(blk,i);
task->dst += sizeof(int);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
