MonetDB: mosaic - Remove incorrect assert and properly initializ...

[Aris Koning]

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

Remove incorrect assert and properly initialize member.


diffs (30 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
@@ -129,7 +129,6 @@ typedef struct VMOSAICHEADER{
  */
 
 #define CNT_BITS 24
-//#define MOSAICMAXCNT 10000
 #define MOSAICMAXCNT ((1 << CNT_BITS) - 1)
 
 typedef struct MOSAICBLK {
diff --git a/monetdb5/modules/mosaic/mosaic_dictionary_templates.h 
b/monetdb5/modules/mosaic/mosaic_dictionary_templates.h
--- a/monetdb5/modules/mosaic/mosaic_dictionary_templates.h
+++ b/monetdb5/modules/mosaic/mosaic_dictionary_templates.h
@@ -27,6 +27,7 @@ MOSprepareDictionaryContext_SIGNATURE(ME
                throw(MAL,"mosaic." STRINGIFY(METHOD) ,MAL_MALLOC_FAIL);
        }
        (*info)->previous_start = task->start;
+       (*info)->previous_limit = 0;
 
        BAT *ngid = NULL, *next = NULL, *freq = NULL;
        BAT* source_copy = NULL;
@@ -302,7 +303,6 @@ MOSestimate_SIGNATURE(METHOD, TPE) {
                        while (o + 1 < BATcount(selection_vector) && ssv_val[o] 
== ssv_val[o+1]) {
                                freq += increment[++o];
                        }
-                       assert(val->cnt + freq < MOSAICMAXCNT);
                        val->cnt += freq;
                        delta_count += val->cnt ? 1 :0;
                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list