Changeset: 70ec5b43fb67 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=70ec5b43fb67
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
Branch: default
Log Message:
Merge with default
diffs (47 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
@@ -63,17 +63,17 @@ Ready.
% clob # type
% 153 # length
function user.s4_1{autoCommit=true}():void;
-barrier X_33 := language.dataflow();
+ X_25:void := querylog.define("explain copy into ttt from
\\'a:\\\\tmp/xyz\\';","default_pipe");
+barrier X_34 := 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","a:\\tmp/xyz",-1:lng,0:lng,0);
-exit X_33;
+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,"");
-end s4_1;
-# querylog.define("explain copy into ttt from
\\'a:\\\\tmp/xyz\\';","default_pipe")
+end user.s4_1;
#declare opt_pipe_name string;
#set opt_pipe_name = ( select optimizer );
#declare opt_pipe_def string;
@@ -97,17 +97,17 @@ end s4_1;
% clob # type
% 152 # length
function user.s12_1{autoCommit=true}():void;
-barrier X_34 := language.dataflow();
+ X_25:void := querylog.define("explain copy into ttt from
\\'Z:/tmp/xyz\\';","user_1");
+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","Z:/tmp/xyz",-1:lng,0:lng,0);
-exit X_34;
+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,"");
-end s12_1;
-# querylog.define("explain copy into ttt from \\'Z:/tmp/xyz\\';","user_1")
+end user.s12_1;
#drop table ttt;
# 22:58:58 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
