Changeset: a146c59e94f6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a146c59e94f6
Removed Files:
monetdb5/modules/mal/Tests/remote01.malC
monetdb5/modules/mal/Tests/remote01.stable.err
monetdb5/modules/mal/Tests/remote01.stable.out
monetdb5/modules/mal/Tests/remote02.malC
monetdb5/modules/mal/Tests/remote02.stable.err
monetdb5/modules/mal/Tests/remote02.stable.out
monetdb5/modules/mal/Tests/remote03.malC
monetdb5/modules/mal/Tests/remote03.stable.err
monetdb5/modules/mal/Tests/remote03.stable.out
monetdb5/modules/mal/Tests/remote04.malC
monetdb5/modules/mal/Tests/remote04.stable.err
monetdb5/modules/mal/Tests/remote04.stable.out
monetdb5/modules/mal/Tests/remote06.malC
monetdb5/modules/mal/Tests/remote06.stable.err
monetdb5/modules/mal/Tests/remote06.stable.out
monetdb5/modules/mal/Tests/remote07.malC
monetdb5/modules/mal/Tests/remote07.stable.err
monetdb5/modules/mal/Tests/remote07.stable.out
monetdb5/modules/mal/Tests/remote08.malC
monetdb5/modules/mal/Tests/remote08.stable.err
monetdb5/modules/mal/Tests/remote08.stable.out
monetdb5/modules/mal/Tests/remote09.malC
monetdb5/modules/mal/Tests/remote09.stable.err
monetdb5/modules/mal/Tests/remote09.stable.out
monetdb5/modules/mal/Tests/remote10.malC
monetdb5/modules/mal/Tests/remote10.stable.err
monetdb5/modules/mal/Tests/remote10.stable.out
monetdb5/modules/mal/Tests/remote11.malC
monetdb5/modules/mal/Tests/remote11.stable.err
monetdb5/modules/mal/Tests/remote11.stable.out
monetdb5/modules/mal/Tests/remote12.malC
monetdb5/modules/mal/Tests/remote12.stable.err
monetdb5/modules/mal/Tests/remote12.stable.out
monetdb5/modules/mal/Tests/remote13.malC
monetdb5/modules/mal/Tests/remote13.stable.err
monetdb5/modules/mal/Tests/remote13.stable.out
monetdb5/modules/mal/Tests/remote80.malC
monetdb5/modules/mal/Tests/remote88.malC
monetdb5/modules/mal/Tests/remote88.stable.err
monetdb5/modules/mal/Tests/remote88.stable.out
monetdb5/modules/mal/Tests/remote99.malC
monetdb5/modules/mal/Tests/remote99.stable.err
monetdb5/modules/mal/Tests/remote99.stable.out
monetdb5/modules/mal/Tests/sabaoth00.malC
monetdb5/modules/mal/Tests/sabaoth01.malC
monetdb5/modules/mal/Tests/sabaoth01.stable.err
monetdb5/modules/mal/Tests/sabaoth01.stable.out
Modified Files:
monetdb5/modules/mal/Tests/All
Branch: default
Log Message:
removed tests after interface cleanup
diffs (truncated from 17283 to 300 lines):
diff --git a/monetdb5/modules/mal/Tests/All b/monetdb5/modules/mal/Tests/All
--- a/monetdb5/modules/mal/Tests/All
+++ b/monetdb5/modules/mal/Tests/All
@@ -31,28 +31,6 @@ mat
remoteInit
-!BAD_HOSTNAME?remote01
-!BAD_HOSTNAME?remote02
-!BAD_HOSTNAME&HAVE_GEOM?remote03
-!BAD_HOSTNAME?remote04
-!BAD_HOSTNAME?remote06
-!BAD_HOSTNAME?remote07
-!BAD_HOSTNAME?remote08
-!BAD_HOSTNAME?remote09
-!BAD_HOSTNAME?remote11
-!BAD_HOSTNAME?remote12
-!BAD_HOSTNAME?remote13
-# needs Merovingian and aims at SQL
-#!BAD_HOSTNAME?remote88
-#!BAD_HOSTNAME?remote89
-!BAD_HOSTNAME?remote99
-
-!BAD_HOSTNAME?remote10
-
-# this will always return something else
-#!BAD_HOSTNAME?sabaoth00
-!BAD_HOSTNAME?sabaoth01
-
partition
batpartition
printf
diff --git a/monetdb5/modules/mal/Tests/remote01.malC
b/monetdb5/modules/mal/Tests/remote01.malC
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/remote01.malC
+++ /dev/null
@@ -1,26 +0,0 @@
-# for testweb, we need to ask the server itself how it is available, use
-# sabaoth for that
-include sabaoth;
-
-# create a connecton to ourself
-uri := sabaoth.getLocalConnectionURI();
-conn := remote.connect(uri, "monetdb", "monetdb");
-io.print(conn);
-
-# retrieve a value (that for sure won't exist)
-x:str := remote.get(conn, "b1_str");
-# bit weird that a "may not be used before being initialised" error is a
-# TypeException
-catch TypeException:str;
- io.printf("!%s\n", TypeException);
-exit TypeException;
-
-# help testweb a bit, since currently no cleanup is done on server
-# shutdown
-remote.disconnect(conn);
-
-# this should fail now
-remote.disconnect(conn);
-catch MALException:str;
- io.printf("!%s\n",MALException);
-exit MALException;
diff --git a/monetdb5/modules/mal/Tests/remote01.stable.err
b/monetdb5/modules/mal/Tests/remote01.stable.err
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/remote01.stable.err
+++ /dev/null
@@ -1,44 +0,0 @@
-stderr of test 'remote01` in directory 'monetdb5/modules/mal` itself:
-
-
-# 09:35:17 >
-# 09:35:17 > Mtimeout -timeout 60 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/five/dbfarm"
--set
"sql_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/five/sqllog"
--set
"xquery_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/five/xquerylog"
--set mapi_open=true --set mapi_port=37413 --set xrpc_port=46951 --set
monet_prompt= --trace --dbname=mTests_src_modules_mal remote01.mal
-# 09:35:17 >
-
-#warning: please don't forget to set your vault key!
-#(see /ufs/fabian/scratch/monetdb/current/program-x86_64/etc/monetdb5.conf)
-
-
-MAPI = (monetdb) /var/tmp/mtest-28552/.s.monetdb.35023
-QUERY = # for testweb, we need to ask the server itself how it is available,
use
- # sabaoth for that
- include sabaoth;
-
- # create a connecton to ourself
- uri := sabaoth.getLocalConnectionURI();
- conn := remote.connect(uri, "monetdb", "monetdb");
- io.print(conn);
-
- # retrieve a value (that for sure won't exist)
- x:str := remote.get(conn, "b1_str");
- # bit weird that a "may not be used before being initialised" error is
a
- # TypeException
- catch TypeException:str;
- io.printf("!%s\n", TypeException);
- exit TypeException;
-
- # help testweb a bit, since currently no cleanup is done on server
- # shutdown
- remote.disconnect(conn);
-
- # this should fail now
- remote.disconnect(conn);
- catch MALException:str;
- io.printf("!%s\n",MALException);
- exit MALException;
-ERROR =
!TypeException:remote.get:(mapi:monetdb://[email protected]/mTests_monetdb5_modules_mal)
'b1_str' may not be used before being initialized
-
-# 09:58:28 >
-# 09:58:28 > "Done."
-# 09:58:28 >
-
diff --git a/monetdb5/modules/mal/Tests/remote01.stable.out
b/monetdb5/modules/mal/Tests/remote01.stable.out
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/remote01.stable.out
+++ /dev/null
@@ -1,36 +0,0 @@
-stdout of test 'remote01` in directory 'monetdb5/modules/mal` itself:
-
-
-# 09:58:28 >
-# 09:58:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35023" "--set"
"mapi_usock=/var/tmp/mtest-28552/.s.monetdb.35023" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"--set" "mal_listing=2" "--set" "embedded_r=yes"
-# 09:58:28 >
-
-# MonetDB 5 server v11.22.0
-# This is an unreleased version
-# Serving database 'mTests_monetdb5_modules_mal', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
-# Found 15.589 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:35023/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-28552/.s.monetdb.35023
-# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.4'
-# Finished reading the write-ahead log 'sql_logs/sql/log.4'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-
-# 09:58:28 >
-# 09:58:28 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-28552" "--port=35023"
-# 09:58:28 >
-
-[ "mTests_monetdb5_modules_mal_monetdb_0" ]
-
-# 10:57:19 >
-# 10:57:19 > Done.
-# 10:57:19 >
-
diff --git a/monetdb5/modules/mal/Tests/remote02.malC
b/monetdb5/modules/mal/Tests/remote02.malC
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/remote02.malC
+++ /dev/null
@@ -1,34 +0,0 @@
-# let connect figure out itself how to connect to the running db
-uri := sabaoth.getLocalConnectionURI();
-conn:str := remote.connect(uri, "monetdb", "monetdb");
-
-a:str := "Fabian!";
-b:flt := 4.3;
-c:int := 12;
-d:bat[:str] := bat.new(:str);
-
-bat.append(d, "bla");
-bat.append(d, nil:str);
-bat.append(d, "boe");
-
-# store the values
-i:str := remote.put(conn, a);
-j:str := remote.put(conn, b);
-k:str := remote.put(conn, c);
-l:str := remote.put(conn, d);
-
-# retrieve the values
-r:str := remote.get(conn, i);
-s:flt := remote.get(conn, j);
-t:int := remote.get(conn, k);
-u:bat[:str] := remote.get(conn, l);
-
-# see if it really is here
-io.print(r);
-io.print(s);
-io.print(t);
-io.print(u);
-
-# help testweb a bit, since currently no cleanup is done on server
-# shutdown
-remote.disconnect(conn);
diff --git a/monetdb5/modules/mal/Tests/remote02.stable.err
b/monetdb5/modules/mal/Tests/remote02.stable.err
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/remote02.stable.err
+++ /dev/null
@@ -1,14 +0,0 @@
-stderr of test 'remote02` in directory 'monetdb5/modules/mal` itself:
-
-
-# 14:16:07 >
-# 14:16:07 > Mtimeout -timeout 60 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/five/dbfarm"
--set
"sql_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/five/sqllog"
--set
"xquery_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/five/xquerylog"
--set mapi_open=true --set mapi_port=35191 --set xrpc_port=49347 --set
monet_prompt= --trace --dbname=mTests_src_modules_mal remote02.mal
-# 14:16:07 >
-
-#warning: please don't forget to set your vault key!
-#(see /ufs/fabian/scratch/monetdb/current/program-x86_64/etc/monetdb5.conf)
-
-# 14:16:07 >
-# 14:16:07 > Done.
-# 14:16:07 >
-
diff --git a/monetdb5/modules/mal/Tests/remote02.stable.out
b/monetdb5/modules/mal/Tests/remote02.stable.out
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/remote02.stable.out
+++ /dev/null
@@ -1,45 +0,0 @@
-stdout of test 'remote02` in directory 'monetdb5/modules/mal` itself:
-
-
-# 09:46:20 >
-# 09:46:20 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35410" "--set"
"mapi_usock=/var/tmp/mtest-26774/.s.monetdb.35410" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"--set" "mal_listing=2" "--set" "embedded_r=yes"
-# 09:46:20 >
-
-# MonetDB 5 server v11.22.0
-# This is an unreleased version
-# Serving database 'mTests_monetdb5_modules_mal', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
-# Found 15.589 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:35410/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26774/.s.monetdb.35410
-# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.4'
-# Finished reading the write-ahead log 'sql_logs/sql/log.4'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-
-# 09:46:21 >
-# 09:46:21 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-26774" "--port=35410"
-# 09:46:21 >
-
-[ "Fabian!" ]
-[ 4.3 ]
-[ 12 ]
-#-----------------#
-# h t # name
-# str int # type
-#-----------------#
-[ 0@0, "bla" ]
-[ 1@0, nil ]
-[ 2@0, "boe" ]
-
-# 23:21:31 >
-# 23:21:31 > "Done."
-# 23:21:31 >
-
diff --git a/monetdb5/modules/mal/Tests/remote03.malC
b/monetdb5/modules/mal/Tests/remote03.malC
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/remote03.malC
+++ /dev/null
@@ -1,65 +0,0 @@
-# let connect figure out itself how to connect to the running db
-uri := sabaoth.getLocalConnectionURI();
-conn:str := remote.connect(uri, "monetdb", "monetdb");
-
-# this is invalid, as io.print is an invalid module, and bla will be
-# taken as function
-function tst(conn:str);
-res:str := remote.put(conn,:void);
-res := remote.exec(conn, "io.print", "bla");
-catch SyntaxException:str;
- io.print("Received first error from the remote site");
- io.printf("!%s\n", SyntaxException);
-exit SyntaxException;
-
-# now do it with a function that returns something (a BAT in this case)
-bn:= bat.new(:str);
-b := remote.put(conn,bn);
-catch MALException:str;
- io.print("Received second init error from the remote site");
- io.printf("!%s\n", MALException);
-exit MALException;
-io.print(b);
-b := remote.exec(conn, "inspect", "getAtomNames");
-catch MALException:str;
- io.print("Received second error from the remote site");
- io.printf("!%s\n", MALException);
-exit MALException;
-io.print(b);
-
-c:bat[:str] := remote.get(conn, b);
-io.print(c);
-catch MALException:str;
- io.print("Received third error from the remote site");
- io.printf("!%s\n", MALException);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
