Changeset: d08f48a5f055 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d08f48a5f055
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
Branch: default
Log Message:
Approve output.
diffs (136 lines):
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -61,18 +61,18 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 150 # length
+% 131 # length
function user.s4_1{autoCommit=true}():void;
- X_25:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",12);
-barrier X_34 := language.dataflow();
+ X_26:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",12);
+barrier X_35 := language.dataflow();
X_2 := sql.mvc();
- (X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0);
-exit X_34;
- X_16 := sql.append(X_2,"sys","ttt","a",X_13);
- X_18 := sql.append(X_16,"sys","ttt","b",X_14);
- X_20 := sql.append(X_18,"sys","ttt","c",X_15);
- X_22 := aggr.count(X_15);
- sql.affectedRows(X_20,X_22,"");
+ (X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0);
+exit X_35;
+ 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,"");
end user.s4_1;
#declare opt_pipe_name string;
#set opt_pipe_name = ( select optimizer );
@@ -95,18 +95,18 @@ end user.s4_1;
% .explain # table_name
% mal # name
% clob # type
-% 150 # length
+% 131 # length
function user.s12_1{autoCommit=true}():void;
- X_25:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",12);
-barrier X_35 := language.dataflow();
+ X_26:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",12);
+barrier X_36 := language.dataflow();
X_2 := sql.mvc();
- (X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0);
-exit X_35;
- X_16 := sql.append(X_2,"sys","ttt","a",X_13);
- X_18 := sql.append(X_16,"sys","ttt","b",X_14);
- X_22 := aggr.count(X_15);
- X_20 := sql.append(X_18,"sys","ttt","c",X_15);
- sql.affectedRows(X_20,X_22,"");
+ (X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0);
+exit X_36;
+ 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,"");
end user.s12_1;
#drop table ttt;
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
old mode 100644
new mode 100755
---
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
@@ -55,24 +55,22 @@ Ready.
% .L # table_name
% def # name
% clob # type
-% 470 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();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();"
]
+% 449 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();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();"
]
#explain copy into ttt from 'a:\tmp/xyz';
% .explain # table_name
% mal # name
% clob # type
-% 153 # length
+% 134 # length
function user.s4_1{autoCommit=true}():void;
- X_25:void := querylog.define("explain copy into ttt from
\\'a:\\\\tmp/xyz\\';","default_pipe");
-barrier X_34 := language.dataflow();
+ X_26:void := querylog.define("explain copy into ttt from
\\'a:\\\\tmp/xyz\\';","default_pipe",10);
X_2 := sql.mvc();
- (X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","a:\\tmp/xyz",-1:lng,0:lng,0);
-exit X_34;
- X_16 := sql.append(X_2,"sys","ttt","a",X_13);
- X_18 := sql.append(X_16,"sys","ttt","b",X_14);
- X_20 := sql.append(X_18,"sys","ttt","c",X_15);
- X_22 := aggr.count(X_15);
- sql.affectedRows(X_20,X_22,"");
+ (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);
+ 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,"");
end user.s4_1;
#declare opt_pipe_name string;
#set opt_pipe_name = ( select optimizer );
@@ -89,24 +87,22 @@ end user.s4_1;
% .L # table_name
% def # name
% clob # type
-% 493 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();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();"
]
+% 472 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();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();"
]
#explain copy into ttt from 'Z:/tmp/xyz';
% .explain # table_name
% mal # name
% clob # type
-% 152 # length
+% 133 # length
function user.s12_1{autoCommit=true}():void;
- X_25:void := querylog.define("explain copy into ttt from
\\'Z:/tmp/xyz\\';","user_1");
-barrier X_35 := language.dataflow();
+ X_26:void := querylog.define("explain copy into ttt from
\\'Z:/tmp/xyz\\';","user_1",10);
X_2 := sql.mvc();
- (X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","Z:/tmp/xyz",-1:lng,0:lng,0);
-exit X_35;
- X_16 := sql.append(X_2,"sys","ttt","a",X_13);
- X_18 := sql.append(X_16,"sys","ttt","b",X_14);
- X_22 := aggr.count(X_15);
- X_20 := sql.append(X_18,"sys","ttt","c",X_15);
- sql.affectedRows(X_20,X_22,"");
+ (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);
+ 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,"");
end user.s12_1;
#drop table ttt;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
