Changeset: e09a054eeec4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e09a054eeec4
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/optimizer/Tests/dataflow3.stable.out
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: jit
Log Message:
Approve output
diffs (224 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
@@ -64,10 +64,10 @@ Ready.
% 118 # length
function user.s4_1():void;
X_24:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",12);
-barrier X_53 := language.dataflow();
+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","/tmp/xyz",-1,0,0,0);
-exit X_53;
+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_20 := sql.append(X_18,"sys","ttt","c",X_13);
@@ -98,10 +98,10 @@ end user.s4_1;
% 118 # length
function user.s12_1():void;
X_24:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",12);
-barrier X_54 := language.dataflow();
+barrier X_55 := 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","/tmp/xyz",-1,0,0,0);
-exit X_54;
+exit X_55;
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);
diff --git a/monetdb5/optimizer/Tests/dataflow3.stable.out
b/monetdb5/optimizer/Tests/dataflow3.stable.out
--- a/monetdb5/optimizer/Tests/dataflow3.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow3.stable.out
@@ -26,13 +26,13 @@ Ready.
#mdb.list("user","s1_0");
function user.s1_0():void;
-barrier X_47 := language.dataflow();
+barrier X_54 := language.dataflow();
X17 := bat.new(nil:oid,nil:wrd);
X54 := bat.new(nil:oid,nil:wrd);
X55 := bat.new(nil:oid,nil:wrd);
X56 := bat.new(nil:oid,nil:wrd);
X57 := bat.new(nil:oid,nil:wrd);
-exit X_47;
+exit X_54;
X59 :=
remote.connect("mapi:monetdb://volund.ins.cwi.nl:50000/sn4","monetdb","monetdb","msql");
remote.register(X59,"user","s1_0map");
X66 := remote.put(X59,X54);
diff --git
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
---
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
+++
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
@@ -22,7 +22,7 @@ Ready.
#debug select * from tables;
mdb>#X_151=0@0:void := querylog.define("debug select * from
tables;","default_pipe",515);
-mdb>#barrier X_579=false := language.dataflow();
+mdb>#barrier X_599=false := language.dataflow();
# 16:24:01 >
# 16:24:01 > "Done."
diff --git
a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
--- a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
+++ b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
@@ -51,8 +51,8 @@ function user.s5_1():void;
X_6:bat[:dbl] := sql.bind(X_2,"sys","tab_2826","d",0);
X_9 := algebra.projection(C_3,X_6);
X_10 := batcalc.flt(X_9);
- X_40:bat[:flt] := batmmath.log10(X_10);
- C_11 := algebra.thetasubselect(X_40,1,">");
+ X_42:bat[:flt] := batmmath.log10(X_10);
+ C_11 := algebra.thetasubselect(X_42,1,">");
X_13 := algebra.projection(C_11,X_9);
sql.resultSet(X_23,X_25,X_26,X_28,X_30,X_13);
end user.s5_1;
diff --git
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
---
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
+++
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
@@ -197,8 +197,8 @@ function user.s10_1():void;
(C_8,r1_9) := sql.bind(X_1,"sys","functions","name",2);
X_11:bat[:str] := sql.bind(X_1,"sys","functions","name",1);
X_13 := sql.projectdelta(C_2,X_5,C_8,r1_9,X_11);
- X_57:bat[:bit] := batalgebra.like(X_13,"%optimizers%":str);
- C_15 := algebra.subselect(X_57,true,true,true,false,false);
+ X_59:bat[:bit] := batalgebra.like(X_13,"%optimizers%":str);
+ C_15 := algebra.subselect(X_59,true,true,true,false,false);
X_17 := algebra.projection(C_15,X_13);
X_18:bat[:str] := sql.bind(X_1,"sys","functions","func",0);
(C_20,r1_28) := sql.bind(X_1,"sys","functions","func",2);
@@ -235,8 +235,8 @@ function user.s11_1():void;
(C_8,r1_9) := sql.bind(X_1,"sys","functions","name",2);
X_11:bat[:str] := sql.bind(X_1,"sys","functions","name",1);
X_13 := sql.projectdelta(C_2,X_5,C_8,r1_9,X_11);
- X_57:bat[:bit] := batalgebra.not_like(X_13,"%optimizers%":str);
- C_15 := algebra.subselect(X_57,true,true,true,false,false);
+ X_59:bat[:bit] := batalgebra.not_like(X_13,"%optimizers%":str);
+ C_15 := algebra.subselect(X_59,true,true,true,false,false);
X_17 := algebra.projection(C_15,X_13);
X_18:bat[:str] := sql.bind(X_1,"sys","functions","func",0);
(C_20,r1_28) := sql.bind(X_1,"sys","functions","func",2);
@@ -273,8 +273,8 @@ function user.s12_1():void;
(C_8,r1_9) := sql.bind(X_1,"sys","functions","name",2);
X_11:bat[:str] := sql.bind(X_1,"sys","functions","name",1);
X_13 := sql.projectdelta(C_2,X_5,C_8,r1_9,X_11);
- X_57:bat[:bit] := batalgebra.ilike(X_13,"%optimizers%":str);
- C_15 := algebra.subselect(X_57,true,true,true,false,false);
+ X_59:bat[:bit] := batalgebra.ilike(X_13,"%optimizers%":str);
+ C_15 := algebra.subselect(X_59,true,true,true,false,false);
X_17 := algebra.projection(C_15,X_13);
X_18:bat[:str] := sql.bind(X_1,"sys","functions","func",0);
(C_20,r1_28) := sql.bind(X_1,"sys","functions","func",2);
@@ -311,8 +311,8 @@ function user.s13_1():void;
(C_8,r1_9) := sql.bind(X_1,"sys","functions","name",2);
X_11:bat[:str] := sql.bind(X_1,"sys","functions","name",1);
X_13 := sql.projectdelta(C_2,X_5,C_8,r1_9,X_11);
- X_57:bat[:bit] := batalgebra.not_ilike(X_13,"%optimizers%":str);
- C_15 := algebra.subselect(X_57,true,true,true,false,false);
+ X_59:bat[:bit] := batalgebra.not_ilike(X_13,"%optimizers%":str);
+ C_15 := algebra.subselect(X_59,true,true,true,false,false);
X_17 := algebra.projection(C_15,X_13);
X_18:bat[:str] := sql.bind(X_1,"sys","functions","func",0);
(C_20,r1_28) := sql.bind(X_1,"sys","functions","func",2);
diff --git a/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
b/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
--- a/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
+++ b/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
@@ -79,8 +79,8 @@ Ready.
% owner, query, pipe, plan, mal # name
% clob, clob, clob, clob, int # type
% 7, 63, 12, 9, 2 # length
-[ "monetdb", "select 1;", "default_pipe", "user.s5_1", 21 ]
-[ "monetdb", "select owner, query, pipe, plan, mal from
sys.querylog_catalog;", "default_pipe", "user.s6_1", 53 ]
+[ "monetdb", "select 1;", "default_pipe", "user.s5_1", 46 ]
+[ "monetdb", "select owner, query, pipe, plan, mal from
sys.querylog_catalog;", "default_pipe", "user.s6_1", 80 ]
#select arguments, tuples from sys.querylog_calls;
% .querylog_calls, .querylog_calls # table_name
% arguments, tuples # name
@@ -93,9 +93,9 @@ Ready.
% owner, query, pipe, plan, mal, arguments, tuples # name
% clob, clob, clob, clob, int, clob, wrd # type
% 7, 63, 12, 9, 2, 17, 1 # length
-[ "monetdb", "select 1;", "default_pipe", "user.s5_1", 21,
"user.s5_1():void;", 1 ]
-[ "monetdb", "select owner, query, pipe, plan, mal from
sys.querylog_catalog;", "default_pipe", "user.s6_1", 53,
"user.s6_1():void;", 5 ]
-[ "monetdb", "select arguments, tuples from sys.querylog_calls;",
"default_pipe", "user.s7_1", 38, "user.s7_1():void;", 2 ]
+[ "monetdb", "select 1;", "default_pipe", "user.s5_1", 46,
"user.s5_1():void;", 1 ]
+[ "monetdb", "select owner, query, pipe, plan, mal from
sys.querylog_catalog;", "default_pipe", "user.s6_1", 80,
"user.s6_1():void;", 5 ]
+[ "monetdb", "select arguments, tuples from sys.querylog_calls;",
"default_pipe", "user.s7_1", 65, "user.s7_1():void;", 2 ]
#select * from sys.querylog_history;
% .querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history # table_name
% id, owner, defined, query, pipe, plan, mal, optimize,
start, stop, arguments, tuples, run, ship, cpu, io # name
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -52,8 +52,33 @@ Operation successful
| X_22 := bat.append(X_17,X_21,true);
|
| sql.resultSet(X_30,X_32,X_33,X_35,X_37,X_22);
|
| end user.s2_1;
|
+| #inline actions= 0 time=4 usec
|
+| #candidates actions= 1 time=35 usec
|
+| #remap actions= 0 time=5 usec
|
+| #costModel actions= 1 time=31 usec
|
+| #coercions actions= 1 time=31 usec
|
+| #evaluate actions= 0 time=5 usec
|
+| #emptybind actions= 0 time=6 usec
|
+| #pushselect actions= 3 time=37 usec
|
+| #aliases actions= 4 time=30 usec
|
+| #mergetable actions= 0 time=38 usec
|
+| #deadcode actions= 4 time=26 usec
|
+| #aliases actions= 0 time=6 usec
|
+| #constants actions= 4 time=18 usec
|
+| #commonTerms actions= 0 time=7 usec
|
+| #projectionpath actions= 0 time=5 usec
|
+| #reorder actions= 1 time=30 usec
|
+| #deadcode actions= 0 time=6 usec
|
+| #reduce actions=37 time=32 usec
|
+| #matpack actions= 0 time=4 usec
|
+| #querylog actions= 0 time=1 usec
|
+| #multiplex actions= 0 time=3 usec
|
+| #generator actions= 0 time=2 usec
|
+| #profiler actions= 1 time=13 usec
|
+| #garbageCollector actions= 1 time=19 usec
|
+| #total actions= 1 time=481 usec
|
+------------------------------------------------------------------------------------------------------+
-26 rows
+51 rows
# 15:15:37 >
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -68,8 +68,33 @@ Operation successful
| X_26:wrd := aggr.sum(X_25);
|
| sql.resultSet(".L3","L3","wrd",64,0,7,X_26);
|
| end user.s2_1;
|
+| #inline actions= 0 time=3 usec
|
+| #candidates actions= 1 time=25 usec
|
+| #remap actions= 0 time=3 usec
|
+| #costModel actions= 1 time=21 usec
|
+| #coercions actions= 1 time=36 usec
|
+| #evaluate actions= 0 time=4 usec
|
+| #emptybind actions= 0 time=4 usec
|
+| #pushselect actions= 3 time=34 usec
|
+| #aliases actions= 4 time=21 usec
|
+| #mergetable actions= 0 time=25 usec
|
+| #deadcode actions= 4 time=19 usec
|
+| #aliases actions= 0 time=5 usec
|
+| #constants actions= 2 time=17 usec
|
+| #commonTerms actions= 0 time=7 usec
|
+| #projectionpath actions= 0 time=5 usec
|
+| #reorder actions= 1 time=30 usec
|
+| #deadcode actions= 0 time=6 usec
|
+| #reduce actions=35 time=30 usec
|
+| #matpack actions= 0 time=5 usec
|
+| #querylog actions= 0 time=1 usec
|
+| #multiplex actions= 0 time=3 usec
|
+| #generator actions= 0 time=2 usec
|
+| #profiler actions= 1 time=14 usec
|
+| #garbageCollector actions= 1 time=17 usec
|
+| #total actions= 1 time=397 usec
|
+--------------------------------------------------------------------------------------------------+
-20 rows
+45 rows
# 19:39:11 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
