MonetDB: mosaic - Fixing some testweb compilation errors.

[Aris Koning]

Changeset: 572a419df1a6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=572a419df1a6
Modified Files:
        monetdb5/modules/mosaic/mosaic_capped.c
        monetdb5/modules/mosaic/mosaic_var.c
Branch: mosaic
Log Message:

Fixing some testweb compilation errors.


diffs (60 lines):

diff --git a/monetdb5/modules/mosaic/mosaic_capped.c 
b/monetdb5/modules/mosaic/mosaic_capped.c
--- a/monetdb5/modules/mosaic/mosaic_capped.c
+++ b/monetdb5/modules/mosaic/mosaic_capped.c
@@ -145,7 +145,7 @@ MOSlayout_capped_hdr(MOStask task, BAT *
        BUN dictsize = GetCount(task->capped_info);
 
        for(i=0; i< dictsize; i++){
-               snprintf(buf, BUFSIZ,"capped[%d]",i);
+               snprintf(buf, BUFSIZ,"capped[%u]",i);
                if( BUNappend(btech, buf, false) != GDK_SUCCEED ||
                        BUNappend(bcount, &zero, false) != GDK_SUCCEED ||
                        BUNappend(binput, &zero, false) != GDK_SUCCEED ||
@@ -291,7 +291,7 @@ do {\
        size_t new_bytes                = new_keys_size + new_dict_size + 
new_headers_size;\
 \
        (CURRENT)->compression_strategy.tag = MOSAIC_CAPPED;\
-       (CURRENT)->compression_strategy.cnt = nr_compressed;\
+       (CURRENT)->compression_strategy.cnt = (unsigned int) nr_compressed;\
 \
        (CURRENT)->uncompressed_size    += (BUN) ( nr_compressed * 
sizeof(TPE));\
        (CURRENT)->compressed_size              += (wordaligned( MosaicBlkSize, 
BitVector) + new_bytes - old_bytes);\
@@ -354,7 +354,7 @@ static str
        vmh->free += GetSizeInBytes(info);
        vmh->dirty = true;
 
-       *length_dict = GetCount(info);
+       *length_dict = (ulng) GetCount(info);
        *bits_dict = calculateBits(*length_dict);
 
        BBPreclaim(info->dict);
diff --git a/monetdb5/modules/mosaic/mosaic_var.c 
b/monetdb5/modules/mosaic/mosaic_var.c
--- a/monetdb5/modules/mosaic/mosaic_var.c
+++ b/monetdb5/modules/mosaic/mosaic_var.c
@@ -110,7 +110,7 @@ MOSlayout_var_hdr(MOStask task, BAT *bte
        BUN dictsize = GetCount(task->var_info);
 
        for(i=0; i< dictsize; i++){
-               snprintf(buf, BUFSIZ,"var[%d]",i);
+               snprintf(buf, BUFSIZ,"var[%u]",i);
                if( BUNappend(btech, buf, false) != GDK_SUCCEED ||
                        BUNappend(bcount, &zero, false) != GDK_SUCCEED ||
                        BUNappend(binput, &zero, false) != GDK_SUCCEED ||
@@ -195,7 +195,7 @@ do {\
        size_t new_bytes                = new_keys_size + new_dict_size + 
new_headers_size;\
 \
        (CURRENT)->compression_strategy.tag = MOSAIC_VAR;\
-       (CURRENT)->compression_strategy.cnt = nr_compressed;\
+       (CURRENT)->compression_strategy.cnt = (unsigned int) nr_compressed;\
 \
        (CURRENT)->uncompressed_size    += (BUN) ( nr_compressed * 
sizeof(TPE));\
        (CURRENT)->compressed_size              += (wordaligned( MosaicBlkSize, 
BitVector) + new_bytes - old_bytes);\
@@ -255,7 +255,7 @@ static str
        vmh->dirty = true;
 
        *pos_dict = 0;
-       *length_dict = GetCount(info);
+       *length_dict = (ulng) GetCount(info);
        *bits_dict = calculateBits(*length_dict);
 
        BBPreclaim(info->dict);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list