Changeset: 1633fef81cb0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1633fef81cb0 Removed Files: sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh sql/jdbc/tests/Tests/SQLcopyinto.stable.err sql/jdbc/tests/Tests/SQLcopyinto.stable.out sql/jdbc/tests/Tests/Test_CallableStmt.SQL.bat sql/jdbc/tests/Tests/Test_CallableStmt.SQL.sh sql/jdbc/tests/Tests/Test_CallableStmt.stable.err sql/jdbc/tests/Tests/Test_CallableStmt.stable.out sql/jdbc/tests/Tests/Test_Cautocommit.SQL.bat sql/jdbc/tests/Tests/Test_Cautocommit.SQL.sh sql/jdbc/tests/Tests/Test_Cautocommit.stable.err sql/jdbc/tests/Tests/Test_Cautocommit.stable.out sql/jdbc/tests/Tests/Test_CisValid.SQL.bat sql/jdbc/tests/Tests/Test_CisValid.SQL.sh sql/jdbc/tests/Tests/Test_CisValid.stable.err sql/jdbc/tests/Tests/Test_CisValid.stable.out sql/jdbc/tests/Tests/Test_Clargequery.SQL.bat sql/jdbc/tests/Tests/Test_Clargequery.SQL.sh sql/jdbc/tests/Tests/Test_Clargequery.stable.err sql/jdbc/tests/Tests/Test_Clargequery.stable.out sql/jdbc/tests/Tests/Test_Cmanycon.SQL.bat sql/jdbc/tests/Tests/Test_Cmanycon.SQL.sh sql/jdbc/tests/Tests/Test_Cmanycon.stable.err sql/jdbc/tests/Tests/Test_Cmanycon.stable.out sql/jdbc/tests/Tests/Test_Creplysize.SQL.bat sql/jdbc/tests/Tests/Test_Creplysize.SQL.sh sql/jdbc/tests/Tests/Test_Creplysize.stable.err sql/jdbc/tests/Tests/Test_Creplysize.stable.out sql/jdbc/tests/Tests/Test_Csavepoints.SQL.bat sql/jdbc/tests/Tests/Test_Csavepoints.SQL.sh sql/jdbc/tests/Tests/Test_Csavepoints.stable.err sql/jdbc/tests/Tests/Test_Csavepoints.stable.out sql/jdbc/tests/Tests/Test_Ctransaction.SQL.bat sql/jdbc/tests/Tests/Test_Ctransaction.SQL.sh sql/jdbc/tests/Tests/Test_Ctransaction.stable.err sql/jdbc/tests/Tests/Test_Ctransaction.stable.out sql/jdbc/tests/Tests/Test_Dobjects.SQL.bat sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh sql/jdbc/tests/Tests/Test_Dobjects.stable.err sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/jdbc/tests/Tests/Test_FetchSize.SQL.bat sql/jdbc/tests/Tests/Test_FetchSize.SQL.sh sql/jdbc/tests/Tests/Test_FetchSize.stable.err sql/jdbc/tests/Tests/Test_FetchSize.stable.out sql/jdbc/tests/Tests/Test_Int128.SQL.bat sql/jdbc/tests/Tests/Test_Int128.SQL.sh sql/jdbc/tests/Tests/Test_Int128.stable.err sql/jdbc/tests/Tests/Test_Int128.stable.out.int128 sql/jdbc/tests/Tests/Test_PSgeneratedkeys.SQL.bat sql/jdbc/tests/Tests/Test_PSgeneratedkeys.SQL.sh sql/jdbc/tests/Tests/Test_PSgeneratedkeys.stable.err sql/jdbc/tests/Tests/Test_PSgeneratedkeys.stable.out sql/jdbc/tests/Tests/Test_PSgetObject.SQL.bat sql/jdbc/tests/Tests/Test_PSgetObject.SQL.sh sql/jdbc/tests/Tests/Test_PSgetObject.stable.err sql/jdbc/tests/Tests/Test_PSgetObject.stable.out sql/jdbc/tests/Tests/Test_PSlargebatchval.SQL.bat sql/jdbc/tests/Tests/Test_PSlargebatchval.SQL.sh sql/jdbc/tests/Tests/Test_PSlargebatchval.stable.err sql/jdbc/tests/Tests/Test_PSlargebatchval.stable.out sql/jdbc/tests/Tests/Test_PSlargeresponse.SQL.bat sql/jdbc/tests/Tests/Test_PSlargeresponse.SQL.sh sql/jdbc/tests/Tests/Test_PSlargeresponse.stable.err sql/jdbc/tests/Tests/Test_PSlargeresponse.stable.out sql/jdbc/tests/Tests/Test_PSmanycon.SQL.bat sql/jdbc/tests/Tests/Test_PSmanycon.SQL.sh sql/jdbc/tests/Tests/Test_PSmanycon.stable.err sql/jdbc/tests/Tests/Test_PSmanycon.stable.out sql/jdbc/tests/Tests/Test_PSmetadata.SQL.bat sql/jdbc/tests/Tests/Test_PSmetadata.SQL.sh sql/jdbc/tests/Tests/Test_PSmetadata.stable.err sql/jdbc/tests/Tests/Test_PSmetadata.stable.out sql/jdbc/tests/Tests/Test_PSsomeamount.SQL.bat sql/jdbc/tests/Tests/Test_PSsomeamount.SQL.sh sql/jdbc/tests/Tests/Test_PSsomeamount.stable.err sql/jdbc/tests/Tests/Test_PSsomeamount.stable.out sql/jdbc/tests/Tests/Test_PSsomeamount.timeout 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_PStimedate.SQL.bat sql/jdbc/tests/Tests/Test_PStimedate.SQL.sh sql/jdbc/tests/Tests/Test_PStimedate.stable.err sql/jdbc/tests/Tests/Test_PStimedate.stable.out sql/jdbc/tests/Tests/Test_PStimezone.SQL.bat sql/jdbc/tests/Tests/Test_PStimezone.SQL.sh sql/jdbc/tests/Tests/Test_PStimezone.stable.err sql/jdbc/tests/Tests/Test_PStimezone.stable.out sql/jdbc/tests/Tests/Test_PStypes.SQL.bat sql/jdbc/tests/Tests/Test_PStypes.SQL.sh sql/jdbc/tests/Tests/Test_PStypes.stable.err sql/jdbc/tests/Tests/Test_PStypes.stable.out sql/jdbc/tests/Tests/Test_Rbooleans.SQL.bat sql/jdbc/tests/Tests/Test_Rbooleans.SQL.sh sql/jdbc/tests/Tests/Test_Rbooleans.stable.err sql/jdbc/tests/Tests/Test_Rbooleans.stable.out sql/jdbc/tests/Tests/Test_Rmetadata.SQL.bat sql/jdbc/tests/Tests/Test_Rmetadata.SQL.sh sql/jdbc/tests/Tests/Test_Rmetadata.stable.err sql/jdbc/tests/Tests/Test_Rmetadata.stable.out sql/jdbc/tests/Tests/Test_Rpositioning.SQL.bat sql/jdbc/tests/Tests/Test_Rpositioning.SQL.sh sql/jdbc/tests/Tests/Test_Rpositioning.stable.err sql/jdbc/tests/Tests/Test_Rpositioning.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 sql/jdbc/tests/Tests/Test_Rtimedate.SQL.bat sql/jdbc/tests/Tests/Test_Rtimedate.SQL.sh sql/jdbc/tests/Tests/Test_Rtimedate.stable.err sql/jdbc/tests/Tests/Test_Rtimedate.stable.out sql/jdbc/tests/Tests/Test_Sbatching.SQL.bat sql/jdbc/tests/Tests/Test_Sbatching.SQL.sh sql/jdbc/tests/Tests/Test_Sbatching.stable.err sql/jdbc/tests/Tests/Test_Sbatching.stable.out sql/jdbc/tests/Tests/Test_Smoreresults.SQL.bat sql/jdbc/tests/Tests/Test_Smoreresults.SQL.sh sql/jdbc/tests/Tests/Test_Smoreresults.stable.err sql/jdbc/tests/Tests/Test_Smoreresults.stable.out sql/jdbc/tests/Tests/Test_Wrapper.SQL.bat sql/jdbc/tests/Tests/Test_Wrapper.SQL.sh sql/jdbc/tests/Tests/Test_Wrapper.stable.err sql/jdbc/tests/Tests/Test_Wrapper.stable.out Modified Files: sql/jdbc/tests/Tests/All Branch: Jun2020 Log Message:
Removing 31 more tests and files which are replaced by JDBC_API_Tester program. ch are replaced by HG: Enter commit message. Lines beginning with 'HG:' are removed. diffs (truncated from 4169 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 @@ -1,36 +1,7 @@ HAVE_JDBCTESTS?JDBC_API_Tester -HAVE_JDBCTESTS?SQLcopyinto -HAVE_JDBCTESTS?Test_Cautocommit -HAVE_JDBCTESTS?Test_CisValid -HAVE_JDBCTESTS?Test_Clargequery -HAVE_JDBCTESTS?Test_Cmanycon -HAVE_JDBCTESTS?Test_Creplysize -HAVE_JDBCTESTS?Test_Csavepoints #HAVE_JDBCTESTS?Test_Csendthread # unfortunately has runtime-dependant output -HAVE_JDBCTESTS?Test_Ctransaction -HAVE_JDBCTESTS?Test_Dobjects -HAVE_JDBCTESTS?Test_FetchSize -HAVE_JDBCTESTS&HAVE_HGE?Test_Int128 +#HAVE_JDBCTESTS?Test_PSlargeamount # scalabity test which is disabled by default (it takes a long time to run and does not need to be run everytime, only before a new release) + HAVE_JDBCCLIENT_JAR?Test_JdbcClient HAVE_JDBCCLIENT_JAR?bogus-auto-generated-keys -HAVE_JDBCTESTS?Test_PSgeneratedkeys -HAVE_JDBCTESTS?Test_PSgetObject -HAVE_JDBCTESTS?Test_PSlargebatchval -HAVE_JDBCTESTS?Test_PSlargeresponse -#HAVE_JDBCTESTS?Test_PSlargeamount # scalabity test which is disabled by default (it takes a long time to run and does not need to be run everytime, only before a new release) -HAVE_JDBCTESTS?Test_PSmanycon -HAVE_JDBCTESTS?Test_PSmetadata -HAVE_JDBCTESTS?Test_PSsomeamount -HAVE_JDBCTESTS?Test_PSsqldata -HAVE_JDBCTESTS?Test_PStimedate -HAVE_JDBCTESTS?Test_PStimezone -HAVE_JDBCTESTS?Test_PStypes -HAVE_JDBCTESTS?Test_CallableStmt -HAVE_JDBCTESTS?Test_Rbooleans -HAVE_JDBCTESTS?Test_Rmetadata -HAVE_JDBCTESTS?Test_Rpositioning -HAVE_JDBCTESTS?Test_Rsqldata -HAVE_JDBCTESTS?Test_Rtimedate -HAVE_JDBCTESTS?Test_Sbatching -HAVE_JDBCTESTS?Test_Smoreresults -HAVE_JDBCTESTS?Test_Wrapper + diff --git a/sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat b/sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat deleted file mode 100755 --- a/sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat +++ /dev/null @@ -1,1 +0,0 @@ -@call "%TSTSRCDIR%\Test.SQL.bat" %* diff --git a/sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh b/sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh deleted file mode 100755 --- a/sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -$TSTSRCDIR/Test.SQL.sh $* diff --git a/sql/jdbc/tests/Tests/SQLcopyinto.stable.err b/sql/jdbc/tests/Tests/SQLcopyinto.stable.err deleted file mode 100644 --- a/sql/jdbc/tests/Tests/SQLcopyinto.stable.err +++ /dev/null @@ -1,42 +0,0 @@ -stderr of test 'SQLcopyinto` in directory 'sql/jdbc/tests` itself: - - -# 12:51:59 > -# 12:51:59 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33746" "--set" "mapi_usock=/var/tmp/mtest-12494/.s.monetdb.33746" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/dinther/INSTALL/var/MonetDB/mTests_sql_jdbc_tests" "--set" "embedded_r=yes" "--set" "embedded_py=true" "--set" "embedded_c=true" -# 12:51:59 > - -# builtin opt gdk_dbpath = /export/scratch1/dinther/INSTALL/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# builtin opt gdk_vmtrim = no -# 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 mapi_open = true -# cmdline opt mapi_port = 33746 -# cmdline opt mapi_usock = /var/tmp/mtest-12494/.s.monetdb.33746 -# cmdline opt monet_prompt = -# cmdline opt gdk_dbpath = /export/scratch1/dinther/INSTALL/var/MonetDB/mTests_sql_jdbc_tests -# cmdline opt embedded_r = yes -# cmdline opt embedded_py = true -# cmdline opt embedded_c = true -# cmdline opt gdk_debug = 553648138 - -# 12:52:00 > -# 12:52:00 > "./SQLcopyinto.SQL.sh" "SQLcopyinto" -# 12:52:00 > - - -# 12:52:00 > -# 12:52:00 > java SQLcopyinto "jdbc:monetdb://catskill:33746/mTests_sql_jdbc_tests?user=monetdb&password=monetdb" -# 12:52:00 > - - -# 12:52:00 > -# 12:52:00 > "Done." -# 12:52:00 > - diff --git a/sql/jdbc/tests/Tests/SQLcopyinto.stable.out b/sql/jdbc/tests/Tests/SQLcopyinto.stable.out deleted file mode 100644 --- a/sql/jdbc/tests/Tests/SQLcopyinto.stable.out +++ /dev/null @@ -1,89 +0,0 @@ -stdout of test 'SQLcopyinto` in directory 'sql/jdbc/tests` itself: - - -# 12:51:59 > -# 12:51:59 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33746" "--set" "mapi_usock=/var/tmp/mtest-12494/.s.monetdb.33746" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/dinther/INSTALL/var/MonetDB/mTests_sql_jdbc_tests" "--set" "embedded_r=yes" "--set" "embedded_py=true" "--set" "embedded_c=true" -# 12:51:59 > - -# MonetDB 5 server v11.29.4 -# This is an unreleased version -# Serving database 'mTests_sql_jdbc_tests', using 4 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers -# Found 31.307 GiB available main-memory. -# Copyright (c) 1993 - July 2008 CWI. -# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved -# Visit https://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://catskill.da.cwi.nl:33746/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-12494/.s.monetdb.33746 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded -# MonetDB/Python2 module loaded -# MonetDB/R module loaded - - -# 12:52:00 > -# 12:52:00 > "./SQLcopyinto.SQL.sh" "SQLcopyinto" -# 12:52:00 > - - -# 12:52:00 > -# 12:52:00 > java SQLcopyinto "jdbc:monetdb://catskill:33746/mTests_sql_jdbc_tests?user=monetdb&password=monetdb" -# 12:52:00 > - -SQLcopyinto started -Connected to MonetDB server - -CopyInto STDIN begin -Before connecting to MonetDB server via MapiSocket -Connected to MonetDB server via MapiSocket -Before sending data to STDIN -Completed sending data via STDIN -CopyInto STDIN end - -Listing uploaded data: -Row data: 0, val_0 -Row data: 1, val_1 -Row data: 2, val_2 -Row data: 3, val_3 -Row data: 4, val_4 -Row data: 5, val_5 -Row data: 6, val_6 -Row data: 7, val_7 -Row data: 8, val_8 -Row data: 9, val_9 -Row data: 10, val_10 -Row data: 11, val_11 -Row data: 12, val_12 -Row data: 13, val_13 -Row data: 14, val_14 -Row data: 15, val_15 -Row data: 16, val_16 -Row data: 17, val_17 -Row data: 18, val_18 -Row data: 19, val_19 -Row data: 20, val_20 -Row data: 21, val_21 -Row data: 22, val_22 -Row data: 23, val_23 -Row data: 24, val_24 -Row data: 25, val_25 -Row data: 26, val_26 -Row data: 27, val_27 -Row data: 28, val_28 -Row data: 29, val_29 -Row data: 30, val_30 -Row data: 31, val_31 -Row data: 32, val_32 -Row data: 33, val_33 -Row data: 34, val_34 -Row data: 35, val_35 -Row data: 36, val_36 -Row data: 37, val_37 -Row data: 38, val_38 -Row data: 39, val_39 -SQLcopyinto completed - -# 12:52:00 > -# 12:52:00 > "Done." -# 12:52:00 > - diff --git a/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.bat b/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.bat deleted file mode 100755 --- a/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.bat +++ /dev/null @@ -1,1 +0,0 @@ -@call "%TSTSRCDIR%\Test.SQL.bat" %* diff --git a/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.sh b/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.sh deleted file mode 100755 --- a/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -$TSTSRCDIR/Test.SQL.sh $* diff --git a/sql/jdbc/tests/Tests/Test_CallableStmt.stable.err b/sql/jdbc/tests/Tests/Test_CallableStmt.stable.err deleted file mode 100644 --- a/sql/jdbc/tests/Tests/Test_CallableStmt.stable.err +++ /dev/null @@ -1,38 +0,0 @@ -stderr of test 'Test_CallableStmt` in directory 'sql/jdbc/tests` itself: - - -# 19:25:40 > -# 19:25:40 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36596" "--set" "mapi_usock=/var/tmp/mtest-14657/.s.monetdb.36596" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/dinther/INSTALL/var/MonetDB/mTests_sql_jdbc_tests" "--set" "embedded_c=true" -# 19:25:40 > - -# builtin opt gdk_dbpath = /export/scratch1/dinther/INSTALL/var/monetdb5/dbfarm/demo -# 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 mapi_open = true -# cmdline opt mapi_port = 36596 -# cmdline opt mapi_usock = /var/tmp/mtest-14657/.s.monetdb.36596 -# cmdline opt monet_prompt = -# cmdline opt gdk_dbpath = /export/scratch1/dinther/INSTALL/var/MonetDB/mTests_sql_jdbc_tests -# cmdline opt embedded_c = true -#main thread:!ERROR:MALException:client.quit:Server stopped - -# 19:25:40 > -# 19:25:40 > "./Test_CallableStmt.SQL.sh" "Test_CallableStmt" -# 19:25:40 > - - -# 19:25:40 > -# 19:25:40 > java Test_CallableStmt "jdbc:monetdb://catskill:36596/mTests_sql_jdbc_tests?user=monetdb&password=monetdb" -# 19:25:40 > - - -# 19:25:40 > -# 19:25:40 > "Done." -# 19:25:40 > - diff --git a/sql/jdbc/tests/Tests/Test_CallableStmt.stable.out b/sql/jdbc/tests/Tests/Test_CallableStmt.stable.out deleted file mode 100644 --- a/sql/jdbc/tests/Tests/Test_CallableStmt.stable.out +++ /dev/null @@ -1,118 +0,0 @@ -stdout of test 'Test_CallableStmt` in directory 'sql/jdbc/tests` itself: - - -# 19:25:40 > -# 19:25:40 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36596" "--set" "mapi_usock=/var/tmp/mtest-14657/.s.monetdb.36596" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/dinther/INSTALL/var/MonetDB/mTests_sql_jdbc_tests" "--set" "embedded_c=true" -# 19:25:40 > - -# MonetDB 5 server v11.33.0 (hg id: 70b8126598ab+) -# This is an unreleased version -# Serving database 'mTests_sql_jdbc_tests', using 4 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers -# Found 31.305 GiB available main-memory. -# Copyright (c) 1993 - July 2008 CWI. -# Copyright (c) August 2008 - 2020 MonetDB B.V., all rights reserved -# Visit https://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://catskill.da.cwi.nl:36596/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-14657/.s.monetdb.36596 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded - - -# 19:25:40 > -# 19:25:40 > "./Test_CallableStmt.SQL.sh" "Test_CallableStmt" -# 19:25:40 > - - -# 19:25:40 > -# 19:25:40 > java Test_CallableStmt "jdbc:monetdb://catskill:36596/mTests_sql_jdbc_tests?user=monetdb&password=monetdb" -# 19:25:40 > - -Created table: tbl6402 -Created procedure: proc6402 -Called procedure (1): proc6402 -Table tbl6402 has 7 columns: - tint tdouble tbool tvarchar tclob turl tclen - 1 1.1 true one ONE www.monetdb.org 6 -Prepared Callable procedure: proc6402 -Called Prepared procedure (1): proc6402 -6 parameters reported: -1. nullable 2 (UNKNOWN) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list