MonetDB: mosaic - Pre-merge actions

[Martin Kersten]

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

Pre-merge actions


diffs (76 lines):

diff --git a/monetdb5/modules/mal/mosaic.c b/monetdb5/modules/mal/mosaic.c
--- a/monetdb5/modules/mal/mosaic.c
+++ b/monetdb5/modules/mal/mosaic.c
@@ -153,7 +153,7 @@ static void
 MOSdumpTask(Client cntxt,MOStask task)
 {
        int i;
-       mnstr_printf(cntxt->fdout,"#type %d todo "LLFMT"\n", task->type, 
(lng)task->elm);
+       mnstr_printf(cntxt->fdout,"#type %d todo "BUNFMT"\n", task->type, 
task->elm);
        mnstr_printf(cntxt->fdout,"#wins ");
        for(i=0; i< MOSAIC_METHODS; i++)
                mnstr_printf(cntxt->fdout,LLFMT " ",task->wins[i]);
diff --git a/monetdb5/modules/mal/mosaic_rle.c 
b/monetdb5/modules/mal/mosaic_rle.c
--- a/monetdb5/modules/mal/mosaic_rle.c
+++ b/monetdb5/modules/mal/mosaic_rle.c
@@ -244,7 +244,7 @@ MOSsubselect_rle(Client cntxt,  MOStask 
        case TYPE_flt: MOSselect_rle(flt); break;
        case TYPE_dbl: MOSselect_rle(dbl); break;
        case TYPE_int:
-       // Expanded MOSselect_none for debugging
+       // Expanded MOSselect_rle for debugging
        {       int *val= (int*) (((char*) task->blk) + MosaicBlkSize);
 
                if( !*anti){
@@ -311,33 +311,15 @@ MOSsubselect_rle(Client cntxt,  MOStask 
                break;
        default:
                if( task->type == TYPE_timestamp){
-                       //MOSselect_none(timestamp);
+                       //MOSselect_rle(timestamp);
                }
        }
        task->lb = o;
        return MAL_SUCCEED;
-
-       (void) cntxt;
-       (void) task;
-       (void) low;
-       (void) hgh;
-       (void) li;
-       (void) hi;
-       (void) anti;
-       (void) first;
-       (void) last;
-       switch( task->type){
-       case TYPE_int:
-               // position the dst reader on first qualifying value
-               // inspect all non-compressed value
-       default:
-               ;
-       }
-       return MAL_SUCCEED;
 }
 /*
 static str
-MOSthetasubselect_none(Client cntxt,  MOStask task, void *low, void *hgh, int 
li, int hi, int anti){
+MOSthetasubselect_rle(Client cntxt,  MOStask task, void *low, void *hgh, int 
li, int hi, int anti){
        (void) cntxt;
        (void) task;
        (void) low;
@@ -348,13 +330,13 @@ MOSthetasubselect_none(Client cntxt,  MO
        return MAL_SUCCEED;
 }
 static str
-MOSleftfetchjoin_none(Client cntxt,  MOStask task){
+MOSleftfetchjoin_rle(Client cntxt,  MOStask task){
        (void) cntxt;
        (void) task;
        return MAL_SUCCEED;
 }
 static str
-MOSjoin_none(Client cntxt,  MOStask task){
+MOSjoin_rle(Client cntxt,  MOStask task){
        (void) cntxt;
        (void) task;
        return MAL_SUCCEED;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list