Changeset: 5d0e4ee7a8c8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d0e4ee7a8c8
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
Branch: default
Log Message:
Approve output
diffs (108 lines):
diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
@@ -1,11 +1,18 @@
create table ttt (a int, b int, c int);
select optimizer;
select def from optimizers() where name = optimizer;
+
explain copy into ttt from '/:\tmp/xyz';
-declare opt_pipe_name string; set opt_pipe_name = ( select optimizer );
-declare opt_pipe_def string; set opt_pipe_def = ( select def from
optimizers() where name = opt_pipe_name );
+
+declare opt_pipe_name string;
+set opt_pipe_name = ( select optimizer );
+
+declare opt_pipe_def string;
+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;
+
select def from optimizers() where name = optimizer;
explain copy into ttt from '/:\tmp/xyz';
drop table ttt;
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
@@ -46,13 +46,13 @@ Ready.
#create table ttt (a int, b int, c int);
#select optimizer;
-% . # table_name
+% .L # table_name
% single_value # name
% varchar # type
% 12 # length
[ "default_pipe" ]
#select def from optimizers() where name = optimizer;
-% . # table_name
+% .L # table_name
% def # name
% clob # type
% 448 # length
@@ -62,27 +62,31 @@ Ready.
% mal # name
% clob # type
% 153 # length
-function user.s2_1{autoCommit=true}():void;
-barrier X_32 := language.dataflow();
+function user.s4_1{autoCommit=true}():void;
+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_32;
+exit X_35;
X_17 := sql.append(X_2,"sys","ttt","a",X_13);
X_19 := sql.append(X_17,"sys","ttt","b",X_14);
X_23 := sql.append(X_19,"sys","ttt","c",X_15);
X_24 := aggr.count(X_15);
sql.affectedRows(X_23,X_24,"");
-end s2_1;
-# optimizer.mitosis()
-# optimizer.dataflow()
+end s4_1;
+# querylog.define("explain copy into ttt from
\\'/:\\\\tmp/xyz\\';","default_pipe")
+#declare opt_pipe_name string;
+#set opt_pipe_name = ( select optimizer );
+#declare opt_pipe_def string;
+#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;
-% . # table_name
+% .L # table_name
% single_value # name
% varchar # type
% 6 # length
[ "user_1" ]
#select def from optimizers() where name = optimizer;
-% . # table_name
+% .L # table_name
% def # name
% clob # type
% 471 # length
@@ -92,19 +96,18 @@ end s2_1;
% mal # name
% clob # type
% 153 # length
-function user.s5_1{autoCommit=true}():void;
-barrier X_33 := language.dataflow();
+function user.s12_1{autoCommit=true}():void;
+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_33;
+exit X_36;
X_17 := sql.append(X_2,"sys","ttt","a",X_13);
X_19 := sql.append(X_17,"sys","ttt","b",X_14);
X_24 := aggr.count(X_15);
X_23 := sql.append(X_19,"sys","ttt","c",X_15);
sql.affectedRows(X_23,X_24,"");
-end s5_1;
-# optimizer.mitosis()
-# optimizer.dataflow()
+end s12_1;
+# querylog.define("explain copy into ttt from
\\'/:\\\\tmp/xyz\\';","default_pipe")
#drop table ttt;
# 22:58:58 >
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
