MonetDB: headless - Move references to postponed optimizers

[mk]

Changeset: 67a66e1251ef for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=67a66e1251ef
Modified Files:
        monetdb5/optimizer/opt_mitosis.c
        monetdb5/optimizer/opt_wrapper.c
Branch: headless
Log Message:

Move references to postponed optimizers
Not everything is currently needed to get it running again.


diffs (62 lines):

diff --git a/monetdb5/optimizer/opt_mitosis.c b/monetdb5/optimizer/opt_mitosis.c
--- a/monetdb5/optimizer/opt_mitosis.c
+++ b/monetdb5/optimizer/opt_mitosis.c
@@ -129,9 +129,11 @@
 */
        if ( (i = OPTlegAdviceInternal(mb,stk,p)) > 0 )
                pieces = i;
+/*
        else
        if ( (i = OPTtarantulaAdviceInternal(mb,stk,p)) > 0 )
                pieces = i;
+*/
        else {
                /* ensure that GDKnr_threads partitions fit into main memory */
                r = (oid) (monet_memory / typewidth / threads);
diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -63,8 +63,8 @@
 /* TODO
 #include "opt_joinpath.h"
 #include "opt_joinselect.h"
+#include "opt_mapreduce.h"
 */
-#include "opt_mapreduce.h"
 #include "opt_mergetable.h"
 #include "opt_mitosis.h"
 #include "opt_multiplex.h"
@@ -82,7 +82,9 @@
 #include "opt_singleton.h"
 #include "opt_statistics.h"
 #include "opt_strengthReduction.h"
+/*
 #include "opt_tarantula.h"
+*/
 #include "opt_trace.h"
 
 str OPTwrapper (Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p){
@@ -195,10 +197,10 @@
        if( strcmp("optimizer.joinselect",optimizer) == 0)
                actions= OPTjoinselectImplementation(cntxt, mb,stk,p);
        else
-*/
        if( strcmp("optimizer.mapreduce",optimizer) == 0)
                actions= OPTmapreduceImplementation(cntxt, mb,stk,p);
        else
+*/
        if( strcmp("optimizer.mergetable",optimizer) == 0)
                actions= OPTmergetableImplementation(cntxt, mb,stk,p);
        else
@@ -250,9 +252,11 @@
        if( strcmp("optimizer.strengthReduction",optimizer) == 0)
                actions= OPTstrengthReductionImplementation(cntxt, mb,stk,p);
        else
+/*
        if( strcmp("optimizer.tarantula",optimizer) == 0)
                actions= OPTtarantulaImplementation(cntxt, mb,stk,p);
        else
+*/
        if( strcmp("optimizer.trace",optimizer) == 0)
                actions= OPTtraceImplementation(cntxt, mb,stk,p);
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list