Changeset: 5eeb3d417eac for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5eeb3d417eac
Removed Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/All
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
Branch: Dec2016
Log Message:
Reduce number of different outputs.
diffs (truncated from 486 to 300 lines):
diff --git a/monetdb5/extras/mal_optimizer_template/Tests/All
b/monetdb5/extras/mal_optimizer_template/Tests/All
--- a/monetdb5/extras/mal_optimizer_template/Tests/All
+++ b/monetdb5/extras/mal_optimizer_template/Tests/All
@@ -1,1 +1,1 @@
-opt_sql_append
+THREADS=1?opt_sql_append
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,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" ]
@@ -63,11 +63,9 @@ Ready.
% clob # type
% 126 # length
function user.s8_1():void;
- X_38:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",12);
-barrier X_58 := language.dataflow();
+ X_38:void := querylog.define("explain copy into ttt from
\\'/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","/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);
@@ -107,8 +105,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" ]
@@ -124,11 +122,9 @@ end user.s8_1;
% clob # type
% 126 # length
function user.s24_1():void;
- X_38:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",12);
-barrier X_58 := language.dataflow();
+ X_38:void := querylog.define("explain copy into ttt from
\\'/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","/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);
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
@@ -63,11 +63,9 @@ Ready.
% clob # type
% 129 # length
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_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);
-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);
@@ -75,32 +73,27 @@ exit X_58;
sql.affectedRows(X_33,X_35);
end user.s8_1;
#inline actions= 0 time=1 usec
-#candidates actions= 1 time=14 usec
-#remap actions= 0 time=3 usec
-#costModel actions= 1 time=12 usec
-#coercions actions=10 time=13 usec
-#evaluate actions= 0 time=2 usec
-#emptybind actions= 0 time=4 usec
-#pushselect actions= 0 time=3 usec
-#aliases actions= 0 time=4 usec
-#mitosis actions= 0 time=2 usec
-#mergetable actions= 0 time=17 usec
-#deadcode actions= 0 time=5 usec
-#aliases actions= 0 time=4 usec
-#constants actions= 0 time=5 usec
-#commonTerms actions= 0 time=4 usec
-#projectionpath actions= 0 time=3 usec
-#deadcode actions= 0 time=4 usec
-#reorder actions= 1 time=19 usec
-#reduce actions=33 time=23 usec
-#matpack actions= 0 time=3 usec
-#dataflow actions=31 time=20 usec
-#querylog actions= 0 time=0 usec
-#multiplex actions= 0 time=3 usec
-#generator actions= 0 time=1 usec
-#profiler actions= 1 time=6 usec
-#garbageCollector actions= 1 time=13 usec
-#total actions= 1 time=245 usec
+#remap actions= 0 time=5 usec
+#costmodel actions= 1 time=1 usec
+#coercion actions=11 time=16 usec
+#evaluate actions= 0 time=4 usec
+#emptybind actions= 0 time=12 usec
+#aliases actions= 0 time=6 usec
+#mergetable actions= 0 time=46 usec
+#deadcode actions= 0 time=7 usec
+#aliases actions= 0 time=6 usec
+#constants actions= 0 time=9 usec
+#commonTerms actions= 0 time=5 usec
+#projectionpath actions= 0 time=5 usec
+#deadcode actions= 0 time=6 usec
+#reorder actions= 1 time=38 usec
+#reduce actions=33 time=37 usec
+#matpack actions= 0 time=4 usec
+#multiplex actions= 0 time=5 usec
+#profiler actions= 1 time=0 usec
+#candidates actions= 1 time=1 usec
+#garbagecollector actions= 1 time=19 usec
+#total actions= 1 time=475 usec
#declare opt_pipe_name string;
#set opt_pipe_name = ( select optimizer );
#declare opt_pipe_def string;
@@ -124,11 +117,9 @@ end user.s8_1;
% clob # type
% 128 # length
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_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);
-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);
@@ -136,33 +127,28 @@ exit X_58;
sql.affectedRows(X_33,X_35);
end user.s24_1;
#inline actions= 0 time=1 usec
-#candidates actions= 1 time=14 usec
-#remap actions= 0 time=3 usec
-#costModel actions= 1 time=13 usec
-#coercions actions=10 time=14 usec
+#remap actions= 0 time=4 usec
+#costmodel actions= 1 time=1 usec
+#coercion actions=11 time=16 usec
#evaluate actions= 0 time=3 usec
-#emptybind actions= 0 time=3 usec
-#pushselect actions= 0 time=3 usec
-#aliases actions= 0 time=4 usec
-#mitosis actions= 0 time=2 usec
-#mergetable actions= 0 time=16 usec
-#deadcode actions= 0 time=4 usec
-#aliases actions= 0 time=4 usec
-#constants actions= 0 time=4 usec
-#commonTerms actions= 0 time=4 usec
-#projectionpath actions= 0 time=3 usec
-#deadcode actions= 0 time=4 usec
-#reorder actions= 1 time=19 usec
-#reduce actions=33 time=23 usec
-#matpack actions= 0 time=3 usec
-#dataflow actions=32 time=19 usec
-#querylog actions= 0 time=1 usec
-#multiplex actions= 0 time=3 usec
-#generator actions= 0 time=1 usec
-#profiler actions= 1 time=7 usec
-#optimizer.sql_append actions= 1 time=8 usec
-#garbageCollector actions= 1 time=19 usec
-#total actions= 1 time=261 usec
+#emptybind actions= 0 time=12 usec
+#aliases actions= 0 time=6 usec
+#mergetable actions= 0 time=94 usec
+#deadcode actions= 0 time=10 usec
+#aliases actions= 0 time=6 usec
+#constants actions= 0 time=9 usec
+#commonTerms actions= 0 time=6 usec
+#projectionpath actions= 0 time=5 usec
+#deadcode actions= 0 time=6 usec
+#reorder actions= 1 time=38 usec
+#reduce actions=33 time=39 usec
+#matpack actions= 0 time=4 usec
+#multiplex actions= 0 time=4 usec
+#profiler actions= 1 time=0 usec
+#candidates actions= 1 time=1 usec
+#optimizer.sql_append actions= 1 time=7 usec
+#garbagecollector actions= 1 time=18 usec
+#total actions= 1 time=541 usec
#drop table ttt;
# 22:58:58 >
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
deleted file mode 100644
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single
+++ /dev/null
@@ -1,112 +0,0 @@
-stdout of test 'opt_sql_append` in directory
'monetdb5/extras/mal_optimizer_template` itself:
-
-
-# 22:58:57 >
-# 22:58:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/manegold/_/Monet/HG/default/prefix/_/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=36275" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_mal_optimizer_template" "--set" "mal_listing=0"
-# 22:58:57 >
-
-# MonetDB 5 server v11.8.0
-# This is an unreleased version
-# Serving database 'mTests_extras_mal_optimizer_template', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 15.630 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://rome.ins.cwi.nl:36275/
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-Ready.
-# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.sql
-# loading sql script: 11_times.sql
-# loading sql script: 12_url.sql
-# loading sql script: 13_date.sql
-# loading sql script: 14_inet.sql
-# loading sql script: 15_history.sql
-# loading sql script: 16_tracelog.sql
-# loading sql script: 17_compress.sql
-# loading sql script: 18_dictionary.sql
-# loading sql script: 19_cluster.sql
-# loading sql script: 20_vacuum.sql
-# loading sql script: 21_dependency_functions.sql
-# loading sql script: 22_clients.sql
-# loading sql script: 23_skyserver.sql
-# loading sql script: 24_zorder.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 40_geom.sql
-# loading sql script: 80_udf.sql
-# loading sql script: 99_system.sql
-
-# 22:58:57 >
-# 22:58:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome"
"--port=36275"
-# 22:58:57 >
-
-#create table ttt (a int, b int, c int);
-#select optimizer;
-% .L1 # table_name
-% L1 # name
-% varchar # type
-% 12 # length
-[ "default_pipe" ]
-#select def from optimizers() where name = optimizer;
-% .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();"
]
-#explain copy into ttt from 'a:\tmp/xyz';
-% .explain # table_name
-% mal # name
-% clob # type
-% 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 );
-#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;
-% .L1 # table_name
-% L1 # name
-% varchar # type
-% 6 # length
-[ "user_1" ]
-#select def from optimizers() where name = optimizer;
-% .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();"
]
-#explain copy into ttt from 'Z:/tmp/xyz';
-% .explain # table_name
-% mal # name
-% clob # type
-% 128 # length
-function user.s12_1():void;
- X_38:void := querylog.define("explain copy into ttt from
\\'Z:/tmp/xyz\\';","user_1",10);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
