Changeset: 5c158808a86d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5c158808a86d
Modified Files:
        sql/test/Tests/setoptimizer.stable.err
        sql/test/Tests/setoptimizer.stable.out
Branch: default
Log Message:

backout changeset d241f79dd5fa: let's please not approve incorrect error 
messages


diffs (132 lines):

diff --git a/sql/test/Tests/setoptimizer.stable.err 
b/sql/test/Tests/setoptimizer.stable.err
--- a/sql/test/Tests/setoptimizer.stable.err
+++ b/sql/test/Tests/setoptimizer.stable.err
@@ -80,14 +80,12 @@ stderr of test 'setoptimizer` in directo
 # 12:49:31 >  mclient -lsql -i --host=eir --port=36907 
 # 12:49:31 >  
 
-MAPI  = monetdb@vienna:33555
-QUERY = set optimizer=' optimizer.inline(); optimizer.remap(); 
optimizer.evaluate(); optimizer.costModel(); optimizer.coercions(); 
optimizer.emptySet(); optimizer.aliases(); optimizer.mergetable(); 
optimizer.deadcode(); optimizer.commonTerms(); optimizer.joinPath(); 
optimizer.reorder(); optimizer.deadcode(); optimizer.reduce(); 
optimizer.history(); optimizer.multiplex(); optimizer.accumulators(); 
optimizer.garbageCollector();'
-        select optimizer;
-
-        !select"
-MAPI  = monetdb@vienna:33555
+MAPI  = monetdb@sofia:38256
+QUERY = set optimizer='default,costModel';
+ERROR = !SET OPTIMIZER: 'inline' should be the first
+MAPI  = monetdb@sofia:38256
 QUERY = set optimizer='myfamous_pipe';
-
+ERROR = !SQLException:optimizer:Optimizer 'myfamous_pipe' pipeline does not 
exist, use default pipe instead
 
 # 19:12:49 >  
 # 19:12:49 >  Done.
diff --git a/sql/test/Tests/setoptimizer.stable.out 
b/sql/test/Tests/setoptimizer.stable.out
--- a/sql/test/Tests/setoptimizer.stable.out
+++ b/sql/test/Tests/setoptimizer.stable.out
@@ -15,54 +15,69 @@ stdout of test 'setoptimizer` in directo
 # MonetDB/SQL module v2.27.0 loaded
 
 Ready.
+# falling back to direct mode 
+# falling back to direct mode 
+# falling back to direct mode 
+# falling back to direct mode 
+# falling back to direct mode 
+#function user.main():void;
+#    clients.quit();
+#end main;
 
 
+# 20:30:45 >  
+# 20:30:45 >  mclient -lsql -umonetdb -Pmonetdb --host=alf --port=39627 
+# 20:30:45 >  
 
-
-
-
-
-
-
-
-
-
-
-# 23:37:05 >  
-# 23:37:05 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=vienna" 
"--port=33555"
-# 23:37:05 >  
-
+% . # table_name
+% single_value # name
+% varchar # type
+% 12 # length
+[ "default_pipe"       ]
+#select optimizer;
+% . # table_name
+% single_value # name
+% varchar # type
+% 3 # length
+[ "off"        ]
+#select optimizer;
+% . # table_name
+% single_value # name
+% varchar # type
+% 3 # length
+[ "off"        ]
+#select optimizer;
+% . # table_name
+% single_value # name
+% varchar # type
+% 2 # length
+[ "on" ]
+#select optimizer;
+% . # table_name
+% single_value # name
+% varchar # type
+% 2 # length
+[ "on" ]
 #select optimizer;
 % . # table_name
 % single_value # name
 % varchar # type
 % 12 # length
-[ "minimal_pipe"       ]
+[ "nov2009_pipe"       ]
 #select optimizer;
 % . # table_name
 % single_value # name
 % varchar # type
 % 12 # length
-[ "minimal_pipe"       ]
-#select * from optimizers();
-% .,   . # table_name
-% name,        def # name
-% clob,        clob # type
-% 18,  479 # length
-[ "minimal_pipe",      
"optimizer.inline();optimizer.remap();optimizer.deadcode();optimizer.multiplex();optimizer.garbageCollector();"
 ]
-[ "default_pipe",      
"optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.accumulators();optimizer.garbageCollector();"
 ]
-[ "no_mitosis_pipe",   
"optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.accumulators();optimizer.garbageCollector();"
     ]
-[ "sequential_pipe",   
"optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.history();optimizer.multiplex();optimizer.accumulators();optimizer.garbageCollector();"
  ]
-[ "accumulator_pipe",  
"optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.accumulators();optimizer.garbageCollector();"
   ]
-[ "recycler_pipe",     
"optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.deadcode();optimizer.recycle();optimizer.reduce();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();"
  ]
-[ "datacell_pipe",     
"optimizer.inline();optimizer.remap();optimizer.datacell();optimizer.garbageCollector();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.accumulators();optimizer.garbageCollector();"
       ]
-[ "datacyclotron_pipe",        
"optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.datacyclotron();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();"
    ]
-[ "derive_pipe",       
"optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.derivePath();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();"
   ]
-[ "dictionary_pipe",   
"optimizer.inline();optimizer.remap();optimizer.dictionary();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();"
     ]
-[ "compression_pipe",  
"optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.compression();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();"
       ]
-[ "user",      "myfamous_pipe" ]
+[ "nov2009_pipe"       ]
+#select optimizer;
+% . # table_name
+% single_value # name
+% varchar # type
+% 12 # length
+[ "default_pipe"       ]
 
-# 23:37:05 >  
-# 23:37:05 >  "Done."
-# 23:37:05 >  
+# 20:30:45 >  
+# 20:30:45 >  Done.
+# 20:30:45 >  
 
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to