MonetDB: default - Dont forget to compile new pipes

[Martin Kersten]

Changeset: 0b6fc034c39c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0b6fc034c39c
Modified Files:
        monetdb5/optimizer/opt_pipes.c
        sql/backends/monet5/sql.mx
Branch: default
Log Message:

Dont forget to compile new pipes


diffs (45 lines):

diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -651,6 +651,7 @@ str
 addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name){
        int i, j, k;
        InstrPtr p;
+       str msg= MAL_SUCCEED;
        
        (void) cntxt;
 
@@ -659,7 +660,7 @@ addOptimizerPipe(Client cntxt, MalBlkPtr
                break;
 
        if ( pipes[i].mb == NULL) 
-               (void) compileOptimizer(cntxt,name);
+               msg =  compileOptimizer(cntxt,name);
        
        if ( pipes[i].mb) {
                for ( j =1; j < pipes[i].mb->stop-1; j++) {
@@ -670,5 +671,5 @@ addOptimizerPipe(Client cntxt, MalBlkPtr
                        pushInstruction(mb,p);
                }
        }
-       return MAL_SUCCEED;
+       return msg;
 }
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -2666,11 +2666,12 @@ setVariable(Client cntxt, MalBlkPtr mb, 
        if ( strcmp("optimizer",  varname)== 0) {
                str newopt = *(str *) getArgReference(stk,pci,3);
                if ( newopt) {
-                       msg = addOptimizerPipe(cntxt, mb, newopt);
+                       snprintf(buf,BUFSIZ,"user_%d",cntxt->idx);
+                       msg = addPipeDefinition(cntxt, buf, newopt);
                        if ( msg )
                                return msg;
                        if (stack_find_var(m, varname)) 
-                               stack_set_string(m, varname, newopt);
+                               stack_set_string(m, varname, buf);
                }
                return MAL_SUCCEED;
        }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list