MonetDB: jit - Add missing optimizer implementation

[Martin Kersten]

Changeset: 5d9d81919312 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d9d81919312
Modified Files:
        monetdb5/optimizer/opt_wrapper.c
Branch: jit
Log Message:

Add missing optimizer implementation


diffs (42 lines):

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
@@ -69,6 +69,7 @@ struct{
        {"costModel", &OPTcostModelImplementation},
        {"dataflow", &OPTdataflowImplementation},
        {"deadcode", &OPTdeadcodeImplementation},
+       {"emptycolumn", &OPTemptycolumnImplementation},
        {"evaluate", &OPTevaluateImplementation},
        {"factorize", &OPTfactorizeImplementation},
        {"garbageCollector", &OPTgarbageCollectorImplementation},
@@ -97,8 +98,7 @@ opt_export str OPTwrapper(Client cntxt, 
 
 str OPTwrapper (Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p){
        str modnme = "(NONE)";
-       str fcnnme = 0;
-       str msg= MAL_SUCCEED;
+       str fcnnme = "(NONE)";
        Symbol s= NULL;
        int i, actions = 0;
        char optimizer[256];
@@ -139,12 +139,6 @@ str OPTwrapper (Client cntxt, MalBlkPtr 
                stk= 0;
        } else if( p ) 
                removeInstruction(mb, p);
-       if( mb->errors ){
-               /* when we have errors, we still want to see them */
-               addtoMalBlkHistory(mb);
-               return MAL_SUCCEED;
-       }
-
 
        for ( i=0; codes[i].nme; i++)
                if ( strcmp(codes[i].nme, optimizer)== 0 ){
@@ -167,6 +161,6 @@ str OPTwrapper (Client cntxt, MalBlkPtr 
        addtoMalBlkHistory(mb);
        if ( mb->errors)
                throw(MAL, optimizer, PROGRAM_GENERAL ":%s.%s", modnme, fcnnme);
-       return msg;
+       return MAL_SUCCEED;
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list