MonetDB: headless - Move optimizers out of the way

[mk]

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

Move optimizers out of the way


diffs (53 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
@@ -47,7 +47,7 @@
 */
 #include "monetdb_config.h"
 #include "opt_mitosis.h"
-#include "opt_octopus.h"
+/* #include "opt_octopus.h"*/
 #include "opt_tarantula.h"
 #include "mal_interpreter.h"
 #include "opt_statistics.h"
@@ -128,9 +128,9 @@
  * The pieces to be used may be overruled by the octopus and
  * tarantula optimizer.
 */
+/*
        if ( (i = OPTlegAdviceInternal(mb,stk,p)) > 0 )
                pieces = i;
-/*
        else
        if ( (i = OPTtarantulaAdviceInternal(mb,stk,p)) > 0 )
                pieces = i;
diff --git a/monetdb5/optimizer/opt_recycler.c 
b/monetdb5/optimizer/opt_recycler.c
--- a/monetdb5/optimizer/opt_recycler.c
+++ b/monetdb5/optimizer/opt_recycler.c
@@ -275,7 +275,7 @@
                }
                if( ( getFunctionId(p) == uselectRef || getFunctionId(p) == 
thetauselectRef)
                        && recycled[getArg(p,1)]) {
-                       if (!ATOMvarsized( getGDKtype( getArgType(mb,p,2)))) { 
+                       if (!ATOMvarsized( getArgType(mb,p,2).type )) { 
                                q = copyInstruction(p);
                                getArg(q,0)= newTmpVariable(mb, 
newMALtype(TYPE_any) ); 
                                if ( getFunctionId(p) == uselectRef )
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
@@ -210,12 +210,11 @@
        if( strcmp("optimizer.multiplex",optimizer) == 0)
                actions= OPTmultiplexImplementation(cntxt, mb,stk,p);
        else
+/*
        if( strcmp("optimizer.octopus",optimizer) == 0)
                actions= OPToctopusImplementation(cntxt, mb,stk,p);
        else
-       if( strcmp("optimizer.partitions",optimizer) == 0)
-               actions= OPToctopusImplementation(cntxt, mb,stk,p);
-       else
+*/
        if( strcmp("optimizer.prejoin",optimizer) == 0)
                actions= OPTprejoinImplementation(cntxt, mb,stk,p);
        else
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list