Changeset: 3f101e5a2157 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3f101e5a2157
Modified Files:
monetdb5/modules/mosaic/mosaic.h
monetdb5/modules/mosaic/mosaic_delta.c
monetdb5/modules/mosaic/mosaic_hdr.c
monetdb5/modules/mosaic/mosaic_linear.c
monetdb5/modules/mosaic/mosaic_prefix.c
monetdb5/modules/mosaic/mosaic_runlength.c
Branch: mosaic
Log Message:
Remove old factor and range arrays.
diffs (134 lines):
diff --git a/monetdb5/modules/mosaic/mosaic.h b/monetdb5/modules/mosaic/mosaic.h
--- a/monetdb5/modules/mosaic/mosaic.h
+++ b/monetdb5/modules/mosaic/mosaic.h
@@ -131,10 +131,6 @@ typedef struct MOSTASK{
int type; // one of the permissible compression types
int filter[MOSAIC_METHODS];// algorithmic (de)compression mix
- /* collect the range being applied for the last compression call */
- BUN range[MOSAIC_METHODS]; // end of compression range
- float factor[MOSAIC_METHODS];// compression factor of last range. //
TODO: This doesn't seem to be used. It also has some design flaws to it. Like
what is its value if there are two blocks of the same compression type.
-
MosaicHdr hdr; // header block with index/synopsis information
MosaicBlk blk; // current block header in scan
GlobalVarInfo* var_info;
diff --git a/monetdb5/modules/mosaic/mosaic_delta.c
b/monetdb5/modules/mosaic/mosaic_delta.c
--- a/monetdb5/modules/mosaic/mosaic_delta.c
+++ b/monetdb5/modules/mosaic/mosaic_delta.c
@@ -115,7 +115,6 @@ MOSskip_delta(MOStask task)
str
MOSestimate_delta(MOStask task, MosaicEstimation* current, const
MosaicEstimation* previous)
{ unsigned int i = 0;
- flt factor = 1.0;
(void) previous;
switch(ATOMbasetype(task->type)){
@@ -128,8 +127,6 @@ MOSestimate_delta(MOStask task, MosaicEs
case TYPE_hge: Estimate_delta(hge, (delta < -127 || delta
>127)); break;
#endif
}
- task->factor[MOSAIC_DELTA] = factor;
- task->range[MOSAIC_DELTA] = task->start + i;
return MAL_SUCCEED;
}
diff --git a/monetdb5/modules/mosaic/mosaic_hdr.c
b/monetdb5/modules/mosaic/mosaic_hdr.c
--- a/monetdb5/modules/mosaic/mosaic_hdr.c
+++ b/monetdb5/modules/mosaic/mosaic_hdr.c
@@ -39,8 +39,6 @@ MOSinitHeader(MOStask task)
int i;
for(i=0; i < MOSAIC_METHODS; i++){
hdr->elms[i] = hdr->blks[i] = METHOD_NOT_AVAILABLE;
- task->range[i]=0;
- task->factor[i]=0.0;
}
hdr->ratio = 0;
hdr->version = MOSAIC_VERSION;
diff --git a/monetdb5/modules/mosaic/mosaic_linear.c
b/monetdb5/modules/mosaic/mosaic_linear.c
--- a/monetdb5/modules/mosaic/mosaic_linear.c
+++ b/monetdb5/modules/mosaic/mosaic_linear.c
@@ -131,7 +131,6 @@ MOSskip_linear(MOStask task)
str
MOSestimate_linear(MOStask task, MosaicEstimation* current, const
MosaicEstimation* previous)
{ unsigned int i = -1;
- flt factor = 0.0;
(void) previous;
switch(ATOMbasetype(task->type)){
@@ -146,8 +145,6 @@ MOSestimate_linear(MOStask task, MosaicE
case TYPE_hge: Estimate(hge); break;
#endif
}
- task->factor[MOSAIC_LINEAR] = factor;
- task->range[MOSAIC_LINEAR] = task->start + i;
return MAL_SUCCEED;
}
diff --git a/monetdb5/modules/mosaic/mosaic_prefix.c
b/monetdb5/modules/mosaic/mosaic_prefix.c
--- a/monetdb5/modules/mosaic/mosaic_prefix.c
+++ b/monetdb5/modules/mosaic/mosaic_prefix.c
@@ -284,7 +284,6 @@ MOSestimate_prefix(MOStask task, MosaicE
{
(void) previous;
unsigned int i = 0;
- flt factor = 0.0;
int prefixbits = 0,size;
BUN bits,store;
BUN limit = task->stop - task->start > MOSAICMAXCNT? MOSAICMAXCNT:
task->stop - task->start;
@@ -315,7 +314,6 @@ MOSestimate_prefix(MOStask task, MosaicE
current->uncompressed_size += (BUN) (i * sizeof(bte));
current->compressed_size += store;
- factor = ( (flt)i * sizeof(bte))/ store;
}
break;
case 2:
@@ -339,7 +337,6 @@ MOSestimate_prefix(MOStask task, MosaicE
current->uncompressed_size += (BUN) (i * sizeof(sht));
current->compressed_size += store;
- factor = ( (flt)i * sizeof(sht))/ store;
}
break;
case 4:
@@ -364,7 +361,6 @@ MOSestimate_prefix(MOStask task, MosaicE
current->uncompressed_size += (BUN) (i * sizeof(int));
current->compressed_size += store;
- factor = ( (flt)i * sizeof(int))/ store;
}
break;
case 8:
@@ -387,12 +383,9 @@ MOSestimate_prefix(MOStask task, MosaicE
current->uncompressed_size += (BUN) (i * sizeof(lng));
current->compressed_size += store;
- factor = ( (flt)i * sizeof(lng))/ store;
}
}
current->compression_strategy.cnt = i;
- task->factor[MOSAIC_PREFIX] = factor;
- task->range[MOSAIC_PREFIX] = task->start + i;
return MAL_SUCCEED;
}
diff --git a/monetdb5/modules/mosaic/mosaic_runlength.c
b/monetdb5/modules/mosaic/mosaic_runlength.c
--- a/monetdb5/modules/mosaic/mosaic_runlength.c
+++ b/monetdb5/modules/mosaic/mosaic_runlength.c
@@ -108,7 +108,6 @@ MOSskip_runlength(MOStask task)
str
MOSestimate_runlength(MOStask task, MosaicEstimation* current, const
MosaicEstimation* previous)
{ unsigned int i = 0;
- flt factor = 0.0;
(void) previous;
current->compression_strategy.tag = MOSAIC_RLE;
@@ -124,8 +123,6 @@ MOSestimate_runlength(MOStask task, Mosa
case TYPE_hge: Estimate(hge); break;
#endif
}
- task->factor[MOSAIC_RLE] = factor;
- task->range[MOSAIC_RLE] = task->start + i;
return MAL_SUCCEED;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
