Changeset: 89246091e13b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=89246091e13b
Modified Files:
clients/Tests/exports.stable.out
monetdb5/optimizer/Tests/dataflow3.stable.out
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/mergetables/Tests/mergequery.stable.out
Branch: default
Log Message:
Approvals.
diffs (truncated from 846 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1566,7 +1566,6 @@ int OPTmultiplexImplementation(Client cn
str OPTmultiplexSimple(Client cntxt, MalBlkPtr mb);
str OPTorcam(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
int OPTorcamImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
-int OPTpostfixImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTprofilerImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTprojectionpathImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTpushselectImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
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/explain_gives_crash.SF-2741829.stable.out
b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
--- a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
+++ b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
@@ -1,29 +1,32 @@
stdout of test 'explain_gives_crash.SF-2741829` in directory
'sql/test/BugTracker-2009` itself:
-# 22:45:54 >
-# 22:45:54 > mserver5
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=35519 --set
xrpc_port=48894 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
-# 22:45:54 >
+# 16:38:46 >
+# 16:38:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38761" "--set"
"mapi_usock=/var/tmp/mtest-29376/.s.monetdb.38761" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/sjoerd/Monet-devel/var/MonetDB/mTests_sql_test_BugTracker-2009"
"--set" "embedded_r=yes"
+# 16:38:46 >
-# MonetDB server v5.12.0, based on kernel v1.30.0
-# Serving database 'mTests_src_test_BugTracker-2009', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# MonetDB 5 server v11.24.0 (hg id: 934dbfa3c66b)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2009', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.518 GiB available main-memory.
# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:35519/
-# MonetDB/SQL module v2.30.0 loaded
+# 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://meeuw.mullender.nl:38761/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-29376/.s.monetdb.38761
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
Ready.
-#function user.main():void;
-# clients.quit();
-#end main;
+# 16:38:46 >
+# 16:38:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29376" "--port=38761"
+# 16:38:46 >
-# 21:13:40 >
-# 21:13:40 > mclient -lsql -i --host=alf --port=39638
-# 21:13:40 >
-
+#set optimizer='sequential_pipe';
+#create table blabla(id integer);
#~BeginVariableOutput~#
function user.s4_1():void;
" X_32:void := querylog.define(""explain alter table blabla add constraint
dada unique (id);"",""sequential_pipe"",22);"
@@ -47,30 +50,30 @@ function user.s4_1():void;
" sql.assert(X_28,""UPDATE: UNIQUE constraint 'blabla.dada' violated"");"
sql.exportOperation();
end user.s4_1;
-#inline actions= 0 time=4 usec
-#candidates actions= 1 time=44 usec
-#remap actions= 0 time=6 usec
-#costModel actions= 1 time=38 usec
-#coercions actions= 7 time=35 usec
-#evaluate actions= 0 time=6 usec
-#aliases actions= 0 time=10 usec
-#pushselect actions= 3 time=60 usec
-#mergetable actions= 0 time=47 usec
-#deadcode actions= 2 time=35 usec
-#aliases actions= 0 time=10 usec
-#constants actions= 1 time=45 usec
-#commonTerms actions= 0 time=9 usec
-#projectionpath actions= 0 time=6 usec
-#reorder actions= 1 time=55 usec
-#deadcode actions= 0 time=9 usec
-#reduce actions=28 time=63 usec
-#matpack actions= 0 time=7 usec
-#querylog actions= 0 time=1 usec
-#multiplex actions= 0 time=14 usec
-#generator actions= 0 time=4 usec
-#profiler actions= 1 time=30 usec
-#garbageCollector actions= 1 time=42 usec
-#total actions= 1 time=685 usec
+#inline actions= 0 time=8 usec
+#candidates actions= 1 time=107 usec
+#remap actions= 0 time=13 usec
+#costModel actions= 1 time=93 usec
+#coercions actions= 7 time=88 usec
+#evaluate actions= 0 time=14 usec
+#aliases actions= 0 time=22 usec
+#pushselect actions= 3 time=153 usec
+#mergetable actions= 0 time=105 usec
+#deadcode actions= 2 time=78 usec
+#aliases actions= 0 time=21 usec
+#constants actions= 1 time=73 usec
+#commonTerms actions= 0 time=20 usec
+#projectionpath actions= 0 time=12 usec
+#reorder actions= 1 time=120 usec
+#deadcode actions= 0 time=19 usec
+#reduce actions=28 time=150 usec
+#matpack actions= 0 time=14 usec
+#querylog actions= 0 time=3 usec
+#multiplex actions= 0 time=12 usec
+#generator actions= 0 time=6 usec
+#profiler actions= 1 time=57 usec
+#garbageCollector actions= 1 time=90 usec
+#total actions= 1 time=1470 usec
function user.s5_1():void;
" X_32:void := querylog.define(""explain alter table blabla add constraint
dada unique (id);"",""sequential_pipe"",22);"
X_1 := sql.mvc();
@@ -93,6 +96,30 @@ function user.s5_1():void;
" sql.assert(X_28,""UPDATE: UNIQUE constraint 'blabla.dada' violated"");"
sql.exportOperation();
end user.s5_1;
+#inline actions= 0 time=7 usec
+#candidates actions= 1 time=93 usec
+#remap actions= 0 time=12 usec
+#costModel actions= 1 time=79 usec
+#coercions actions= 7 time=75 usec
+#evaluate actions= 0 time=12 usec
+#aliases actions= 0 time=20 usec
+#pushselect actions= 3 time=108 usec
+#mergetable actions= 0 time=95 usec
+#deadcode actions= 2 time=69 usec
+#aliases actions= 0 time=18 usec
+#constants actions= 1 time=64 usec
+#commonTerms actions= 0 time=15 usec
+#projectionpath actions= 0 time=11 usec
+#reorder actions= 1 time=104 usec
+#deadcode actions= 0 time=16 usec
+#reduce actions=28 time=126 usec
+#matpack actions= 0 time=13 usec
+#querylog actions= 0 time=2 usec
+#multiplex actions= 0 time=10 usec
+#generator actions= 0 time=6 usec
+#profiler actions= 1 time=52 usec
+#garbageCollector actions= 1 time=72 usec
+#total actions= 1 time=1255 usec
#~EndVariableOutput~#
#~BeginVariableOutput~#
function user.s9_1():void;
@@ -117,9 +144,33 @@ function user.s9_1():void;
" sql.assert(X_28,""UPDATE: UNIQUE constraint 'blabla.dada' violated"");"
sql.exportOperation();
end user.s9_1;
+#inline actions= 0 time=6 usec
+#candidates actions= 1 time=93 usec
+#remap actions= 0 time=11 usec
+#costModel actions= 1 time=78 usec
+#coercions actions= 7 time=73 usec
+#evaluate actions= 0 time=12 usec
+#aliases actions= 0 time=20 usec
+#pushselect actions= 3 time=105 usec
+#mergetable actions= 0 time=90 usec
+#deadcode actions= 2 time=68 usec
+#aliases actions= 0 time=18 usec
+#constants actions= 1 time=65 usec
+#commonTerms actions= 0 time=15 usec
+#projectionpath actions= 0 time=12 usec
+#reorder actions= 1 time=104 usec
+#deadcode actions= 0 time=17 usec
+#reduce actions=28 time=126 usec
+#matpack actions= 0 time=12 usec
+#querylog actions= 0 time=2 usec
+#multiplex actions= 0 time=11 usec
+#generator actions= 0 time=6 usec
+#profiler actions= 1 time=54 usec
+#garbageCollector actions= 1 time=69 usec
+#total actions= 1 time=1219 usec
#~EndVariableOutput~#
-# 11:37:28 >
-# 11:37:28 > Done.
-# 11:37:28 >
+# 16:38:46 >
+# 16:38:46 > "Done."
+# 16:38:46 >
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_1=0@0:void := user.s1_1();
-mdb>#X_159=0@0:void := querylog.define("debug select * from
tables;","default_pipe",630);
+mdb>#X_159=0@0:void := querylog.define("debug select * from
tables;","default_pipe",374);
# 16:24:01 >
# 16:24:01 > "Done."
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
@@ -47,7 +47,7 @@ Ready.
% 191 # length
function user.s2_1():void;
X_47:void := querylog.define("explain\nselect t1.subject as id1,
t2.subject as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between
t1.pre and t1.pre + t1.size;","default_pipe",37);
-barrier X_61 := language.dataflow();
+barrier X_80 := language.dataflow();
X_24 := bat.new(nil:oid,nil:str);
X_32 := bat.append(X_24,"sys.L");
X_41 := bat.append(X_32,"sys.L");
@@ -79,7 +79,7 @@ barrier X_61 := language.dataflow();
language.pass(X_8);
language.pass(C_2);
language.pass(X_20);
-exit X_61;
+exit X_80;
sql.resultSet(X_41,X_42,X_44,X_45,X_46,X_21,X_22);
end user.s2_1;
#ROLLBACK;
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
@@ -47,7 +47,7 @@ Ready.
% 191 # length
function user.s2_1():void;
X_49:void := querylog.define("explain\nselect t1.subject as id1,
t2.subject as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between
t1.pre and t1.pre + t1.size;","default_pipe",39);
-barrier X_63 := language.dataflow();
+barrier X_82 := language.dataflow();
X_26 := bat.new(nil:oid,nil:str);
X_34 := bat.append(X_26,"sys.L");
X_43 := bat.append(X_34,"sys.L");
@@ -81,7 +81,7 @@ barrier X_63 := language.dataflow();
language.pass(X_9);
language.pass(C_2);
language.pass(X_22);
-exit X_63;
+exit X_82;
sql.resultSet(X_43,X_44,X_46,X_47,X_48,X_23,X_24);
end user.s2_1;
#ROLLBACK;
diff --git
a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
@@ -63,16 +63,16 @@ function user.s2_1():void;
X_42 := bat.append(X_33,0);
X_48 := bat.append(X_42,0);
X_1 := sql.mvc();
- C_2:bat[:oid,:oid] := sql.tid(X_1,"sys","treeitems");
- X_5:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","pre",0);
+ C_2:bat[:oid] := sql.tid(X_1,"sys","treeitems");
+ X_5:bat[:lng] := sql.bind(X_1,"sys","treeitems","pre",0);
X_8 := algebra.projection(C_2,X_5);
X_9 := batcalc.hge(X_8);
- X_10:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","size",0);
+ X_10:bat[:lng] := sql.bind(X_1,"sys","treeitems","size",0);
X_12 := algebra.projection(C_2,X_10);
X_13 := batcalc.hge(X_12);
- X_14:bat[:oid,:hge] := batcalc.+(X_9,X_13);
+ X_14:bat[:hge] := batcalc.+(X_9,X_13);
(X_15,r1_22) :=
algebra.subrangejoin(X_9,X_9,X_14,nil:BAT,nil:BAT,true,true,nil:lng);
- X_20:bat[:oid,:int] := sql.bind(X_1,"sys","treeitems","subject",0);
+ X_20:bat[:int] := sql.bind(X_1,"sys","treeitems","subject",0);
X_22 := algebra.projection(C_2,X_20);
X_23 := algebra.projection(r1_22,X_22);
X_24 := algebra.projection(X_15,X_22);
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -4864,7 +4864,7 @@ insert into sys.args values (11147, 1303
insert into sys.functions values (1304, 'code', 'unicode', 'str', 0, 1, false,
false, false, 2000);
insert into sys.args values (11148, 1304, 'res_0', 'char', 0, 0, 0, 0);
insert into sys.args values (11149, 1304, 'arg_1', 'int', 32, 0, 1, 1);
-insert into sys.functions values (1305, 'length', 'stringlength', 'str', 0, 1,
false, false, false, 2000);
+insert into sys.functions values (1305, 'length', 'length', 'str', 0, 1,
false, false, false, 2000);
insert into sys.args values (11150, 1305, 'res_0', 'int', 32, 0, 0, 0);
insert into sys.args values (11151, 1305, 'arg_1', 'char', 0, 0, 1, 1);
insert into sys.functions values (1306, 'right', 'stringright', 'str', 0, 1,
false, false, false, 2000);
@@ -5096,7 +5096,7 @@ insert into sys.args values (11321, 1361
insert into sys.functions values (1362, 'code', 'unicode', 'str', 0, 1, false,
false, false, 2000);
insert into sys.args values (11322, 1362, 'res_0', 'varchar', 0, 0, 0, 0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
