MonetDB: mosaic - Get rid of the ratio field in MOStask.

[Aris Koning]

Changeset: 4473ebe62b8c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4473ebe62b8c
Modified Files:
        monetdb5/modules/mosaic/mosaic.c
        monetdb5/modules/mosaic/mosaic.h
Branch: mosaic
Log Message:

Get rid of the ratio field in MOStask.


diffs (57 lines):

diff --git a/monetdb5/modules/mosaic/mosaic.c b/monetdb5/modules/mosaic/mosaic.c
--- a/monetdb5/modules/mosaic/mosaic.c
+++ b/monetdb5/modules/mosaic/mosaic.c
@@ -432,7 +432,7 @@ MOScompressInternal(Client cntxt, BAT* b
        // TODO: if we couldnt compress well enough, ignore the result
 
        bsrc->batDirtydesc = true;
-       task->ratio = task->hdr->ratio = (flt)task->bsrc->theap.free/ 
task->bsrc->tmosaic->free;
+       task->hdr->ratio = (flt)task->bsrc->theap.free/ 
task->bsrc->tmosaic->free;
 finalize:
        MCexitMaintenance(cntxt);
 
@@ -576,8 +576,6 @@ MOSdecompressInternal(Client cntxt, BAT*
                }
        }
 
-       task->ratio = (flt)task->bsrc->theap.free/ task->bsrc->tmosaic->free;
-       
        error = 0;
        switch( ATOMbasetype(task->type)){
        case TYPE_bte:
@@ -601,9 +599,9 @@ MOSdecompressInternal(Client cntxt, BAT*
        case TYPE_str:
                break;
        }
-       if(error) 
-               mnstr_printf(cntxt->fdout,"#incompatible compression for type 
%d ratio %f\n", ATOMbasetype(task->type),task->ratio);
+       if(error) {
                // TODO: handle error
+       }
 
        task->timer = GDKusec() - task->timer;
 
@@ -1256,10 +1254,7 @@ MOSanalyseReport(Client cntxt, BAT *b, B
                const char* compressions = buf;
                MOScompressInternal(cntxt, b, compressions);
                pat[i].clk1 = GDKms()- pat[i].clk1;
-               
-#ifdef _DEBUG_MOSAIC_
-               mnstr_printf(cntxt->fdout,"#run experiment %d ratio %6.4f 
"LLFMT" ms  %s\n",i, task->ratio, pat[i].clk1, pat[i].technique);
-#endif
+
                if(b->tmosaic == NULL){
                        // aborted compression experiment
                        MOSdestroy(BBPdescriptor(bid));
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
@@ -157,8 +157,6 @@ typedef struct MOSTASK{
        char     *dst;          // write pointer into current compressed blocks
        oid     start;          // oid of first element in current blk
        oid             stop;           // last oid of range to be scanned
-       flt             ratio;          // compression ratio encountered
-
 
        BAT *bsrc;              // target column to extended with compressed 
heap
        char *src;              // read pointer into source
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list