Changeset: 070e93ee09b2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=070e93ee09b2
Modified Files:
        
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
Branch: Dec2016
Log Message:

Approve Windows output.


diffs (101 lines):

diff --git 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
--- 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
+++ 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
@@ -46,8 +46,8 @@ Ready.
 
 #create table ttt (a int, b int, c int);
 #select optimizer;
-% .L1 # table_name
-% L1 # name
+% .L2 # table_name
+% L2 # name
 % varchar # type
 % 12 # length
 [ "default_pipe"       ]
@@ -55,24 +55,24 @@ Ready.
 % .L1 # table_name
 % def # name
 % clob # type
-% 541 # length
-[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector();"
      ]
+% 579 # length
+[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.jit();optimizer.garbageCollector();"
        ]
 #explain copy into ttt from 'a:\tmp/xyz';
 % .explain # table_name
 % mal # name
 % clob # type
 % 129 # length
-function user.s4_1():void;
-    X_24:void := querylog.define("explain copy into ttt from 
\\'a:\\\\tmp/xyz\\';","default_pipe",12);
-barrier X_53 := language.dataflow();
-    X_1 := sql.mvc();
-    (X_11:bat[:int],X_12:bat[:int],X_13:bat[:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","a:\\tmp/xyz",-1,0,0,0);
-exit X_53;
-    X_14 := sql.append(X_1,"sys","ttt","a",X_11);
-    X_18 := sql.append(X_14,"sys","ttt","b",X_12);
-    X_20 := sql.append(X_18,"sys","ttt","c",X_13);
-    X_22 := aggr.count(X_13);
-    sql.affectedRows(X_20,X_22);
+function user.s8_1():void;
+    X_38:void := querylog.define("explain copy into ttt from 
\\'a:\\\\tmp/xyz\\';","default_pipe",12);
+barrier X_58 := language.dataflow();
+    X_0 := sql.mvc();
+    (X_21:bat[:int],X_22:bat[:int],X_23:bat[:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","a:\\tmp/xyz",-1,0,0,0,nil:str);
+exit X_58;
+    X_25 := sql.append(X_0,"sys","ttt","a",X_21);
+    X_30 := sql.append(X_25,"sys","ttt","b",X_22);
+    X_33 := sql.append(X_30,"sys","ttt","c",X_23);
+    X_35 := aggr.count(X_23);
+    sql.affectedRows(X_33,X_35);
 end user.s8_1;
 #inline               actions= 0 time=1 usec 
 #candidates           actions= 1 time=14 usec 
@@ -107,8 +107,8 @@ end user.s8_1;
 #set opt_pipe_def  = ( select def from optimizers() where name = opt_pipe_name 
);
 #set optimizer = 
substring(opt_pipe_def,0,length(opt_pipe_def)-length('optimizer.garbageCollector();'))
 || 'optimizer.sql_append();optimizer.garbageCollector();';
 #select optimizer;
-% .L1 # table_name
-% L1 # name
+% .L2 # table_name
+% L2 # name
 % varchar # type
 % 6 # length
 [ "user_1"     ]
@@ -116,24 +116,24 @@ end user.s8_1;
 % .L1 # table_name
 % def # name
 % clob # type
-% 564 # length
-[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.sql_append();optimizer.garbageCollector();"
       ]
+% 602 # length
+[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.jit();optimizer.sql_append();optimizer.garbageCollector();"
 ]
 #explain copy into ttt from 'Z:/tmp/xyz';
 % .explain # table_name
 % mal # name
 % clob # type
 % 128 # length
-function user.s12_1():void;
-    X_24:void := querylog.define("explain copy into ttt from 
\\'Z:/tmp/xyz\\';","user_1",12);
-barrier X_54 := language.dataflow();
-    X_1 := sql.mvc();
-    (X_11:bat[:int],X_12:bat[:int],X_13:bat[:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","Z:/tmp/xyz",-1,0,0,0);
-exit X_54;
-    X_14 := sql.append(X_1,"sys","ttt","a",X_11);
-    X_18 := sql.append(X_14,"sys","ttt","b",X_12);
-    X_22 := aggr.count(X_13);
-    X_20 := sql.append(X_18,"sys","ttt","c",X_13);
-    sql.affectedRows(X_20,X_22);
+function user.s24_1():void;
+    X_38:void := querylog.define("explain copy into ttt from 
\\'Z:/tmp/xyz\\';","user_1",12);
+barrier X_58 := language.dataflow();
+    X_0 := sql.mvc();
+    (X_21:bat[:int],X_22:bat[:int],X_23:bat[:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","Z:/tmp/xyz",-1,0,0,0,nil:str);
+exit X_58;
+    X_25 := sql.append(X_0,"sys","ttt","a",X_21);
+    X_30 := sql.append(X_25,"sys","ttt","b",X_22);
+    X_35 := aggr.count(X_23);
+    X_33 := sql.append(X_30,"sys","ttt","c",X_23);
+    sql.affectedRows(X_33,X_35);
 end user.s24_1;
 #inline               actions= 0 time=1 usec 
 #candidates           actions= 1 time=14 usec 
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to