MonetDB: default - Use the "user" pipe name

[Martin Kersten]

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

Use the "user" pipe name
A single "user" pipe can be introduced. It replaces the operation list.


diffs (29 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
@@ -2484,7 +2484,7 @@ setVariable(Client cntxt, MalBlkPtr mb, 
                        return msg;
                if ( newopt != NULL ) {
                        if (stack_find_var(m, varname)) 
-                               stack_set_string(m, varname, newopt);
+                               stack_set_string(m, varname, "user");
                        return MAL_SUCCEED;
                }
                throw(SQL, "sql.setVariable", "Failed to initialize optimizer 
pipeline");
diff --git a/sql/backends/monet5/sql_optimizer.c 
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -453,9 +453,11 @@ setOptimizer(str newopt)
                if ( optimizerpipe)
                        GDKfree(optimizerpipe);
                /* add/test user defined optimizerpath */
-               if ( !isOptimizerPipe(newopt) )
+               if ( !isOptimizerPipe(newopt) ) {
                        addPipeDefinition("user", newopt);
-               optimizerpipe = GDKstrdup(newopt);
+                       optimizerpipe = GDKstrdup("user");
+               } else
+                       optimizerpipe = GDKstrdup(newopt);
        } 
        return GDKstrdup(optimizerpipe);
 }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list