Changeset: eb227c6e8cfb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb227c6e8cfb Modified Files: Branch: default Log Message:
Merge new tests diffs (truncated from 5081 to 300 lines): diff -r ce2b7137b310 -r eb227c6e8cfb sql/src/benchmarks/tpch/LOCKED/Tests/01-22.SQL.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/benchmarks/tpch/LOCKED/Tests/01-22.SQL.bat Sun Dec 26 16:05:45 2010 +0100 @@ -0,0 +1,25 @@ +...@prompt # $t $g +...@echo on + +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\01.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\02.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\03.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\04.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\05.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\06.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\07.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\08.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\09.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\10.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\11.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\12.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\13.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\14.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\15.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\16.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\17.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\18.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\19.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\20.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\21.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\22.sql" diff -r ce2b7137b310 -r eb227c6e8cfb sql/src/benchmarks/tpch/LOCKED/Tests/01-22.SQL.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/benchmarks/tpch/LOCKED/Tests/01-22.SQL.sh Sun Dec 26 16:05:45 2010 +0100 @@ -0,0 +1,24 @@ +#!/bin/sh + +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../01.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../02.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../03.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../04.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../05.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../06.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../07.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../08.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../09.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../10.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../11.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../12.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../13.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../14.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../15.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../16.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../17.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../18.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../19.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../20.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../21.sql" +Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../22.sql" diff -r ce2b7137b310 -r eb227c6e8cfb sql/src/benchmarks/tpch/LOCKED/Tests/01-22.reqtests --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/benchmarks/tpch/LOCKED/Tests/01-22.reqtests Sun Dec 26 16:05:45 2010 +0100 @@ -0,0 +1,6 @@ +create +check0 +load +check1 +alter +check2 diff -r ce2b7137b310 -r eb227c6e8cfb sql/src/benchmarks/tpch/LOCKED/Tests/01-22.stable.err --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/benchmarks/tpch/LOCKED/Tests/01-22.stable.err Sun Dec 26 16:05:45 2010 +0100 @@ -0,0 +1,127 @@ +stderr of test '01-22` in directory 'src/benchmarks/tpch/LOCKED` itself: + + +# 12:45:23 > +# 12:45:23 > Mtimeout -timeout 1500 Mserver "--config=/var/tmp/_PREFIX_MONET_GNU_32_d__/etc/monet.conf" --debug=10 --set "monet_mod_path=/var/tmp/_PREFIX_SQL_GNU_32_d__/lib/MonetDB:/var/tmp/_PREFIX_MONET_GNU_32_d__/lib/MonetDB" --set "gdk_dbfarm=/var/tmp/_PREFIX_MONET_GNU_32_d__/var/MonetDB/dbfarm" --set "sql_logdir=/var/tmp/_PREFIX_MONET_GNU_32_d__/var/MonetDB/log" --set mapi_port=41160 --set sql_port=55567 --set monet_prompt= --trace "--dbname=mTests_src_benchmarks_tpch" "/var/tmp/_BUILD_SQL_GNU_32_d__/src/backends/monet4/sql_server.mil" ; echo ; echo Over.. +# 12:45:23 > + + +# 12:45:24 > +# 12:45:24 > Mtimeout -timeout 1380 ./01-22.SQL 01-22 +# 12:45:24 > + + +# 12:45:24 > +# 12:45:24 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:24 > + + +# 12:45:24 > +# 12:45:24 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:24 > + + +# 12:45:25 > +# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:25 > + + +# 12:45:25 > +# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:25 > + + +# 12:45:25 > +# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:25 > + + +# 12:45:25 > +# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:25 > + + +# 12:45:25 > +# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:25 > + + +# 12:45:25 > +# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:25 > + + +# 12:45:25 > +# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:25 > + + +# 12:45:25 > +# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:25 > + + +# 12:45:25 > +# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:25 > + + +# 12:45:25 > +# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:25 > + + +# 12:45:26 > +# 12:45:26 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:26 > + + +# 12:45:26 > +# 12:45:26 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:26 > + + +# 12:45:26 > +# 12:45:26 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:26 > + + +# 12:45:26 > +# 12:45:26 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:26 > + + +# 12:45:26 > +# 12:45:26 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:26 > + + +# 12:45:26 > +# 12:45:26 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:26 > + + +# 12:45:26 > +# 12:45:26 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:26 > + + +# 12:45:27 > +# 12:45:27 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:27 > + + +# 12:45:27 > +# 12:45:27 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:27 > + + +# 12:45:27 > +# 12:45:27 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco --port=55567 --trace +# 12:45:27 > + + +# 12:45:27 > +# 12:45:27 > Done. +# 12:45:27 > + diff -r ce2b7137b310 -r eb227c6e8cfb sql/src/benchmarks/tpch/LOCKED/Tests/01-22.stable.out --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/benchmarks/tpch/LOCKED/Tests/01-22.stable.out Sun Dec 26 16:05:45 2010 +0100 @@ -0,0 +1,945 @@ +stdout of test '01-22` in directory 'src/benchmarks/tpch/LOCKED` itself: + + +# 15:44:34 > +# 15:44:34 > mserver5 "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 --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 "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/sql_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=38978 --set xrpc_port=42914 --set monet_prompt= --trace "--dbname=mTests_src_benchmarks_tpch" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. +# 15:44:34 > + +# MonetDB server v5.4.0, based on kernel v1.22.0 +# Serving database 'mTests_src_benchmarks_tpch' +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Copyright (c) 1993-2008 CWI, all rights reserved +# Visit http://monetdb.cwi.nl/ for further information +# Listening for connection requests on mapi:monetdb://koala.ins.cwi.nl:38978/ +# MonetDB/SQL module v2.22.0 loaded + +Ready. +#function user.main():void; +# clients.quit(); +#end main; + +Over.. + +# 12:35:08 > +# 12:35:08 > Mtimeout -timeout 1380 ./01-22.SQL 01-22 +# 12:35:08 > + + +# 11:48:05 > +# 11:48:05 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=localhost --port=35781 +# 11:48:05 > + +% sys.lineitem, sys.lineitem, sys.lineitem, sys.lineitem, sys., sys., sys., sys., sys., sys.lineitem # table_name +% l_returnflag, l_linestatus, sum_qty, sum_base_price, sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc, count_order # name +% varchar, varchar, bigint, decimal, decimal, decimal, double, double, double, wrd # type +% 1, 1, 6, 17, 21, 21, 22, 22, 22, 5 # length +[ "A", "F", 380456, 532348211.65, 505822441.4861, 526165934.000839, 25.57515461, 35785.70931, 0.05008133907, 14876 ] +[ "N", "F", 8971, 12384801.37, 11798257.2080, 12282485.056933, 25.77873563, 35588.50968, 0.04775862069, 348 ] +[ "N", "O", 742802, 1041502841.45, 989737518.6346, 1029418531.523350, 25.45498783, 35691.12921, 0.04993111956, 29181 ] +[ "R", "F", 381449, 534594445.35, 507996454.4067, 528524219.358903, 25.59716817, 35874.00653, 0.04982753993, 14902 ] +% .stats, .stats # table_name +% rewrite, count # name +% clob, int # type +% 7, 1 # length +[ "joinidx", 0 ] + +# 11:48:05 > +# 11:48:05 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=localhost --port=35781 +# 11:48:05 > + +% sys.supplier, sys.supplier, sys.nation, sys.part, sys.part, sys.supplier, sys.supplier, sys.supplier # table_name +% s_acctbal, s_name, n_name, p_partkey, p_mfgr, s_address, s_phone, s_comment # name +% decimal, varchar, varchar, int, varchar, varchar, varchar, varchar # type +% 17, 18, 7, 4, 14, 39, 15, 93 # length +[ 4186.95, "Supplier#000000077", "GERMANY", 249, "Manufacturer#4", "wVtcr0uH3CyrSiWMLsqnB09Syo,UuZxPMeBghlY", "17-281-345-4863", "blithely pending accounts ru" ] +[ 1883.37, "Supplier#000000086", "ROMANIA", 1015, "Manufacturer#4", "J1fgg5QaqnN", "29-903-665-7065", "slyly pending requests wake car" ] +[ 1687.81, "Supplier#000000017", "ROMANIA", 1634, "Manufacturer#2", "c2d,ESHRSkK3WYnxpgw6aOqN0q", "29-601-884-9219", "slyly pending deposits boost quickly." ] +[ 287.16, "Supplier#000000052", "ROMANIA", 323, "Manufacturer#4", "WCk XCHYzBA1dvJDSol4ZJQQcQN,", "29-974-934-4713", "ironic accounts are slyly above the foxes. regular courts use furiously! slyly pending deposi" ] +% .stats, .stats # table_name +% rewrite, count # name +% clob, int # type +% 7, 1 # length +[ "joinidx", 6 ] + +# 11:48:05 > +# 11:48:05 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=localhost --port=35781 +# 11:48:05 > + +% sys.lineitem, sys., sys.orders, sys.orders # table_name +% l_orderkey, revenue, o_orderdate, o_shippriority # name +% int, decimal, date, int # type +% 5, 21, 10, 1 # length +[ 47714, 267010.5894, 1995-03-11, 0 ] +[ 22276, 266351.5562, 1995-01-29, 0 ] +[ 32965, 263768.3414, 1995-02-25, 0 ] +[ 21956, 254541.1285, 1995-02-02, 0 ] +[ 1637, 243512.7981, 1995-02-08, 0 ] +[ 10916, 241320.0814, 1995-03-11, 0 ] +[ 30497, 208566.6969, 1995-02-07, 0 ] +[ 450, 205447.4232, 1995-03-05, 0 ] +[ 47204, 204478.5213, 1995-03-13, 0 ] +[ 9696, 201502.2188, 1995-02-20, 0 ] +% .stats, .stats # table_name +% rewrite, count # name +% clob, int # type +% 7, 1 # length +[ "joinidx", 2 ] + +# 11:48:05 > +# 11:48:05 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=localhost --port=35781 +# 11:48:05 > + +% sys.orders, sys.orders # table_name +% o_orderpriority, order_count # name +% varchar, wrd # type +% 15, 3 # length +[ "1-URGENT", 93 ] +[ "2-HIGH", 103 ] +[ "3-MEDIUM", 109 ] _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
