Changeset: 7dec7589088a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7dec7589088a
Modified Files:
Branch: default
Log Message:
Merged from Aug2011
diffs (truncated from 69082 to 300 lines):
diff --git a/clients/perl/Tests/Makefile.ag b/clients/perl/Tests/Makefile.ag
--- a/clients/perl/Tests/Makefile.ag
+++ b/clients/perl/Tests/Makefile.ag
@@ -20,7 +20,7 @@ MTSAFE
scripts_pl = {
COND = HAVE_TESTING
DIR = bindir
- SOURCES = sqlsample.pl.in malsample.pl.in
+ SOURCES = sqlsample.pl.in malsample.pl.in DBD-bug-2889.pl.in
}
EXTRA_DIST = client.pl smack00.pl smack01.pl
diff --git a/sql/benchmarks/ssbm/Tests/01-13.SQL.bat
b/sql/benchmarks/ssbm/Tests/01-13.SQL.bat
new file mode 100755
--- /dev/null
+++ b/sql/benchmarks/ssbm/Tests/01-13.SQL.bat
@@ -0,0 +1,16 @@
+@prompt # $t $g
+@echo on
+
+%SQL_CLIENT% < "%TSTSRCDIR%\01.sql"
+%SQL_CLIENT% < "%TSTSRCDIR%\02.sql"
+%SQL_CLIENT% < "%TSTSRCDIR%\03.sql"
+%SQL_CLIENT% < "%TSTSRCDIR%\04.sql"
+%SQL_CLIENT% < "%TSTSRCDIR%\05.sql"
+%SQL_CLIENT% < "%TSTSRCDIR%\06.sql"
+%SQL_CLIENT% < "%TSTSRCDIR%\07.sql"
+%SQL_CLIENT% < "%TSTSRCDIR%\08.sql"
+%SQL_CLIENT% < "%TSTSRCDIR%\09.sql"
+%SQL_CLIENT% < "%TSTSRCDIR%\10.sql"
+%SQL_CLIENT% < "%TSTSRCDIR%\11.sql"
+%SQL_CLIENT% < "%TSTSRCDIR%\12.sql"
+%SQL_CLIENT% < "%TSTSRCDIR%\13.sql"
diff --git a/sql/benchmarks/ssbm/Tests/01-13.SQL.sh
b/sql/benchmarks/ssbm/Tests/01-13.SQL.sh
new file mode 100755
--- /dev/null
+++ b/sql/benchmarks/ssbm/Tests/01-13.SQL.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+Mlog -x "$SQL_CLIENT < $TSTSRCDIR/01.sql"
+Mlog -x "$SQL_CLIENT < $TSTSRCDIR/02.sql"
+Mlog -x "$SQL_CLIENT < $TSTSRCDIR/03.sql"
+Mlog -x "$SQL_CLIENT < $TSTSRCDIR/04.sql"
+Mlog -x "$SQL_CLIENT < $TSTSRCDIR/05.sql"
+Mlog -x "$SQL_CLIENT < $TSTSRCDIR/06.sql"
+Mlog -x "$SQL_CLIENT < $TSTSRCDIR/07.sql"
+Mlog -x "$SQL_CLIENT < $TSTSRCDIR/08.sql"
+Mlog -x "$SQL_CLIENT < $TSTSRCDIR/09.sql"
+Mlog -x "$SQL_CLIENT < $TSTSRCDIR/10.sql"
+Mlog -x "$SQL_CLIENT < $TSTSRCDIR/11.sql"
+Mlog -x "$SQL_CLIENT < $TSTSRCDIR/12.sql"
+Mlog -x "$SQL_CLIENT < $TSTSRCDIR/13.sql"
diff --git a/sql/benchmarks/ssbm/Tests/01-13.reqtests
b/sql/benchmarks/ssbm/Tests/01-13.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/ssbm/Tests/01-13.reqtests
@@ -0,0 +1,4 @@
+create
+check0
+load
+check1
diff --git a/sql/benchmarks/ssbm/Tests/01-13.stable.err
b/sql/benchmarks/ssbm/Tests/01-13.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/ssbm/Tests/01-13.stable.err
@@ -0,0 +1,104 @@
+stderr of test '01-13` in directory 'benchmarks/ssbm` itself:
+
+
+# 17:32:53 >
+# 17:32:53 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Apr2011/prefix/_/var/MonetDB"
--set mapi_open=true --set mapi_port=37793 --set monet_prompt= --trace
--forcemito --set mal_listing=2 "--dbname=mTests_benchmarks_ssbm" --set
mal_listing=0 ; echo ; echo Over..
+# 17:32:53 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Apr2011/prefix/_/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# builtin opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt gdk_dbfarm =
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Apr2011/prefix/_/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 37793
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_benchmarks_ssbm
+# cmdline opt mal_listing = 0
+
+# 17:32:53 >
+# 17:32:53 > ./01-13.SQL.sh 01-13
+# 17:32:53 >
+
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/01.sql
+# 17:32:53 >
+
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/02.sql
+# 17:32:53 >
+
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/03.sql
+# 17:32:53 >
+
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/04.sql
+# 17:32:53 >
+
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/05.sql
+# 17:32:53 >
+
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/06.sql
+# 17:32:53 >
+
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/07.sql
+# 17:32:53 >
+
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/08.sql
+# 17:32:53 >
+
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/09.sql
+# 17:32:53 >
+
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/10.sql
+# 17:32:53 >
+
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/11.sql
+# 17:32:53 >
+
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/12.sql
+# 17:32:53 >
+
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/13.sql
+# 17:32:53 >
+
+
+# 17:32:53 >
+# 17:32:53 > Done.
+# 17:32:53 >
+
diff --git a/sql/benchmarks/ssbm/Tests/01-13.stable.out
b/sql/benchmarks/ssbm/Tests/01-13.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/ssbm/Tests/01-13.stable.out
@@ -0,0 +1,747 @@
+stdout of test '01-13` in directory 'benchmarks/ssbm` itself:
+
+
+# 17:32:53 >
+# 17:32:53 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Apr2011/prefix/_/var/MonetDB"
--set mapi_open=true --set mapi_port=37793 --set monet_prompt= --trace
--forcemito --set mal_listing=2 "--dbname=mTests_benchmarks_ssbm" --set
mal_listing=0 ; echo ; echo Over..
+# 17:32:53 >
+
+# MonetDB 5 server v11.3.1 "Apr2011"
+# Serving database 'mTests_benchmarks_ssbm', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.749 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://rig.ins.cwi.nl:37793/
+# MonetDB/SQL module loaded
+# MonetDB/GIS module loaded
+
+Ready.
+
+Over..
+
+# 17:32:53 >
+# 17:32:53 > ./01-13.SQL.sh 01-13
+# 17:32:53 >
+
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/01.sql
+# 17:32:53 >
+
+#select sum(lo_extendedprice*lo_discount) as revenue
+# from lineorder, dwdate
+# where lo_orderdate = d_datekey
+# and d_year = 1993
+# and lo_discount between 1 and 3
+# and lo_quantity < 25;
+% sys. # table_name
+% revenue # name
+% bigint # type
+% 10 # length
+[ 4199635969 ]
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/02.sql
+# 17:32:53 >
+
+#select sum(lo_extendedprice*lo_discount) as revenue
+# from lineorder, dwdate
+# where lo_orderdate = d_datekey
+# and d_yearmonthnum = 199401
+# and lo_discount between 4 and 6
+# and lo_quantity between 26 and 35;
+% sys. # table_name
+% revenue # name
+% bigint # type
+% 9 # length
+[ 927530712 ]
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/03.sql
+# 17:32:53 >
+
+#select sum(lo_extendedprice*lo_discount) as revenue
+# from lineorder, dwdate
+# where lo_orderdate = d_datekey
+# and d_weeknuminyear = 6 and d_year = 1994
+# and lo_discount between 5 and 7
+# and lo_quantity between 36 and 40;
+% sys. # table_name
+% revenue # name
+% bigint # type
+% 9 # length
+[ 213477639 ]
+
+# 17:32:53 >
+# 17:32:53 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=rig
--port=37793 <
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/source/MonetDB/sql/benchmarks/ssbm/Tests/04.sql
+# 17:32:53 >
+
+#select sum(lo_revenue), d_year, p_brand1
+# from lineorder, dwdate, part, supplier
+# where lo_orderdate = d_datekey
+# and lo_partkey = p_partkey
+# and lo_suppkey = s_suppkey
+# and p_category = 'MFGR#12' -- OK to add p_mfgr = âMFGR#1â
+# and s_region = 'AMERICA'
+# group by d_year, p_brand1
+# order by d_year, p_brand1;
+% sys.lineorder, sys.dwdate, sys.part # table_name
+% L1, d_year, p_brand1 # name
+% bigint, int, clob # type
+% 8, 4, 9 # length
+[ 35741623, 1992, "MFGR#1211" ]
+[ 13582129, 1992, "MFGR#1212" ]
+[ 2420150, 1992, "MFGR#1217" ]
+[ 7015912, 1992, "MFGR#1219" ]
+[ 2641607, 1992, "MFGR#122" ]
+[ 2563912, 1992, "MFGR#1221" ]
+[ 6003315, 1992, "MFGR#1223" ]
+[ 8704784, 1992, "MFGR#1224" ]
+[ 13700463, 1992, "MFGR#1225" ]
+[ 12610793, 1992, "MFGR#1226" ]
+[ 5995739, 1992, "MFGR#1228" ]
+[ 7552882, 1992, "MFGR#1230" ]
+[ 13184783, 1992, "MFGR#1232" ]
+[ 3231894, 1992, "MFGR#1240" ]
+[ 7214844, 1992, "MFGR#125" ]
+[ 35054814, 1992, "MFGR#127" ]
+[ 15102503, 1992, "MFGR#128" ]
+[ 7639101, 1992, "MFGR#129" ]
+[ 3339630, 1993, "MFGR#121" ]
+[ 11514911, 1993, "MFGR#1211" ]
+[ 4294668, 1993, "MFGR#1212" ]
+[ 8122643, 1993, "MFGR#1213" ]
+[ 3678145, 1993, "MFGR#1214" ]
+[ 7325684, 1993, "MFGR#1217" ]
+[ 16038869, 1993, "MFGR#1218" ]
+[ 26560659, 1993, "MFGR#1219" ]
+[ 5551142, 1993, "MFGR#1220" ]
+[ 3484096, 1993, "MFGR#1222" ]
+[ 21747351, 1993, "MFGR#1223" ]
+[ 5762459, 1993, "MFGR#1224" ]
+[ 10279155, 1993, "MFGR#1225" ]
+[ 9952878, 1993, "MFGR#1226" ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
