MonetDB: default - Handle replacement of optimizer

[Martin Kersten]

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

Handle replacement of optimizer


diffs (24 lines):

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
@@ -2667,11 +2667,15 @@ setVariable(Client cntxt, MalBlkPtr mb, 
                str newopt = *(str *) getArgReference(stk,pci,3);
                if ( 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, buf);
+                       if ( ! isOptimizerPipe(newopt) || strcmp(buf,newopt) == 
0){
+                               msg = addPipeDefinition(cntxt, buf, newopt);
+                               if ( msg )
+                                       return msg;
+                               if (stack_find_var(m, varname)) 
+                                       stack_set_string(m, varname, buf);
+                       } else
+                               if (stack_find_var(m, varname)) 
+                                       stack_set_string(m, varname, newopt);
                }
                return MAL_SUCCEED;
        }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list