Changeset: 47950c7cf1a1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47950c7cf1a1
Modified Files:
monetdb5/modules/mosaic/mosaic.h
monetdb5/modules/mosaic/mosaic_calendar.c
monetdb5/modules/mosaic/mosaic_delta.c
monetdb5/modules/mosaic/mosaic_dictionary.c
monetdb5/modules/mosaic/mosaic_frame.c
monetdb5/modules/mosaic/mosaic_prefix.c
monetdb5/modules/mosaic/mosaic_raw.c
monetdb5/modules/mosaic/mosaic_runlength.c
Branch: mosaic
Log Message:
Fix the candidate list book keeping.
diffs (129 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
@@ -178,7 +178,7 @@ if ( task->n && task->cl ){\
if (task->n <= 0 || *task->cl > (oid) first )\
continue;\
if ( *task->cl == (oid) first ){\
- task->cl++; \
+ task->cl++; task->n--; \
}\
} else if (task->cl) continue;
diff --git a/monetdb5/modules/mosaic/mosaic_calendar.c
b/monetdb5/modules/mosaic/mosaic_calendar.c
--- a/monetdb5/modules/mosaic/mosaic_calendar.c
+++ b/monetdb5/modules/mosaic/mosaic_calendar.c
@@ -539,7 +539,6 @@ MOSthetaselect_calendar(Client cntxt, M
MOSskipit();\
j= getBitVector(base,i,(int) hdr->bits ); \
*v++ = task->hdr->dict.val##TPE[(j>>MASKBITS) &
task->hdr->mask] | ( j & MASKDAY);\
- task->n--;\
task->cnt++;\
}\
task->src = (char*) v;\
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
@@ -643,7 +643,6 @@ MOSthetaselect_delta(Client cntxt, MOSt
for(; first < last; first++, val+= *delta,delta++){\
MOSskipit();\
*v++ = val;\
- task->n--;\
task->cnt++;\
}\
task->src = (char*) v;\
@@ -677,7 +676,6 @@ MOSprojection_delta(Client cntxt, MOSta
for(; first < last; first++, val+= *delta, delta++){
MOSskipit();
*v++ = val;
- task->n--;
task->cnt++;
}
task->src = (char*) v;
diff --git a/monetdb5/modules/mosaic/mosaic_dictionary.c
b/monetdb5/modules/mosaic/mosaic_dictionary.c
--- a/monetdb5/modules/mosaic/mosaic_dictionary.c
+++ b/monetdb5/modules/mosaic/mosaic_dictionary.c
@@ -711,7 +711,6 @@ MOSthetaselect_dictionary(Client cntxt,
MOSskipit();\
j= getBitVector(base,i,(int) hdr->bits); \
*v++ = task->hdr->dict.val##TPE[j];\
- task->n--;\
task->cnt++;\
}\
task->src = (char*) v;\
@@ -747,7 +746,6 @@ MOSprojection_dictionary(Client cntxt,
MOSskipit();
j= getBitVector(base,i,(int) hdr->bits); \
*v++ = task->hdr->dict.valint[j];
- task->n--;
task->cnt++;
}
task->src = (char*) v;
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
@@ -566,7 +566,6 @@ MOSthetaselect_frame(Client cntxt, MOSt
MOSskipit();\
framedecompress(i);\
*v++ = frame + task->hdr->frame.val##TPE[j];\
- task->n--;\
task->cnt++;\
}\
}
diff --git a/monetdb5/modules/mosaic/mosaic_prefix.c
b/monetdb5/modules/mosaic/mosaic_prefix.c
--- a/monetdb5/modules/mosaic/mosaic_prefix.c
+++ b/monetdb5/modules/mosaic/mosaic_prefix.c
@@ -972,7 +972,6 @@ MOSthetaselect_prefix(Client cntxt, MOS
v = val | decompress(base,i,bits);\
value = (TPE) ((TPE2)val |(TPE2) v);\
*r++ = value;\
- task->n--;\
task->cnt++;\
}\
task->src = (char*) r;\
@@ -1010,7 +1009,6 @@ MOSprojection_prefix(Client cntxt, MOSt
v = val | decompress(base,i,bits);
value = (flt) ((unsigned int)val |(unsigned int) v);
*r++ = value;
- task->n--;
task->cnt++;
}
task->src = (char*) r;
diff --git a/monetdb5/modules/mosaic/mosaic_raw.c
b/monetdb5/modules/mosaic/mosaic_raw.c
--- a/monetdb5/modules/mosaic/mosaic_raw.c
+++ b/monetdb5/modules/mosaic/mosaic_raw.c
@@ -577,7 +577,6 @@ MOSthetaselect_raw(Client cntxt, MOStas
for(; first < last; first++, val++){\
MOSskipit();\
*v++ = *val;\
- task->n--;\
task->cnt++;\
}\
task->src = (char*) v;\
@@ -610,7 +609,6 @@ MOSprojection_raw(Client cntxt, MOStask
for(; first < last; first++, val++){
MOSskipit();
*v++ = *val;
- task->n--;
task->cnt++;
}
task->src = (char*) v;
diff --git a/monetdb5/modules/mosaic/mosaic_runlength.c
b/monetdb5/modules/mosaic/mosaic_runlength.c
--- a/monetdb5/modules/mosaic/mosaic_runlength.c
+++ b/monetdb5/modules/mosaic/mosaic_runlength.c
@@ -621,7 +621,6 @@ MOSthetaselect_runlength(Client cntxt,
for(; first < last; first++){\
MOSskipit();\
*v++ = val;\
- task->n--;\
task->cnt++;\
}\
task->src = (char*) v;\
@@ -655,7 +654,6 @@ MOSprojection_runlength(Client cntxt, M
for(; first < last; first++){
MOSskipit();
*v++ = val;
- task->n--;
task->cnt++;
}
task->src = (char*) v;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
