MonetDB: holindex - joinselect: fix compilation after merge

[Fabian Groffen]

Changeset: cf750230689b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf750230689b
Modified Files:
        monetdb5/optimizer/opt_joinselect.mx
        monetdb5/optimizer/opt_wrapper.c
Branch: holindex
Log Message:

joinselect: fix compilation after merge


diffs (50 lines):

diff --git a/monetdb5/optimizer/opt_joinselect.mx 
b/monetdb5/optimizer/opt_joinselect.mx
--- a/monetdb5/optimizer/opt_joinselect.mx
+++ b/monetdb5/optimizer/opt_joinselect.mx
@@ -41,7 +41,7 @@ comment "Replace select with join select
         getModuleId(X) && getModuleId(X)==M)
 #define match3(X,M) (getModuleId(X) && getModuleId(X)==M) 
 
-@:exportOptimizer(joinselect)@
+opt_export int OPTjoinselectImplementation(Client cntxt, MalBlkPtr mb, 
MalStkPtr stk, InstrPtr p);
 
 #define OPTDEBUGjoinselect  if ( optDebug & (1 <<DEBUG_OPT_JOINSELECT) )
 
@@ -51,8 +51,9 @@ comment "Replace select with join select
 #include "opt_joinselect.h"
 #include "mal_interpreter.h"   /* for showErrors() */
 #include "mal_exception.h"
+#include "opt_statistics.h"
 
-static int
+int
 OPTjoinselectImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci)
 {
        InstrPtr p, *old, qs, qi, qu, qd, r, d, k;
@@ -313,7 +314,3 @@ end:
        GDKfree(pd);
        return 1;
 }
-@include optimizerWrapper.mx
-@c
-#include "opt_statistics.h"
-@:wrapOptimizer(joinselect,OPT_CHECK_ALL)@
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
@@ -57,6 +57,7 @@ All Rights Reserved.
 #include "opt_history.h"
 #include "opt_inline.h"
 #include "opt_joinpath.h"
+#include "opt_joinselect.h"
 #include "opt_mapreduce.h"
 #include "opt_mergetable.h"
 #include "opt_mitosis.h"
@@ -97,6 +98,7 @@ struct{
        {"history", &OPThistoryImplementation},
        {"inline", &OPTinlineImplementation},
        {"joinPath", &OPTjoinPathImplementation},
+       {"joinselect", &OPTjoinselectImplementation},
        {"mapreduce", &OPTmapreduceImplementation},
        {"mergetable", &OPTmergetableImplementation},
        {"mitosis", &OPTmitosisImplementation},
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list