Changeset: 1e30836ad525 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e30836ad525
Modified Files:
monetdb5/modules/mal/mosaic_delta.c
monetdb5/modules/mal/mosaic_dict.c
monetdb5/modules/mal/mosaic_linear.c
monetdb5/modules/mal/mosaic_none.c
monetdb5/modules/mal/mosaic_rle.c
monetdb5/modules/mal/mosaic_zone.c
Branch: mosaic
Log Message:
use correct types, type casts, pointer casts, format strings, function names,
etc.
... also for debug(ging) code ...
diffs (119 lines):
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
@@ -116,7 +116,7 @@ MOSestimate_delta(Client cntxt, MOStask
}
}
#ifdef _DEBUG_MOSAIC_
- mnstr_printf(cntxt->fdout,"#estimate delta %d elm %.3f
factor\n",(int)i,factor);
+ mnstr_printf(cntxt->fdout,"#estimate delta "BUNFMT" elm %.3f
factor\n",i,factor);
#endif
return factor;
}
@@ -187,7 +187,7 @@ MOScompress_delta(Client cntxt, MOStask
}
}
#ifdef _DEBUG_MOSAIC_
- MOSdump_delta_(cntxt, task);
+ MOSdump_delta(cntxt, task);
#endif
}
diff --git a/monetdb5/modules/mal/mosaic_dict.c
b/monetdb5/modules/mal/mosaic_dict.c
--- a/monetdb5/modules/mal/mosaic_dict.c
+++ b/monetdb5/modules/mal/mosaic_dict.c
@@ -72,7 +72,7 @@ MOSdump_dict(Client cntxt, MOStask task)
switch(task->type){
case TYPE_sht:
for(i=0; i< *size; i++)
- mnstr_printf(cntxt->fdout,"sht [%d] %d",i, ((int*) val)[i]);
break;
+ mnstr_printf(cntxt->fdout,"sht [%d] %hd",i, ((sht*) val)[i]);
break;
case TYPE_int:
for(i=0; i< *size; i++)
mnstr_printf(cntxt->fdout,"int [%d] %d",i, ((int*) val)[i]);
break;
@@ -164,7 +164,7 @@ MOSestimate_dict(Client cntxt, MOStask t
}
}
#ifdef _DEBUG_MOSAIC_
- mnstr_printf(cntxt->fdout,"#estimate dict %d elm %4.2f factor\n",(int)
factor);
+ mnstr_printf(cntxt->fdout,"#estimate dict "BUNFMT" elm %4.2f factor\n",
i, factor);
#endif
return factor;
}
diff --git a/monetdb5/modules/mal/mosaic_linear.c
b/monetdb5/modules/mal/mosaic_linear.c
--- a/monetdb5/modules/mal/mosaic_linear.c
+++ b/monetdb5/modules/mal/mosaic_linear.c
@@ -56,9 +56,9 @@ MOSdump_linear(Client cntxt, MOStask tas
mnstr_printf(cntxt->fdout,"#linear "BUNFMT" ", MOScnt(blk));
switch(ATOMstorage(task->type)){
case TYPE_bte:
- mnstr_printf(cntxt->fdout,"bte %d %d", *(int*)
linear_base(blk), *(int*) linear_step(task, blk)); break;
+ mnstr_printf(cntxt->fdout,"bte %hhd %hhd", *(bte*)
linear_base(blk), *(bte*) linear_step(task, blk)); break;
case TYPE_sht:
- mnstr_printf(cntxt->fdout,"sht %d %d", *(int*)
linear_base(blk), *(int*) linear_step(task,blk)); break;
+ mnstr_printf(cntxt->fdout,"sht %hd %hd", *(sht*)
linear_base(blk), *(sht*) linear_step(task,blk)); break;
case TYPE_int:
mnstr_printf(cntxt->fdout,"int %d %d", *(int*)
linear_base(blk), *(int*) linear_step(task,blk)); break;
case TYPE_lng:
@@ -158,7 +158,7 @@ MOSestimate_linear(Client cntxt, MOStask
}
}
#ifdef _DEBUG_MOSAIC_
- mnstr_printf(cntxt->fdout,"#estimate linear %d elm %4.2f
factor\n",(int)i,factor);
+ mnstr_printf(cntxt->fdout,"#estimate linear "BUNFMT" elm %4.2f
factor\n",i,factor);
#endif
return factor;
}
diff --git a/monetdb5/modules/mal/mosaic_none.c
b/monetdb5/modules/mal/mosaic_none.c
--- a/monetdb5/modules/mal/mosaic_none.c
+++ b/monetdb5/modules/mal/mosaic_none.c
@@ -113,7 +113,7 @@ MOScompress_none(Client cntxt, MOStask t
case TYPE_dbl: NONEcompress(dbl); break;
}
#ifdef _DEBUG_MOSAIC_
- MOSdump_none_(cntxt, task);
+ MOSdump_none(cntxt, task);
#endif
}
diff --git a/monetdb5/modules/mal/mosaic_rle.c
b/monetdb5/modules/mal/mosaic_rle.c
--- a/monetdb5/modules/mal/mosaic_rle.c
+++ b/monetdb5/modules/mal/mosaic_rle.c
@@ -36,9 +36,9 @@ MOSdump_rle(Client cntxt, MOStask task)
mnstr_printf(cntxt->fdout,"#rle "BUNFMT" ", MOScnt(blk));
switch(task->type){
case TYPE_bte:
- mnstr_printf(cntxt->fdout,"bte %d", *(int*) val); break;
+ mnstr_printf(cntxt->fdout,"bte %hhd", *(bte*) val); break;
case TYPE_sht:
- mnstr_printf(cntxt->fdout,"sht %d", *(int*) val); break;
+ mnstr_printf(cntxt->fdout,"sht %hd", *(sht*) val); break;
case TYPE_int:
mnstr_printf(cntxt->fdout,"int %d", *(int*) val); break;
case TYPE_oid:
@@ -139,7 +139,7 @@ MOSestimate_rle(Client cntxt, MOStask ta
}
}
#ifdef _DEBUG_MOSAIC_
- mnstr_printf(cntxt->fdout,"#estimate rle %d elm %4.3
factor\n",(int)i,factor);
+ mnstr_printf(cntxt->fdout,"#estimate rle "BUNFMT" elm %4.3f
factor\n",i,factor);
#endif
return factor;
}
diff --git a/monetdb5/modules/mal/mosaic_zone.c
b/monetdb5/modules/mal/mosaic_zone.c
--- a/monetdb5/modules/mal/mosaic_zone.c
+++ b/monetdb5/modules/mal/mosaic_zone.c
@@ -36,10 +36,10 @@ MOSdump_zone(Client cntxt, MOStask task)
MosaicBlk blk = task->blk;
mnstr_printf(cntxt->fdout,"#zone "BUNFMT" elms ", MOScnt(blk));
switch(task->type){
- case TYPE_bte: {bte low= *(bte*)zone_min(blk), max =*(bte*)
zone_max(blk); mnstr_printf(cntxt->fdout," [%d - %d]\n", low,max); }break;
- case TYPE_bit: {bit low= *(bit*)zone_min(blk), max =*(bit*)
zone_max(blk); mnstr_printf(cntxt->fdout," [%d - %d]\n", low,max); }break;
+ case TYPE_bte: {bte low= *(bte*)zone_min(blk), max =*(bte*)
zone_max(blk); mnstr_printf(cntxt->fdout," [%hhd - %hhd]\n", low,max); }break;
+ case TYPE_bit: {bit low= *(bit*)zone_min(blk), max =*(bit*)
zone_max(blk); mnstr_printf(cntxt->fdout," [%hhd - %hhd]\n", low,max); }break;
case TYPE_int: {int low= *(int*)zone_min(blk), max =*(int*)
zone_max(blk); mnstr_printf(cntxt->fdout," [%d - %d]\n", low,max); }break;
- case TYPE_oid: {oid low= *(oid*)zone_min(blk), max =*(oid*)
zone_max(blk); mnstr_printf(cntxt->fdout," ["LLFMT" - "LLFMT"]\n", low,max);
}break;
+ case TYPE_oid: {oid low= *(oid*)zone_min(blk), max =*(oid*)
zone_max(blk); mnstr_printf(cntxt->fdout," ["OIDFMT" - "OIDFMT"]\n", low,max);
}break;
case TYPE_lng: {lng low= *(lng*)zone_min(blk), max =*(lng*)
zone_max(blk); mnstr_printf(cntxt->fdout," ["LLFMT" - "LLFMT"]\n", low,max);
}break;
#ifdef HAVE_HGE
case TYPE_hge: {hge low= *(hge*)zone_min(blk), max =*(hge*)
zone_max(blk); mnstr_printf(cntxt->fdout," [%.40g -%.40g]\n", (dbl) low, (dbl)
max); }break;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
