Changeset: 31b326b1770b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31b326b1770b
Modified Files:
clients/Tests/exports.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
sql/backends/monet5/sql_execute.c
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.sql
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/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
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
sql/test/Triggers/trigger_insert.sql
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: jit
Log Message:
Approve output
diffs (truncated from 1436 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
@@ -1538,6 +1538,7 @@ int OPTconstantsImplementation(Client cn
int OPTcostModelImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTdataflowImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTdeadcodeImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
+int OPTemptycolumnImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTevaluateImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTfactorizeImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTgarbageCollectorImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
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.s8_1():void;
X_24:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",12);
-barrier X_51 := language.dataflow();
+barrier X_52 := 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_51;
+exit X_52;
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);
@@ -125,10 +125,10 @@ end user.s8_1;
% 118 # length
function user.s24_1():void;
X_24:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",12);
-barrier X_52 := language.dataflow();
+barrier X_53 := 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_52;
+exit X_53;
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/sql/backends/monet5/sql_execute.c
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -311,7 +311,7 @@ SQLrun(Client c, backend *be, mvc *m){
setVarFixed(mb, j+retc);
}
mb->stmt[0]->argc = 1;
- chkProgram(cntxt->fdout, cntxt->nspace, mb);
+ chkProgram(c->fdout, c->nspace, mb);
break;
}
}
diff --git
a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
--- a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
+++ b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
@@ -1,81 +1,37 @@
stderr 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 >
+# 13:17:22 >
+# 13:17:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32129" "--set"
"mapi_usock=/var/tmp/mtest-23841/.s.monetdb.32129" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/jit//Linux/var/MonetDB/mTests_sql_test_BugTracker-2009"
+# 13:17:22 >
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.30.0
-# builtin opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
+# builtin opt gdk_dbpath =
/export/scratch1/mk/jit//Linux/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path = ${exec_prefix}/lib/MonetDB
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
+# builtin opt monet_daemon = no
# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
# builtin opt sql_debug = 0
-# builtin opt sql_logdir = sql_logs
-# builtin opt xquery_logdir = xquery_logs
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/MonetDB/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/MonetDB/merovingian.log
-# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
-# config opt mero_exittimeout = 7
-# config opt mero_doproxy = yes
-# config opt mero_discoveryttl = 600
-# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
-# config opt mal_listing = 2
-# config opt mapi_port = 50000
-# config opt mapi_open = false
-# config opt sql_logdir = sql_logs
-# cmdline opt config = /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf
# cmdline opt gdk_nr_threads = 0
-# cmdline opt 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
-# cmdline opt gdk_dbfarm =
/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm
# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 35519
-# cmdline opt xrpc_port = 48894
+# cmdline opt mapi_port = 32129
+# cmdline opt mapi_usock = /var/tmp/mtest-23841/.s.monetdb.32129
# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2009
-# cmdline opt mal_listing = 0
-#warning: please don't forget to set your vault key!
-#(see /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf)
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/jit//Linux/var/MonetDB/mTests_sql_test_BugTracker-2009
+# cmdline opt gdk_debug = 536870922
-# 22:45:54 >
-# 22:45:54 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=35519
-# 22:45:54 >
+# 13:17:23 >
+# 13:17:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23841" "--port=32129"
+# 13:17:23 >
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+MAPI = (monetdb) /var/tmp/mtest-23841/.s.monetdb.32129
QUERY = alter table blabla drop constraint dada;
ERROR = !ALTER TABLE: no such constraint 'dada'
-# 22:45:54 >
-# 22:45:54 > Done.
-# 22:45:54 >
+# 13:17:23 >
+# 13:17:23 > "Done."
+# 13:17:23 >
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,28 @@
stdout of test 'explain_gives_crash.SF-2741829` in directory
'sql/test/BugTracker-2009` itself:
-# 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 >
+# 13:17:22 >
+# 13:17:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32129" "--set"
"mapi_usock=/var/tmp/mtest-23841/.s.monetdb.32129" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/jit//Linux/var/MonetDB/mTests_sql_test_BugTracker-2009"
+# 13:17:22 >
-# MonetDB 5 server v11.24.0 (hg id: 934dbfa3c66b)
+# MonetDB 5 server v11.24.0
# This is an unreleased version
-# Serving database 'mTests_sql_test_BugTracker-2009', using 4 threads
+# Serving database 'mTests_sql_test_BugTracker-2009', using 8 threads
# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
-# Found 15.518 GiB available main-memory.
+# Found 15.589 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://meeuw.mullender.nl:38761/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-29376/.s.monetdb.38761
+# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:32129/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-23841/.s.monetdb.32129
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
-# MonetDB/R module loaded
Ready.
-# 16:38:46 >
-# 16:38:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29376" "--port=38761"
-# 16:38:46 >
+# 13:17:23 >
+# 13:17:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23841" "--port=32129"
+# 13:17:23 >
#set optimizer='sequential_pipe';
#create table blabla(id integer);
@@ -43,31 +42,28 @@ function user.s8_1():void;
" sql.assert(X_19,""UPDATE: UNIQUE constraint 'blabla.dada' violated"");"
sql.exportOperation();
end user.s8_1;
-#inline actions= 0 time=4 usec
-#candidates actions= 1 time=40 usec
-#remap actions= 0 time=6 usec
-#costModel actions= 1 time=34 usec
-#coercions actions= 7 time=32 usec
-#evaluate actions= 0 time=6 usec
-#emptybind actions= 0 time=6 usec
-#pushselect actions= 2 time=36 usec
-#aliases actions= 2 time=28 usec
-#mergetable actions= 0 time=36 usec
-#deadcode actions= 2 time=26 usec
-#aliases actions= 0 time=7 usec
-#constants actions= 1 time=23 usec
-#commonTerms actions= 0 time=7 usec
-#projectionpath actions= 0 time=7 usec
-#reorder actions= 1 time=55 usec
-#deadcode actions= 0 time=9 usec
-#reduce actions=34 time=47 usec
-#matpack actions= 0 time=7 usec
-#querylog actions= 0 time=2 usec
-#multiplex actions= 0 time=5 usec
-#generator actions= 0 time=3 usec
-#profiler actions= 1 time=18 usec
-#garbageCollector actions= 1 time=26 usec
-#total actions= 1 time=565 usec
+#inline actions= 0 time=1 usec
+#remap actions= 0 time=3 usec
+#costmodel actions= 1 time=1 usec
+#coercion actions= 7 time=8 usec
+#evaluate actions= 0 time=3 usec
+#emptycolumn actions= 1 time=16 usec
+#aliases actions= 1 time=6 usec
+#mergetable actions= 0 time=23 usec
+#deadcode actions= 5 time=8 usec
+#aliases actions= 0 time=3 usec
+#constants actions= 3 time=4 usec
+#commonTerms actions= 0 time=4 usec
+#projectionpath actions= 0 time=4 usec
+#reorder actions= 1 time=16 usec
+#deadcode actions= 0 time=4 usec
+#reduce actions=38 time=20 usec
+#matpack actions= 0 time=2 usec
+#multiplex actions= 0 time=2 usec
+#profiler actions= 1 time=0 usec
+#candidates actions= 1 time=0 usec
+#garbagecollctor actions= 1 time=10 usec
+#total actions= 1 time=224 usec
function user.s10_1():void;
" X_23:void := querylog.define(""explain alter table blabla add constraint
dada unique (id);"",""sequential_pipe"",15);"
" sql.catalog(29,""sys"",nil,0);"
@@ -83,31 +79,28 @@ function user.s10_1():void;
" sql.assert(X_19,""UPDATE: UNIQUE constraint 'blabla.dada' violated"");"
sql.exportOperation();
end user.s10_1;
-#inline actions= 0 time=4 usec
-#candidates actions= 1 time=38 usec
-#remap actions= 0 time=6 usec
-#costModel actions= 1 time=34 usec
-#coercions actions= 7 time=32 usec
-#evaluate actions= 0 time=6 usec
-#emptybind actions= 0 time=6 usec
-#pushselect actions= 2 time=34 usec
-#aliases actions= 2 time=27 usec
-#mergetable actions= 0 time=37 usec
-#deadcode actions= 2 time=27 usec
-#aliases actions= 0 time=8 usec
-#constants actions= 1 time=24 usec
-#commonTerms actions= 0 time=8 usec
-#projectionpath actions= 0 time=6 usec
-#reorder actions= 1 time=42 usec
-#deadcode actions= 0 time=9 usec
-#reduce actions=34 time=48 usec
-#matpack actions= 0 time=6 usec
-#querylog actions= 0 time=1 usec
-#multiplex actions= 0 time=5 usec
-#generator actions= 0 time=3 usec
-#profiler actions= 1 time=18 usec
-#garbageCollector actions= 1 time=25 usec
-#total actions= 1 time=547 usec
+#inline actions= 0 time=1 usec
+#remap actions= 0 time=3 usec
+#costmodel actions= 1 time=1 usec
+#coercion actions= 7 time=7 usec
+#evaluate actions= 0 time=3 usec
+#emptycolumn actions= 1 time=11 usec
+#aliases actions= 1 time=6 usec
+#mergetable actions= 0 time=23 usec
+#deadcode actions= 5 time=9 usec
+#aliases actions= 0 time=4 usec
+#constants actions= 3 time=4 usec
+#commonTerms actions= 0 time=4 usec
+#projectionpath actions= 0 time=3 usec
+#reorder actions= 1 time=15 usec
+#deadcode actions= 0 time=4 usec
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
