Changeset: 51991afd0789 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=51991afd0789 Added Files: sql/jdbc/tests/Tests/Test_PSsqldata.SQL.bat sql/jdbc/tests/Tests/Test_PSsqldata.SQL.sh sql/jdbc/tests/Tests/Test_PSsqldata.stable.err sql/jdbc/tests/Tests/Test_PSsqldata.stable.out sql/jdbc/tests/Tests/Test_Rsqldata.SQL.bat sql/jdbc/tests/Tests/Test_Rsqldata.SQL.sh sql/jdbc/tests/Tests/Test_Rsqldata.stable.err sql/jdbc/tests/Tests/Test_Rsqldata.stable.out Modified Files: sql/jdbc/tests/Tests/All Branch: Oct2012 Log Message:
Add SQLData tests diffs (truncated from 314 to 300 lines): diff --git a/sql/jdbc/tests/Tests/All b/sql/jdbc/tests/Tests/All --- a/sql/jdbc/tests/Tests/All +++ b/sql/jdbc/tests/Tests/All @@ -14,10 +14,12 @@ HAVE_JDBCTESTS?Test_PStimezone HAVE_JDBCTESTS?Test_PStypes HAVE_JDBCTESTS?Test_PSmanycon HAVE_JDBCTESTS?Test_PSmetadata +HAVE_JDBCTESTS?Test_PSsqldata HAVE_JDBCTESTS?Test_Rbooleans HAVE_JDBCTESTS?Test_Rmetadata HAVE_JDBCTESTS?Test_Rpositioning HAVE_JDBCTESTS?Test_Rtimedate +HAVE_JDBCTESTS?Test_Rsqldata HAVE_JDBCTESTS?Test_Sbatching HAVE_JDBCCLIENT_JAR?Test_JdbcClient HAVE_JDBCTESTS?BugConcurrent_clients_SF_1504657 diff --git a/sql/jdbc/tests/Tests/Test_PSsqldata.SQL.bat b/sql/jdbc/tests/Tests/Test_PSsqldata.SQL.bat new file mode 100755 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_PSsqldata.SQL.bat @@ -0,0 +1,1 @@ +@call "%TSTSRCDIR%\Test.SQL.bat" %* diff --git a/sql/jdbc/tests/Tests/Test_PSsqldata.SQL.sh b/sql/jdbc/tests/Tests/Test_PSsqldata.SQL.sh new file mode 100755 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_PSsqldata.SQL.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +$TSTSRCDIR/Test.SQL.sh $* diff --git a/sql/jdbc/tests/Tests/Test_PSsqldata.stable.err b/sql/jdbc/tests/Tests/Test_PSsqldata.stable.err new file mode 100644 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_PSsqldata.stable.err @@ -0,0 +1,41 @@ +stderr of test 'Test_PSsqldata` in directory 'jdbc/tests` itself: + + +# 14:42:04 > +# 14:42:04 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/sql/dbfarm" "--set" "mapi_open=true" "--set" "mapi_port=33464" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_jdbc_tests" "--set" "mal_listing=0" +# 14:42:04 > + +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /ufs/fabian/scratch/ssd/monetdb/Oct2012/program-x86_64/var/lib/monetdb5/dbfarm +# builtin opt gdk_debug = 0 +# 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 sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt gdk_dbfarm = /net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/sql/dbfarm +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 33464 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_jdbc_tests +# cmdline opt mal_listing = 0 + +# 14:42:04 > +# 14:42:04 > "./Test_PSsqldata.SQL.sh" "Test_PSsqldata" +# 14:42:04 > + + +# 14:42:04 > +# 14:42:04 > java Test_PSsqldata "jdbc:monetdb://sofia:33464/mTests_jdbc_tests?user=monetdb&password=monetdb" +# 14:42:04 > + + +# 14:42:05 > +# 14:42:05 > "Done." +# 14:42:05 > + diff --git a/sql/jdbc/tests/Tests/Test_PSsqldata.stable.out b/sql/jdbc/tests/Tests/Test_PSsqldata.stable.out new file mode 100644 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_PSsqldata.stable.out @@ -0,0 +1,77 @@ +stdout of test 'Test_PSsqldata` in directory 'jdbc/tests` itself: + + +# 14:42:04 > +# 14:42:04 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/sql/dbfarm" "--set" "mapi_open=true" "--set" "mapi_port=33464" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_jdbc_tests" "--set" "mal_listing=0" +# 14:42:04 > + +# MonetDB 5 server v11.13.4 "Oct2012-7f942d4b43a5" +# Serving database 'mTests_jdbc_tests', using 8 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.629 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://sofia.ins.cwi.nl:33464/ +# MonetDB/GIS module loaded +# MonetDB/JAQL module loaded +# MonetDB/SQL module loaded + +Ready. +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_history.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_compress.sql +# loading sql script: 18_dictionary.sql +# loading sql script: 19_cluster.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 24_zorder.sql +# loading sql script: 25_debug.sql +# loading sql script: 39_analytics.sql +# loading sql script: 40_geom.sql +# loading sql script: 80_udf.sql +# loading sql script: 99_system.sql + +# 14:42:04 > +# 14:42:04 > "./Test_PSsqldata.SQL.sh" "Test_PSsqldata" +# 14:42:04 > + + +# 14:42:04 > +# 14:42:04 > java Test_PSsqldata "jdbc:monetdb://sofia:33464/mTests_jdbc_tests?user=monetdb&password=monetdb" +# 14:42:04 > + +0. false false +1. 2 parameters: 2 +1. + type 1111 + typename inet + classname nl.cwi.monetdb.jdbc.types.INET +2. + type 1111 + typename url + classname nl.cwi.monetdb.jdbc.types.URL +1. 172.5.5.5/24 + 172.5.5.5/24 + /172.5.5.5 +1. http://www.monetdb.org/ + http://www.monetdb.org/ +2. 172.5.5.5/24 + 172.5.5.5/24 + /172.5.5.5 +2. http://www.monetdb.org/ + http://www.monetdb.org/ + +# 14:42:05 > +# 14:42:05 > "Done." +# 14:42:05 > + diff --git a/sql/jdbc/tests/Tests/Test_Rsqldata.SQL.bat b/sql/jdbc/tests/Tests/Test_Rsqldata.SQL.bat new file mode 100755 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_Rsqldata.SQL.bat @@ -0,0 +1,1 @@ +@call "%TSTSRCDIR%\Test.SQL.bat" %* diff --git a/sql/jdbc/tests/Tests/Test_Rsqldata.SQL.sh b/sql/jdbc/tests/Tests/Test_Rsqldata.SQL.sh new file mode 100755 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_Rsqldata.SQL.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +$TSTSRCDIR/Test.SQL.sh $* diff --git a/sql/jdbc/tests/Tests/Test_Rsqldata.stable.err b/sql/jdbc/tests/Tests/Test_Rsqldata.stable.err new file mode 100644 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_Rsqldata.stable.err @@ -0,0 +1,41 @@ +stderr of test 'Test_Rsqldata` in directory 'jdbc/tests` itself: + + +# 14:41:56 > +# 14:41:56 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/sql/dbfarm" "--set" "mapi_open=true" "--set" "mapi_port=35448" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_jdbc_tests" "--set" "mal_listing=0" +# 14:41:56 > + +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /ufs/fabian/scratch/ssd/monetdb/Oct2012/program-x86_64/var/lib/monetdb5/dbfarm +# builtin opt gdk_debug = 0 +# 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 sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt gdk_dbfarm = /net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/sql/dbfarm +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 35448 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_jdbc_tests +# cmdline opt mal_listing = 0 + +# 14:41:56 > +# 14:41:56 > "./Test_Rsqldata.SQL.sh" "Test_Rsqldata" +# 14:41:56 > + + +# 14:41:56 > +# 14:41:56 > java Test_Rsqldata "jdbc:monetdb://sofia:35448/mTests_jdbc_tests?user=monetdb&password=monetdb" +# 14:41:56 > + + +# 14:41:56 > +# 14:41:56 > "Done." +# 14:41:56 > + diff --git a/sql/jdbc/tests/Tests/Test_Rsqldata.stable.out b/sql/jdbc/tests/Tests/Test_Rsqldata.stable.out new file mode 100644 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_Rsqldata.stable.out @@ -0,0 +1,91 @@ +stdout of test 'Test_Rsqldata` in directory 'jdbc/tests` itself: + + +# 14:41:56 > +# 14:41:56 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/sql/dbfarm" "--set" "mapi_open=true" "--set" "mapi_port=35448" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_jdbc_tests" "--set" "mal_listing=0" +# 14:41:56 > + +# MonetDB 5 server v11.13.4 "Oct2012-7f942d4b43a5" +# Serving database 'mTests_jdbc_tests', using 8 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.629 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://sofia.ins.cwi.nl:35448/ +# MonetDB/GIS module loaded +# MonetDB/JAQL module loaded +# MonetDB/SQL module loaded + +Ready. +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_history.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_compress.sql +# loading sql script: 18_dictionary.sql +# loading sql script: 19_cluster.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 24_zorder.sql +# loading sql script: 25_debug.sql +# loading sql script: 39_analytics.sql +# loading sql script: 40_geom.sql +# loading sql script: 80_udf.sql +# loading sql script: 99_system.sql + +# 14:41:56 > +# 14:41:56 > "./Test_Rsqldata.SQL.sh" "Test_Rsqldata" +# 14:41:56 > + + +# 14:41:56 > +# 14:41:56 > java Test_Rsqldata "jdbc:monetdb://sofia:35448/mTests_jdbc_tests?user=monetdb&password=monetdb" +# 14:41:56 > + +0. false false +0. 4 columns: 2 +1. mTests_jdbc_tests + classname nl.cwi.monetdb.jdbc.types.INET + schemaname sys + tablename table_test_rsqldata + name myinet +2. mTests_jdbc_tests + classname nl.cwi.monetdb.jdbc.types.URL + schemaname sys + tablename table_test_rsqldata + name myurl +1. <null> +1. <null> +2. 172.5.5.5 + 172.5.5.5/32 + /172.5.5.5 +2. http://www.monetdb.org/ + http://www.monetdb.org/ +3. 172.5.5.5 + 172.5.5.5/32 + /172.5.5.5 +3. http://www.monetdb.org/Home + http://www.monetdb.org/Home +4. 172.5.5.5/16 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list