Changeset: f1cd38297654 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f1cd38297654
Modified Files:
monetdb5/modules/mosaic/mosaic.c
monetdb5/modules/mosaic/mosaic.h
monetdb5/modules/mosaic/mosaic_delta.c
monetdb5/modules/mosaic/mosaic_frame.c
Branch: mosaic
Log Message:
Remove code that is commented out.
diffs (131 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
@@ -1190,12 +1190,8 @@ MOSjoin(Client cntxt, MalBlkPtr mb, MalS
if ( bl->tmosaic){
MOSinit(task,bl);
- //task->stop = BATcount(br);
- //task->src= Tloc(br,0);
} else {
MOSinit(task,br);
- //task->stop = BATcount(bl);
- //task->src= Tloc(bl,0);
swapped=1;
}
task->lbat = bln;
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
@@ -159,8 +159,6 @@ typedef struct MOSTASK{
BAT *bsrc; // target column to extended with compressed
heap
char *src; // read pointer into source
- //BAT *index; // collection of unique elements
- //BAT *freq; // frequency of these elements
lng timer; // compression time
diff --git a/monetdb5/modules/mosaic/mosaic_delta.c
b/monetdb5/modules/mosaic/mosaic_delta.c
--- a/monetdb5/modules/mosaic/mosaic_delta.c
+++ b/monetdb5/modules/mosaic/mosaic_delta.c
@@ -101,15 +101,7 @@ MOSskip_delta(Client cntxt, MOStask task
task->blk = 0; // ENDOFLIST
}
-/* we can not re-use the old stat, because the starting value may be different
- if( task->range[MOSAIC_DELTA] > task->start + 1){\
- i = task->range[MOSAIC_DELTA] - task->start;\
- if( i * sizeof(TYPE) <= wordaligned(MosaicBlkSize +
sizeof(TYPE) + i-1,MosaicBlkRec))\
- return 0.0;\
- if(i) factor = ((flt) i * sizeof(TYPE))/
wordaligned(MosaicBlkSize + sizeof(TYPE) + i-1,MosaicBlkRec);\
- return factor;\
- }\
-*/
+
// append a series of values into the non-compressed block
#define Estimate_delta(TYPE, EXPR)\
{ TYPE *v = ((TYPE*)task->src) + task->start, val= *v, delta = 0;\
@@ -571,48 +563,6 @@ MOSthetaselect_delta(Client cntxt, MOSt
#ifdef HAVE_HGE
case TYPE_hge: thetaselect_delta(hge); break;
#endif
-/*
- case TYPE_int:
- { int low,hgh, v;
- low= hgh = int_nil;
- if ( strcmp(oper,"<") == 0){
- hgh= *(int*) val;
- hgh = PREVVALUEint(hgh);
- } else
- if ( strcmp(oper,"<=") == 0){
- hgh= *(int*) val;
- } else
- if ( strcmp(oper,">") == 0){
- low = *(int*) val;
- low = NEXTVALUEint(low);
- } else
- if ( strcmp(oper,">=") == 0){
- low = *(int*) val;
- } else
- if ( strcmp(oper,"!=") == 0){
- hgh= low= *(int*) val;
- anti++;
- } else
- if ( strcmp(oper,"==") == 0){
- hgh= low= *(int*) val;
- }
- v= *(int*) (((char*) task->blk) + MosaicBlkSize);
- task->dst = MOScodevector(task) + sizeof(int);
- for( ; first < last; first++, v+= *(bte*)task->dst,
task->dst++){
- if( (low == int_nil || v >= low) && (v <= hgh
|| hgh == int_nil) ){
- if ( !anti) {
- MOSskipit();
- *o++ = (oid) first;
- }
- } else
- if( anti){
- MOSskipit();
- *o++ = (oid) first;
- }
- }
- }
- break;
-*/
default:
if( task->type == TYPE_daytime)
thetaselect_delta(daytime);
@@ -666,22 +616,6 @@ MOSprojection_delta(Client cntxt, MOSta
#ifdef HAVE_HGE
case TYPE_hge: projection_delta(hge); break;
#endif
-/*
- case TYPE_int:
- { int val, *v;
- bte *delta;
- v= (int*) task->src;
- val = *(int*) (((char*) task->blk) + MosaicBlkSize);
- delta = (bte*) (((char*)task->blk + MosaicBlkSize) +
sizeof(int));
- for(; first < last; first++, val+= *delta, delta++){
- MOSskipit();
- *v++ = val;
- task->cnt++;
- }
- task->src = (char*) v;
- }
- break;
-*/
case TYPE_str:
// we only have to look at the index width, not the
values
switch(task->bsrc->twidth){
diff --git a/monetdb5/modules/mosaic/mosaic_frame.c
b/monetdb5/modules/mosaic/mosaic_frame.c
--- a/monetdb5/modules/mosaic/mosaic_frame.c
+++ b/monetdb5/modules/mosaic/mosaic_frame.c
@@ -38,7 +38,6 @@ MOSadvance_frame(Client cntxt, MOStask t
assert(cnt > 0);
task->start += (oid) cnt;
- //task->stop = task->stop;
bytes = (cnt * task->hdr->framebits)/8 + (((cnt *
task->hdr->framebits) %8) != 0) + sizeof(ulng);
task->blk = (MosaicBlk) (((char*) dst) + wordaligned(bytes, lng));
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
