Changeset: 8bd2c4eb82b2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8bd2c4eb82b2
Modified Files:
monetdb5/modules/mal/mosaic_dictionary.c
monetdb5/modules/mal/mosaic_frame.c
Branch: mosaic
Log Message:
Fix compilations
diffs (79 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
@@ -219,52 +219,13 @@ MOScreatedictionary(Client cntxt, MOStas
case TYPE_bte: break; // no compression achievable
case TYPE_sht: makeDict(sht); break;
case TYPE_int: makeDict(int); break;
+ case TYPE_lng: makeDict(lng); break;
case TYPE_oid: makeDict(oid); break;
case TYPE_flt: makeDict(flt); break;
case TYPE_dbl: makeDict(dbl); break;
#ifdef HAVE_HGE
case TYPE_hge: makeDict(hge); break;
#endif
- case TYPE_lng:
- { lng *val = ((lng*)task->src) + task->start;
- lng *dict = (lng*)hdr->dict,v;
- BUN limit = task->stop - task->start > MOSlimit()?
MOSlimit(): task->stop - task->start;
-
- for(i =0; i< limit; i++, val++){
- for(j= 0; j< hdr->dictsize; j++)
- if( dict[j] == *val) break;
- if ( j == hdr->dictsize){
- if ( hdr->dictsize == 256){
- int min = 0;
- // select low frequent candidate
- for(j=1;j<256;j++)
- if( cnt[min] <cnt[j])
min = j;
- j=min;
- cnt[j]=0;
- break;
- }
- dict[j] = *val;
- cnt[j]++;
- hdr->dictsize++;
- } else
- cnt[j]++;
- }
- // sort it
- for(i=0; i< (BUN) hdr->dictsize; i++)
- for(j=i+1; j< hdr->dictsize; j++)
- if(dict[i] >dict[j]){
- v= dict[i];
- dict[i] = dict[j];
- dict[j] = v;
- }
- hdr->bits = 1;
- hdr->mask =1;
- for( i=2 ; i < (BUN) hdr->dictsize; i *=2){
- hdr->bits++;
- hdr->mask = (hdr->mask <<1) | 1;
- }
- }
- break;
default:
mnstr_printf(cntxt->fdout,"#does not support dictionary type
%d\n",ATOMbasetype(task->type));
}
diff --git a/monetdb5/modules/mal/mosaic_frame.c
b/monetdb5/modules/mal/mosaic_frame.c
--- a/monetdb5/modules/mal/mosaic_frame.c
+++ b/monetdb5/modules/mal/mosaic_frame.c
@@ -95,14 +95,15 @@ MOSdump_frame(Client cntxt, MOStask task
void
MOSlayout_frame_hdr(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT
*binput, BAT *boutput, BAT *bproperties)
{
- lng cnt=0,i;
+ lng cnt=0,j=0;
+ int i;
char buf[BUFSIZ];
(void) cntxt;
- for(i=0; i< task->hdr->framesize; i++){
+ for(i=0; i< task->hdr->framesize; i++, j++){
MOSdump_frameInternal(buf, BUFSIZ, task,i);
BUNappend(btech, "frame_hdr", FALSE);
- BUNappend(bcount, &i, FALSE);
+ BUNappend(bcount, &j, FALSE);
BUNappend(binput, &cnt, FALSE);
BUNappend(boutput, &task->hdr->framefreq[i], FALSE);
BUNappend(bproperties, buf, FALSE);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
