MonetDB: mosaic - Remove old in header capped dictionary.

[Aris Koning]

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

Remove old in header capped dictionary.


diffs (55 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
@@ -69,19 +69,6 @@ typedef struct MOSAICHEADER{
        // both dictionary and framebased compression require a global 
dictionary of frequent values
        // Their size is purposely topped 
        bte mask, bits, framebits;      // global compression type properties
-       int dictsize;           // used by capped compression, it is a small 
table
-       union{
-               bte valbte[256];
-               sht valsht[256];
-               int valint[256];
-               lng vallng[256];
-               oid valoid[256];
-               flt valflt[256];
-               dbl valdbl[256];
-#ifdef HAVE_HGE
-               hge valhge[256];
-#endif
-       }dict;
        lng dictfreq[256];// keep track on their use
        // collect compression statistics for the particular task
        // A value of METHOD_NOT_AVAILABLE in blks or elms indicates that the 
corresponding method wasn't considered as candidate.
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
@@ -137,22 +137,24 @@ void
 MOSlayout_capped_hdr(MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT 
*boutput, BAT *bproperties)
 {
        lng zero=0;
-       int i;
+       unsigned int i;
        char buf[BUFSIZ];
        char bufv[BUFSIZ];
+       (void) boutput;
 
-       for(i=0; i< task->hdr->dictsize; i++){
+       BUN dictsize = GetCount(task->capped_info);
+
+       for(i=0; i< dictsize; i++){
                snprintf(buf, BUFSIZ,"capped[%d]",i);
                if( BUNappend(btech, buf, false) != GDK_SUCCEED ||
                        BUNappend(bcount, &zero, false) != GDK_SUCCEED ||
                        BUNappend(binput, &zero, false) != GDK_SUCCEED ||
-                       BUNappend(boutput, &task->hdr->dictfreq[i], false) != 
GDK_SUCCEED ||
+                       // BUNappend(boutput, MOSgetDictFreq(dict_hdr, i), 
false) != GDK_SUCCEED ||
                        BUNappend(bproperties, bufv, false) != GDK_SUCCEED)
                return;
        }
 }
 
-
 void
 MOSlayout_capped(MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT 
*boutput, BAT *bproperties)
 {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list