Changeset: 2c553a4cf891 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2c553a4cf891
Modified Files:
geom/BugTracker/Tests/X_crash.SF-1971632.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
Branch: Dec2016
Log Message:
Approved after changeset a977926e5870.
diffs (114 lines):
diff --git a/geom/BugTracker/Tests/X_crash.SF-1971632.stable.out
b/geom/BugTracker/Tests/X_crash.SF-1971632.stable.out
--- a/geom/BugTracker/Tests/X_crash.SF-1971632.stable.out
+++ b/geom/BugTracker/Tests/X_crash.SF-1971632.stable.out
@@ -29,8 +29,8 @@ Ready.
[ 1 ]
[ 1 ]
#select count(*) from geoms;
-% sys.L1 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
% bigint # type
% 1 # length
[ 4 ]
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
@@ -49,21 +49,21 @@ Ready.
% .L2 # table_name
% L2 # name
% varchar # type
-% 12 # length
-[ "default_pipe" ]
+% 15 # length
+[ "sequential_pipe" ]
#select def from optimizers() where name = optimizer;
% .L1 # table_name
% def # name
% clob # type
-% 579 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();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.jit();optimizer.garbageCollector();"
]
+% 538 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.jit();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
% clob # type
% 146 # length
-function user.s8_1():void;
- X_0:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",4:int);
+function user.s10_1():void;
+ X_0:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","sequential_pipe",4:int);
X_3 := sql.mvc();
(X_24:bat[:int],X_25:bat[:int],X_26:bat[:int]) :=
sql.copy_from(nil:ptr,"|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0:int,0:int,nil:str);
X_28 := sql.append(X_3,"sys","ttt","a",X_24);
@@ -71,7 +71,7 @@ function user.s8_1():void;
X_36 := sql.append(X_33,"sys","ttt","c",X_26);
X_38 := aggr.count(X_26);
sql.affectedRows(X_36,X_38);
-end user.s8_1;
+end user.s10_1;
#inline actions= 0 time=1 usec
#candidates actions= 1 time=14 usec
#remap actions= 0 time=3 usec
@@ -114,14 +114,14 @@ end user.s8_1;
% .L1 # table_name
% def # name
% clob # type
-% 602 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();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.jit();optimizer.sql_append();optimizer.garbageCollector();"
]
+% 561 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.jit();optimizer.sql_append();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
% clob # type
% 146 # length
-function user.s24_1():void;
+function user.s26_1():void;
X_0:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",4:int);
X_3 := sql.mvc();
(X_24:bat[:int],X_25:bat[:int],X_26:bat[:int]) :=
sql.copy_from(nil:ptr,"|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0:int,0:int,nil:str);
@@ -130,7 +130,7 @@ function user.s24_1():void;
X_38 := aggr.count(X_26);
X_36 := sql.append(X_33,"sys","ttt","c",X_26);
sql.affectedRows(X_36,X_38);
-end user.s24_1;
+end user.s26_1;
#inline actions= 0 time=1 usec
#candidates actions= 1 time=14 usec
#remap actions= 0 time=3 usec
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
@@ -71,7 +71,7 @@ function user.s8_1():void;
X_36 := sql.append(X_33,"sys","ttt","c",X_26);
X_38 := aggr.count(X_26);
sql.affectedRows(X_36,X_38);
-end user.s8_1;
+end user.s10_1;
#inline actions= 0 time=1 usec
#remap actions= 0 time=5 usec
#costmodel actions= 1 time=1 usec
@@ -125,7 +125,7 @@ function user.s24_1():void;
X_38 := aggr.count(X_26);
X_36 := sql.append(X_33,"sys","ttt","c",X_26);
sql.affectedRows(X_36,X_38);
-end user.s24_1;
+end user.s26_1;
#inline actions= 0 time=1 usec
#remap actions= 0 time=4 usec
#costmodel actions= 1 time=1 usec
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
@@ -21,7 +21,7 @@ Ready.
# 16:24:01 >
#debug select * from tables;
-mdb>#X_0=0@0:void := querylog.define("debug select * from
tables;","default_pipe",156:int);
+mdb>#X_0=0@0:void := querylog.define("debug select * from
tables;","sequential_pipe",156:int);
mdb>#X_198=nil:bat[:str] := bat.new(nil:str);
# 16:24:01 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
