Changeset: 6a58c8617d46 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a58c8617d46
Modified Files:
gdk/gdk.h
monetdb5/modules/mal/mosaic_dictionary.c
Branch: mosaic
Log Message:
fix compilation
diffs (60 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -810,7 +810,7 @@ gdk_export int VALisnil(const ValRecord
* Heap *theap; // heap for varsized tail values
* Hash *thash; // linear chained hash table on tail
* Imprints *timprints; // column imprints index on tail
- * Heap *mosaic; // compressed representation
+ * Heap *mosaic; // compressed representation
* } BAT;
* @end verbatim
*
@@ -890,7 +890,7 @@ typedef struct {
Heap *vheap; /* space for the varsized data. */
Hash *hash; /* hash table */
Imprints *imprints; /* column imprints index */
- Heap *mosaic; /* compressed representation */
+ Heap *mosaic; /* compressed representation */
PROPrec *props; /* list of dynamic properties stored in the bat
descriptor */
} COLrec;
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
@@ -233,7 +233,7 @@ MOScreatedictionary(Client cntxt, MOStas
if( dict[j] == *val) break;
if ( j == hdr->dictsize){
if ( hdr->dictsize == 256){
- lng min = 0;
+ int min = 0;
// select low frequent candidate
for(j=1;j<256;j++)
if( cnt[min] <cnt[j])
min = j;
@@ -275,7 +275,7 @@ MOScreatedictionary(Client cntxt, MOStas
flt
MOSestimate_dictionary(Client cntxt, MOStask task)
{
- BUN i;
+ BUN i = 0;
int j;
flt factor= 0.0;
MosaicHdr hdr = task->hdr;
@@ -456,7 +456,7 @@ MOSdecompress_dictionary(Client cntxt, M
MosaicHdr hdr = task->hdr;
BUN i;
int j;
- ulng m1,m2;
+ ulng m1=0,m2;
int cid, lshift, rshift;
ulng *base;
(void) cntxt;
@@ -477,7 +477,7 @@ MOSdecompress_dictionary(Client cntxt, M
base = (ulng*)(((char*)blk) + MosaicBlkSize);
for(i = 0; i < lim; 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)) &
((ulng)hdr->mask);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
