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

Approvals.


diffs (148 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
@@ -56,23 +56,23 @@ Ready.
 % def # name
 % clob # type
 % 541 # length
-[ 
"optimizer.inline();optimizer.candidates();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.garbageCollector();"
      ]
+[ 
"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();"
      ]
 #explain copy into ttt from 'a:\tmp/xyz';
 % .explain # table_name
 % mal # name
 % clob # type
-% 121 # length
+% 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);
+    X_38:void := querylog.define("explain copy into ttt from 
\\'a:\\\\tmp/xyz\\';","default_pipe",12);
+barrier X_57 := 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_57;
+    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.s4_1;
 #declare opt_pipe_name string;
 #set opt_pipe_name = ( select optimizer );
@@ -90,23 +90,23 @@ end user.s4_1;
 % def # name
 % clob # type
 % 564 # length
-[ 
"optimizer.inline();optimizer.candidates();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.sql_append();optimizer.garbageCollector();"
       ]
+[ 
"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();"
       ]
 #explain copy into ttt from 'Z:/tmp/xyz';
 % .explain # table_name
 % mal # name
 % clob # type
-% 120 # length
+% 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);
+    X_38:void := querylog.define("explain copy into ttt from 
\\'Z:/tmp/xyz\\';","user_1",12);
+barrier X_57 := 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_57;
+    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.s12_1;
 #drop table ttt;
 
diff --git 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single
 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single
--- 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single
+++ 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single
@@ -55,22 +55,22 @@ Ready.
 % .L # table_name
 % def # name
 % clob # type
-% 449 # length
-[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();"
  ]
+% 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();"
      ]
 #explain copy into ttt from 'a:\tmp/xyz';
 % .explain # table_name
 % mal # name
 % clob # type
-% 136 # length
-function user.s4_1{autoCommit=true}():void;
-    X_26:void := querylog.define("explain copy into ttt from 
\\'a:\\\\tmp/xyz\\';","default_pipe",10);
-    X_2 := sql.mvc();
-    (X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","a:\\tmp/xyz",-1,0,0,0);
-    X_15 := sql.append(X_2,"sys","ttt","a",X_12);
-    X_19 := sql.append(X_15,"sys","ttt","b",X_13);
-    X_21 := sql.append(X_19,"sys","ttt","c",X_14);
-    X_23 := aggr.count(X_14);
-    sql.affectedRows(X_21,X_23,"");
+% 129 # length
+function user.s4_1():void;
+    X_38:void := querylog.define("explain copy into ttt from 
\\'a:\\\\tmp/xyz\\';","default_pipe",10);
+    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);
+    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.s4_1;
 #declare opt_pipe_name string;
 #set opt_pipe_name = ( select optimizer );
@@ -87,22 +87,22 @@ end user.s4_1;
 % .L # table_name
 % def # name
 % clob # type
-% 472 # length
-[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.sql_append();optimizer.garbageCollector();"
   ]
+% 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();"
       ]
 #explain copy into ttt from 'Z:/tmp/xyz';
 % .explain # table_name
 % mal # name
 % clob # type
-% 135 # length
-function user.s12_1{autoCommit=true}():void;
-    X_26:void := querylog.define("explain copy into ttt from 
\\'Z:/tmp/xyz\\';","user_1",10);
-    X_2 := sql.mvc();
-    (X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","Z:/tmp/xyz",-1,0,0,0);
-    X_15 := sql.append(X_2,"sys","ttt","a",X_12);
-    X_19 := sql.append(X_15,"sys","ttt","b",X_13);
-    X_23 := aggr.count(X_14);
-    X_21 := sql.append(X_19,"sys","ttt","c",X_14);
-    sql.affectedRows(X_21,X_23,"");
+% 128 # length
+function user.s12_1():void;
+    X_38:void := querylog.define("explain copy into ttt from 
\\'Z:/tmp/xyz\\';","user_1",10);
+    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);
+    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.s12_1;
 #drop table ttt;
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to