MonetDB: mosaic - Use proper comparisons for the dictionary

[Martin Kersten]

Changeset: 413b9ea5226a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=413b9ea5226a
Modified Files:
        monetdb5/modules/mal/mosaic_dictionary.c
Branch: mosaic
Log Message:

Use proper comparisons for the dictionary


diffs (41 lines):

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
@@ -116,15 +116,15 @@ MOSskip_dictionary(Client cntxt, MOStask
 }
 
 #define estimateDict(TPE)\
-{      TPE val = *(TPE*)task->src;\
+{      TPE *val = (TPE*)task->src;\
        TPE *dict = (TPE*)((char*)task->dst + 3 * MosaicBlkSize);\
        for(i =0; i<task->elm; i++, val++){\
                for(j= 0; j< *size; j++)\
-                       if( dict[j] == val) {cnt++;break;}\
+                       if( dict[j] == *val) {cnt++;break;}\
                if ( j == *size){\
                        if ( *size == task->dictsize)\
                                break;\
-                       dict[j] = val;\
+                       dict[j] = *val;\
                        *size= *size+1;\
                        cnt++;\
                }\
@@ -157,15 +157,15 @@ MOSestimate_dictionary(Client cntxt, MOS
        case TYPE_hge: estimateDict(hge); break;
 #endif
        case TYPE_int:
-               {       int val = *(int*)task->src;
+               {       int *val = (int*)task->src;
                        int *dict = (int*)((char*)task->dst + 3 * 
MosaicBlkSize);
                        for(i =0; i<task->elm; i++, val++){
                                for(j= 0; j< *size; j++)
-                                       if( dict[j] == val) {cnt++;break;}
+                                       if( dict[j] == *val) {cnt++;break;}
                                if ( j == *size){
                                        if ( *size == task->dictsize)
                                                break;
-                                       dict[j] = val;
+                                       dict[j] = *val;
                                        *size= *size+1;
                                        cnt++;
                                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list