Changeset: 580e1c25cd4e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=580e1c25cd4e Modified Files: MonetDB4/src/modules/plain/Tests/bat.py sql/src/test/VOC/Tests/All sql/src/test/VOC/Tests/VOC.SQL.bat sql/src/test/VOC/Tests/VOC.SQL.py sql/src/test/VOC/Tests/VOC.SQL.sh sql/src/test/VOC/Tests/VOC.stable.err sql/src/test/VOC/Tests/VOC.stable.out Branch: Oct2010 Log Message:
Use Python for test instead of JDBC. The main reason for this change is that Python is more available than JDBC since we don't have the appropriate version of Java on all systems. diffs (truncated from 165875 to 300 lines): diff -r 3e4d96079ff3 -r 580e1c25cd4e MonetDB4/src/modules/plain/Tests/bat.py --- a/MonetDB4/src/modules/plain/Tests/bat.py Mon Oct 04 17:22:46 2010 +0200 +++ b/MonetDB4/src/modules/plain/Tests/bat.py Mon Oct 04 17:25:05 2010 +0200 @@ -1,5 +1,7 @@ -import os -MSERVER = os.environ['MSERVER'] -TSTDB = os.environ['TSTDB'] -TST = os.environ['TST'] -os.system("%s --dbname=%s --set gdk_mem_pagebits=16 < %s.milS" % (MSERVER, TSTDB, TST)) +from MonetDBtesting import process +s = process.server(lang = 'mil', args = ['--set', 'gdk_mem_pagebits=16'], + stdin = open('%s.mil' % os.environ['TST']), + stdout = process.PIPE, stderr = process.PIPE) +out, err = s.communicate() +sys.stdout.write(out) +sys.stderr.write(err) diff -r 3e4d96079ff3 -r 580e1c25cd4e sql/src/test/VOC/Tests/All --- a/sql/src/test/VOC/Tests/All Mon Oct 04 17:22:46 2010 +0200 +++ b/sql/src/test/VOC/Tests/All Mon Oct 04 17:25:05 2010 +0200 @@ -1,1 +1,1 @@ -HAVE_JDBCCLIENT_JAR?VOC +VOC diff -r 3e4d96079ff3 -r 580e1c25cd4e sql/src/test/VOC/Tests/VOC.SQL.bat --- a/sql/src/test/VOC/Tests/VOC.SQL.bat Mon Oct 04 17:22:46 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -...@echo off - -echo user=monetdb> .monetdb -echo password=monetdb>> .monetdb - -set LANG=en_US.UTF-8 - -prompt # $t $g -echo on - -call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f "%RELSRCDIR%\..\VOCcreate_user.sql" - -...@echo user=voc> .monetdb -...@echo password=voc>> .monetdb - -call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f "%RELSRCDIR%\..\VOCschema.sql" -call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f "%RELSRCDIR%\..\VOCinsert.sql" -call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f "%RELSRCDIR%\..\VOCquery.sql" -call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f "%RELSRCDIR%\..\VOCmanual_examples.sql" -call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f "%RELSRCDIR%\..\VOCdrop.sql" - -...@echo user=monetdb> .monetdb -...@echo password=monetdb>> .monetdb - -call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f "%RELSRCDIR%\..\VOCdrop_user.sql" - -...@del .monetdb diff -r 3e4d96079ff3 -r 580e1c25cd4e sql/src/test/VOC/Tests/VOC.SQL.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/test/VOC/Tests/VOC.SQL.py Mon Oct 04 17:25:05 2010 +0200 @@ -0,0 +1,25 @@ +import os, sys +from MonetDBtesting import process + +d = os.environ['RELSRCDIR'] + +def client(file, user, passwd): + c = process.client(lang = 'sql', + user = user, passwd = passwd, + args = [os.path.join(d, os.pardir, file)], + stdout = process.PIPE, stderr = process.PIPE, + log = True) + out, err = c.communicate() + sys.stdout.write(out) + sys.stdout.write(err) + +client('VOCcreate_user.sql', 'monetdb', 'monetdb') +client('VOCschema.sql', 'voc', 'voc') +client('VOCinsert.sql', 'voc', 'voc') +client('VOCquery.sql', 'voc', 'voc') +client('VOCmanual_examples.sql', 'voc', 'voc') +client('VOCdrop.sql', 'voc', 'voc') +client('VOCdrop_user.sql', 'monetdb', 'monetdb') + +sys.stdout.flush() +sys.stderr.flush() diff -r 3e4d96079ff3 -r 580e1c25cd4e sql/src/test/VOC/Tests/VOC.SQL.sh --- a/sql/src/test/VOC/Tests/VOC.SQL.sh Mon Oct 04 17:22:46 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -#!/bin/bash - -cat << EOF > .monetdb -user=monetdb -password=monetdb -EOF - -LC_ALL="`locale -a | grep -i en_us | grep -i utf | head -n 1`" -export LC_ALL - -Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f \"$RELSRCDIR/../VOCcreate_user.sql\" 2>&1" - -cat << EOF > .monetdb -user=voc -password=voc -EOF - -Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f \"$RELSRCDIR/../VOCschema.sql\" 2>&1" -Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f \"$RELSRCDIR/../VOCinsert.sql\" 2>&1" -Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f \"$RELSRCDIR/../VOCquery.sql\" 2>&1" -Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f \"$RELSRCDIR/../VOCmanual_examples.sql\" 2>&1" -Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f \"$RELSRCDIR/../VOCdrop.sql\" 2>&1" - -cat << EOF > .monetdb -user=monetdb -password=monetdb -EOF - -Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f \"$RELSRCDIR/../VOCdrop_user.sql\" 2>&1" - -rm -f .monetdb diff -r 3e4d96079ff3 -r 580e1c25cd4e sql/src/test/VOC/Tests/VOC.stable.err --- a/sql/src/test/VOC/Tests/VOC.stable.err Mon Oct 04 17:22:46 2010 +0200 +++ b/sql/src/test/VOC/Tests/VOC.stable.err Mon Oct 04 17:25:05 2010 +0200 @@ -1,47 +1,93 @@ stderr of test 'VOC` in directory 'src/test/VOC` itself: -# 10:37:20 > -# 10:37:20 > Mtimeout -timeout 900 mserver5 "--config=/ufs/goncalve/scratch/MonetDB/monetdb5/etc/MonetDB5.conf" --debug=10 --set "monet_mod_path=/ufs/goncalve/scratch/MonetDB/monetdb5/lib/MonetDB5" --set "gdk_dbfarm=/ufs/goncalve/scratch/MonetDB/monetdb5/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/goncalve/scratch/MonetDB/monetdb5/var/MonetDB5/dblogs" --set mapi_port=33532 --set monet_prompt= --trace "--dbname=mTests_src_test_VOC" --dbinit='include sql;' ; echo ; echo Over.. -# 10:37:20 > +# 16:09:44 > +# 16:09:44 > mserver5 "--config=/ufs/sjoerd/Monet-candidate/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set gdk_testing=true --set "monet_mod_path=/ufs/sjoerd/Monet-candidate/lib64/MonetDB5:/ufs/sjoerd/Monet-candidate/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-candidate/lib64/MonetDB5/bin" --set "gdk_dbfarm=/ufs/sjoerd/Monet-candidate/var/MonetDB5/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=35964 --set xrpc_port=46696 --set monet_prompt= --set mal_listing=2 --trace "--dbname=mTests_src_test_VOC" --set mal_listing=0 ; echo ; echo Over.. +# 16:09:44 > +# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu +# builtin opt gdk_version = 1.40.0 +# builtin opt prefix = /ufs/sjoerd/Monet-candidate +# builtin opt exec_prefix = ${prefix} +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm +# builtin opt gdk_debug = 0 +# builtin opt gdk_alloc_map = no +# builtin opt gdk_vmtrim = yes +# builtin opt monet_admin = adm +# builtin opt monet_prompt = > +# builtin opt monet_welcome = yes +# builtin opt monet_mod_path = ${prefix}/lib64/MonetDB +# builtin opt monet_daemon = no +# builtin opt host = localhost +# builtin opt mapi_port = 50000 +# builtin opt mapi_clients = 2 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_debug = 0 +# builtin opt standoff_ns = +# builtin opt standoff_start = start +# builtin opt standoff_end = end +# config opt prefix = /ufs/sjoerd/Monet-candidate +# config opt config = ${prefix}/etc/monetdb5.conf +# config opt prefix = /ufs/sjoerd/Monet-candidate +# config opt exec_prefix = ${prefix} +# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm +# config opt monet_mod_path = ${prefix}/lib64/MonetDB5:${prefix}/lib64/MonetDB5/lib:${prefix}/lib64/MonetDB5/bin +# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid +# config opt mero_controlport = 50001 +# config opt sql_optimizer = default_pipe +# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector +# config opt default_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt no_mitosis_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt sequential_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,history,multiplex,garbageCollector +# config opt nov2009_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt replication_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector +# config opt accumulator_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector +# config opt recycler_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector +# config opt cracker_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt sidcrack_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt datacell_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt octopus_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt datacyclotron_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector +# config opt derive_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,derivePath,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt dictionary_pipe = inline,remap,dictionary,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt compression_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,compression,dataflow,history,multiplex,garbageCollector +# cmdline opt config = /ufs/sjoerd/Monet-candidate/etc/monetdb5.conf +# cmdline opt gdk_nr_threads = 0 +# cmdline opt gdk_testing = true +# cmdline opt monet_mod_path = /ufs/sjoerd/Monet-candidate/lib64/MonetDB5:/ufs/sjoerd/Monet-candidate/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-candidate/lib64/MonetDB5/bin +# cmdline opt gdk_dbfarm = /ufs/sjoerd/Monet-candidate/var/MonetDB5/dbfarm +# cmdline opt mapi_open = true +# cmdline opt xrpc_open = true +# cmdline opt mapi_port = 35964 +# cmdline opt xrpc_port = 46696 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_src_test_VOC +# cmdline opt mal_listing = 0 +#warning: please don't forget to set your vault key! +#(see /ufs/sjoerd/Monet-candidate/etc/monetdb5.conf) -# 10:37:20 > -# 10:37:20 > Mtimeout -timeout 780 ./VOC.SQL VOC -# 10:37:20 > -# 10:37:20 > -# 10:37:20 > Mtimeout -timeout 60 java -jar /net/amor.ins.cwi.nl/export/scratch1/goncalve/SQL/sql/build/src/jdbc/jdbcclient-1.4.jar -h localhost -p 33532 -d mTests_src_test_VOC -e -f ../../../../../../../../../../ufs/goncalve/MonetDB/SQL/sql/src/test/VOC/Tests/../VOCcreate_user.sql -# 10:37:20 > +# 16:16:32 > +# 16:16:32 > /usr/bin/python VOC.SQL.py VOC +# 16:16:32 > -# 10:37:20 > -# 10:37:20 > Mtimeout -timeout 60 java -jar /net/amor.ins.cwi.nl/export/scratch1/goncalve/SQL/sql/build/src/jdbc/jdbcclient-1.4.jar -h localhost -p 33532 -d mTests_src_test_VOC -e -f ../../../../../../../../../../ufs/goncalve/MonetDB/SQL/sql/src/test/VOC/Tests/../VOCschema.sql -# 10:37:20 > -# 10:37:21 > -# 10:37:21 > Mtimeout -timeout 60 java -jar /net/amor.ins.cwi.nl/export/scratch1/goncalve/SQL/sql/build/src/jdbc/jdbcclient-1.4.jar -h localhost -p 33532 -d mTests_src_test_VOC -e -f ../../../../../../../../../../ufs/goncalve/MonetDB/SQL/sql/src/test/VOC/Tests/../VOCinsert.sql -# 10:37:21 > -# 10:37:40 > -# 10:37:40 > Mtimeout -timeout 60 java -jar /net/amor.ins.cwi.nl/export/scratch1/goncalve/SQL/sql/build/src/jdbc/jdbcclient-1.4.jar -h localhost -p 33532 -d mTests_src_test_VOC -e -f ../../../../../../../../../../ufs/goncalve/MonetDB/SQL/sql/src/test/VOC/Tests/../VOCquery.sql -# 10:37:40 > +# 16:20:30 > +# 16:20:30 > Mtimeout -timeout 120 mclient -lsql -ftest -e --host=ottar --port=32632 ../../../../../../../../../../../ufs/sjoerd/src/MonetDB/candidate/sql/src/test/VOC/Tests/../VOCinsert.sql +# 16:20:30 > -# 10:37:41 > -# 10:37:41 > Mtimeout -timeout 60 java -jar /net/amor.ins.cwi.nl/export/scratch1/goncalve/SQL/sql/build/src/jdbc/jdbcclient-1.4.jar -h localhost -p 33532 -d mTests_src_test_VOC -e -f ../../../../../../../../../../ufs/goncalve/MonetDB/SQL/sql/src/test/VOC/Tests/../VOCdrop.sql -# 10:37:41 > -# 10:37:41 > -# 10:37:41 > Mtimeout -timeout 60 java -jar /net/amor.ins.cwi.nl/export/scratch1/goncalve/SQL/sql/build/src/jdbc/jdbcclient-1.4.jar -h localhost -p 33532 -d mTests_src_test_VOC -e -f ../../../../../../../../../../ufs/goncalve/MonetDB/SQL/sql/src/test/VOC/Tests/../VOCdrop_user.sql -# 10:37:41 > +# 16:22:29 > +# 16:22:29 > Done. +# 16:22:29 > - -# 10:37:42 > -# 10:37:42 > Done. -# 10:37:42 > - diff -r 3e4d96079ff3 -r 580e1c25cd4e sql/src/test/VOC/Tests/VOC.stable.out --- a/sql/src/test/VOC/Tests/VOC.stable.out Mon Oct 04 17:22:46 2010 +0200 +++ b/sql/src/test/VOC/Tests/VOC.stable.out Mon Oct 04 17:25:05 2010 +0200 @@ -1,97458 +1,68197 @@ stdout of test 'VOC` in directory 'src/test/VOC` itself: -# 10:31:35 > -# 10:31:35 > mserver5 "--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=34021 --set xrpc_port=49015 --set monet_prompt= --trace "--dbname=mTests_src_test_VOC" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 10:31:35 > +# 17:11:18 > +# 17:11:18 > mserver5 "--config=/ufs/sjoerd/Monet-candidate/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set gdk_testing=true --set "monet_mod_path=/ufs/sjoerd/Monet-candidate/lib64/MonetDB5:/ufs/sjoerd/Monet-candidate/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-candidate/lib64/MonetDB5/bin" --set "gdk_dbfarm=/ufs/sjoerd/Monet-candidate/var/MonetDB5/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=30367 --set xrpc_port=48749 --set monet_prompt= --set mal_listing=2 --trace "--dbname=mTests_src_test_VOC" --set mal_listing=0 ; echo ; echo Over.. +# 17:11:18 > - - -# MonetDB server v5.3.0, based on kernel v1.21.0 -# Serving database 'mTests_src_test_VOC' -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked -# Copyright (c) 1993-2007 CWI, all rights reserved +# MonetDB server v5.22.0, based on kernel v1.40.0 +# Not released +# Serving database 'mTests_src_test_VOC', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 7.750 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2010 MonetDB B.V., all rights reserved # Visit http://monetdb.cwi.nl/ for further information +# Listening for connection requests on mapi:monetdb://ottar.ins.cwi.nl:30367/ +# MonetDB/SQL module v2.40.0 loaded +# MonetDB/GIS module v0.20.0 loaded Ready. +# SQL catalog created, loading sql scripts once Over.. -# 10:37:20 > -# 10:37:20 > Mtimeout -timeout 780 ./VOC.SQL VOC -# 10:37:20 > +# 17:11:18 > +# 17:11:18 > /usr/bin/python VOC.SQL.py VOC +# 17:11:18 > -# 10:37:20 > -# 10:37:20 > Mtimeout -timeout 60 java -jar /net/amor.ins.cwi.nl/export/scratch1/goncalve/SQL/sql/build/src/jdbc/jdbcclient-1.4.jar -h localhost -p 33532 -d mTests_src_test_VOC -e -f ../../../../../../../../../../ufs/goncalve/MonetDB/SQL/sql/src/test/VOC/Tests/../VOCcreate_user.sql -# 10:37:20 > +# 17:11:18 > +# 17:11:18 > mclient -lsql -ftest -e --host=ottar --port=30367 ../../../../../../../../../../../ufs/sjoerd/src/MonetDB/candidate/sql/src/test/VOC/Tests/../VOCcreate_user.sql +# 17:11:18 > -START TRANSACTION; -Operation successful +#START TRANSACTION; +#CREATE USER "voc" WITH PASSWORD 'voc' NAME 'VOC_EXPLORER' SCHEMA "sys"; +#CREATE SCHEMA "voc" AUTHORIZATION "voc"; _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list