Update of /cvsroot/monetdb/sql/src/jdbc/tests/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4540/tests/Tests
Modified Files:
Tag: SQL_2-18
All Test.SQL Test_JdbcClient.SQL Test_JdbcClient.SQL.bat
Test_PStypes.stable.out
Added Files:
Tag: SQL_2-18
Test_Clargequery.SQL Test_Clargequery.SQL.bat
Test_Clargequery.stable.err Test_Clargequery.stable.out
Log Message:
Merged HEAD into SQL_2-18
Index: Test_JdbcClient.SQL
===================================================================
RCS file: /cvsroot/monetdb/sql/src/jdbc/tests/Tests/Test_JdbcClient.SQL,v
retrieving revision 1.23
retrieving revision 1.23.4.1
diff -u -d -r1.23 -r1.23.4.1
--- Test_JdbcClient.SQL 12 Jan 2007 12:25:18 -0000 1.23
+++ Test_JdbcClient.SQL 16 Aug 2007 10:58:55 -0000 1.23.4.1
@@ -1,7 +1,7 @@
#!/bin/bash
pdd="`monetdb-clients-config --pkgdatadir`"
-JAR="`ls $pdd/lib/jdbcclient-*.*.jar | head -n1`"
+JAR="$pdd/lib/jdbcclient.jar"
cat << EOF > .monetdb
user=monetdb
Index: All
===================================================================
RCS file: /cvsroot/monetdb/sql/src/jdbc/tests/Tests/All,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -d -r1.20 -r1.20.2.1
--- All 29 Jan 2007 22:27:13 -0000 1.20
+++ All 16 Aug 2007 10:57:39 -0000 1.20.2.1
@@ -1,15 +1,16 @@
HAVE_JAVA?Test_Cautocommit
+HAVE_JAVA?Test_Clargequery
+HAVE_JAVA?Test_Cmanycon
+HAVE_JAVA?Test_Creplysize
HAVE_JAVA?Test_Csavepoints
HAVE_JAVA?Test_Ctransaction
-HAVE_JAVA?Test_Creplysize
HAVE_JAVA?Test_PStimedate
HAVE_JAVA?Test_PStimezone
HAVE_JAVA?Test_PStypes
-HAVE_JAVA?Test_Rtimedate
HAVE_JAVA?Test_Rbooleans
+HAVE_JAVA?Test_Rmetadata
HAVE_JAVA?Test_Rpositioning
+HAVE_JAVA?Test_Rtimedate
HAVE_JAVA?Test_Sbatching
-HAVE_JAVA?Test_Rmetadata
-HAVE_JAVA?Test_Cmanycon
HAVE_JAVA?Test_JdbcClient
HAVE_JAVA?BugConcurrent_clients_SF_1504657
--- NEW FILE: Test_Clargequery.SQL ---
#!/bin/sh
$TSTSRCDIR/Test.SQL $*
--- NEW FILE: Test_Clargequery.stable.out ---
stdout of test 'Test_Clargequery` in directory 'src/jdbc/tests` itself:
# 12:43:18 >
# 12:43:18 > Mtimeout -timeout 180 mserver5
"--config=/ufs/fabian/scratch/monetdb/current/program-x86_64/etc/monetdb5.conf"
--debug=10 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/lib:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/sql/dbfarm"
--set
"sql_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/sql/sqllog"
--set
"xquery_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/sql/xquerylog"
--set mapi_open=true --set mapi_port=37519 --set xrpc_port=40296 --set
monet_prompt= --trace "--dbname=mTests_src_jdbc_tests" --dbinit=' include sql;'
; echo ; echo Over..
# 12:43:18 >
# MonetDB server v5.1.0, based on kernel v1.19.0
# Serving database 'mTests_src_jdbc_tests'
# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked
# Copyright (c) 1993-2007 CWI, all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
# Listening for connection requests on mapi:monetdb://pegasus.ins.cwi.nl:37519/
# MonetDB/SQL module v2.19.0 loaded
Ready.
#function user.main():void;
# clients.quit();
#end main;
Over..
# 12:43:19 >
# 12:43:19 > Mtimeout -timeout 60 ./Test_Clargequery.SQL Test_Clargequery
# 12:43:19 >
# 12:43:19 >
# 12:43:19 > java -classpath
/ufs/fabian/scratch/monetdb/current/program-x86_64/share/MonetDB/lib/monetdb-1.6-jdbc.jar:/ufs/fabian/scratch/monetdb/current/program-x86_64/share/MonetDB/Tests
Test_Clargequery
jdbc:monetdb://pegasus:37519/mTests_src_jdbc_tests?user=monetdb&password=monetdb
# 12:43:19 >
# 12:52:01 >
# 12:52:01 > java -classpath
/ufs/fabian/scratch/monetdb/current/program-x86_64/share/MonetDB/lib/monetdb-1.6-jdbc.jar:/ufs/fabian/scratch/monetdb/current/program-x86_64/share/MonetDB/Tests
Test_Clargequery
jdbc:monetdb://pegasus:35948/mTests_src_jdbc_tests?user=monetdb&password=monetdb
# 12:52:01 >
0. true true
1. sending
# 12:52:02 >
# 12:52:02 > Done.
# 12:52:02 >
Index: Test_PStypes.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/jdbc/tests/Tests/Test_PStypes.stable.out,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- Test_PStypes.stable.out 12 Jan 2007 12:25:19 -0000 1.4
+++ Test_PStypes.stable.out 16 Aug 2007 10:59:01 -0000 1.4.4.1
@@ -1,19 +1,22 @@
stdout of test 'Test_PStypes` in directory 'src/jdbc/tests` itself:
-# 16:35:35 >
-# 16:35:35 > Mtimeout -timeout 180 Mserver
"--config=/ufs/niels/scratch/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set
"monet_mod_path=/ufs/niels/scratch/Linux-x86_64/lib/MonetDB:/ufs/niels/scratch/Linux-x86_64/lib/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/Linux-x86_64/var/MonetDB/dbfarm" --set
"sql_logdir=/ufs/niels/scratch/Linux-x86_64/var/MonetDB/log" --set
mapi_port=32659 --set monet_prompt= --trace "--dbname=mTests_src_jdbc_tests"
--dbinit="module(sql_server); sql_server_start();" ; echo ; echo Over..
-# 16:35:35 >
-
-# Monet Database Server V4.11.3
-# Copyright (c) 1993-2006, CWI. All rights reserved.
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically
linked.
-# Visit http://monetdb.cwi.nl/ for further information.
+# 12:31:47 >
+# 12:31:47 > Mtimeout -timeout 180 mserver5
"--config=/ufs/fabian/scratch/monetdb/current/program-x86_64/etc/monetdb5.conf"
--debug=10 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/lib:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/sql/dbfarm"
--set
"sql_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/sql/sqllog"
--set
"xquery_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/sql/xquerylog"
--set mapi_open=true --set mapi_port=32537 --set xrpc_port=46740 --set
monet_prompt= --trace "--dbname=mTests_src_jdbc_tests" --dbinit=' include sql;'
; echo ; echo Over..
+# 12:31:47 >
-printf("\nReady.\n");
+# MonetDB server v5.1.0, based on kernel v1.19.0
+# Serving database 'mTests_src_jdbc_tests'
+# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked
+# Copyright (c) 1993-2007 CWI, all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://pegasus.ins.cwi.nl:32537/
+# MonetDB/SQL module v2.19.0 loaded
Ready.
-quit();
+#function user.main():void;
+# clients.quit();
+#end main;
Over..
@@ -28,6 +31,7 @@
0. false false
1. inserting a record...success :)
+2. updating record...success :)
# 16:35:37 >
# 16:35:37 > Done.
--- NEW FILE: Test_Clargequery.SQL.bat ---
@call %TSTSRCDIR%\Test.SQL.bat %*
Index: Test.SQL
===================================================================
RCS file: /cvsroot/monetdb/sql/src/jdbc/tests/Tests/Test.SQL,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- Test.SQL 12 Jan 2007 12:44:01 -0000 1.1
+++ Test.SQL 16 Aug 2007 10:57:56 -0000 1.1.4.1
@@ -4,4 +4,4 @@
JAR="`ls $pdd/lib/monetdb-*.*-jdbc.jar | head -n1`"
URL="jdbc:monetdb://${HOST}:${MAPIPORT}/${TSTDB}?user=monetdb&password=monetdb${JDBC_EXTRA_ARGS}"
-Mlog -x "java -classpath $JAR:`monetdb-clients-config --pkgdatadir`/Tests
${TST} \"${URL}\""
+Mlog -x "java -classpath $JAR:$pdd/Tests ${TST} \"${URL}\""
--- NEW FILE: Test_Clargequery.stable.err ---
stderr of test 'Test_Clargequery` in directory 'src/jdbc/tests` itself:
# 12:43:18 >
# 12:43:18 > Mtimeout -timeout 180 mserver5
"--config=/ufs/fabian/scratch/monetdb/current/program-x86_64/etc/monetdb5.conf"
--debug=10 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/lib:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/sql/dbfarm"
--set
"sql_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/sql/sqllog"
--set
"xquery_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/sql/xquerylog"
--set mapi_open=true --set mapi_port=37519 --set xrpc_port=40296 --set
monet_prompt= --trace "--dbname=mTests_src_jdbc_tests" --dbinit=' include sql;'
; echo ; echo Over..
# 12:43:18 >
#warning: please don't forget to set your vault key!
#(see /ufs/fabian/scratch/monetdb/current/program-x86_64/etc/monetdb5.conf)
# 12:43:19 >
# 12:43:19 > Mtimeout -timeout 60 ./Test_Clargequery.SQL Test_Clargequery
# 12:43:19 >
# 12:43:19 >
# 12:43:19 > java -classpath
/ufs/fabian/scratch/monetdb/current/program-x86_64/share/MonetDB/lib/monetdb-1.6-jdbc.jar:/ufs/fabian/scratch/monetdb/current/program-x86_64/share/MonetDB/Tests
Test_Clargequery
jdbc:monetdb://pegasus:37519/mTests_src_jdbc_tests?user=monetdb&password=monetdb
# 12:43:19 >
# 12:43:19 >
# 12:43:19 > Done.
# 12:43:19 >
Index: Test_JdbcClient.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/jdbc/tests/Tests/Test_JdbcClient.SQL.bat,v
retrieving revision 1.17.4.1
retrieving revision 1.17.4.2
diff -u -d -r1.17.4.1 -r1.17.4.2
--- Test_JdbcClient.SQL.bat 5 Jun 2007 18:03:33 -0000 1.17.4.1
+++ Test_JdbcClient.SQL.bat 16 Aug 2007 10:58:58 -0000 1.17.4.2
@@ -1,6 +1,6 @@
@echo off
-set JAR="%CLIENTS_PREFIX%\share\MonetDB\lib\jdbcclient-1.6.jar"
+set JAR="%CLIENTS_PREFIX%\share\MonetDB\lib\jdbcclient.jar"
echo user=monetdb> .monetdb
echo password=monetdb>> .monetdb
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
