Changeset: a901acf756bb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a901acf756bb
Modified Files:
MonetDB/HowToStart.rst
sql/NT/MSQLserver.bat
sql/src/backends/monet5/embeddedclient.c.in
sql/src/backends/monet5/merovingian/merovingian_forkmserver.c
sql/src/test/Connections/run.all
sql/src/test/Update_Delete_action/run.all
testing/README
testing/src/Mtest.py.in
testing/src/process.py
testing/src/quicktest
Branch: Jun2010
Log Message:
removed obsolete `--dbinit="include sql;"`:
since
"
changeset: 35798:012689f349f1
branch: Jun2010
parent: 35794:1fe5b9ec7a74
parent: 35796:9fffbf556ccf
user: m...@cwi.nl
date: Thu May 06 16:18:10 2010 +0200
description:
The mserver takes the standpoint that it knows the possible non-conflicting
packages
that the user can install. It will, upon bootstrap, attempt to load all the
modules
associated. This means that the "--dbinit=include sql;sql.start();" sequence
has become
void. Likewise, "--dbinit=include geom;include sql;sql.start();" is not needed.
"
mserver5 loads module sql automatically at start-up in case the module is
available;
consequently, there is no need anymore to load module sql explicitly using
`--dbinit="include sql;"`.
diffs (174 lines):
diff -r 01e0593bc69e -r a901acf756bb MonetDB/HowToStart.rst
--- a/MonetDB/HowToStart.rst Sun May 09 13:55:04 2010 +0200
+++ b/MonetDB/HowToStart.rst Mon May 10 08:06:52 2010 +0200
@@ -404,13 +404,17 @@
The disadvantage of running the systems interactively is that you
don't get readline support (if available on your system). A more
pleasant environment can be had by using the system as a server and
-using ``mclient`` to interact with the system. For MonetDB4 use::
+using ``mclient`` to interact with the system.
+
+When MonetDB5 is started as above, it automatically starts the MAL
+server in addition to the interactive "console". In case the
+MonetDB/SQL package is also installed, MonetDB5 does automatically
+load it and start the SQL server.
+
+In case of MonetDB4, to start only the MIL server use::
Mserver --dbinit 'module(mapi); mil_start();'
-When MonetDB5 is started as above, it automatically starts the server
-in addition to the interactive "console".
-
In order to use the XQuery back-end, which is only available with
MonetDB4, start the server as follows::
@@ -421,18 +425,6 @@
Mserver --dbinit 'module(pathfinder); mil_start();'
-In order to use the SQL back-end with MonetDB4, use::
-
- Mserver --dbinit 'module(sql_server);'
-
-If you want to have a MIL server in addition to the SQL server, use::
-
- Mserver --dbinit 'module(sql_server); mil_start();'
-
-In order to use the SQL back-end with MonetDB5, use::
-
- mserver5 --dbinit 'include sql;'
-
Once the server is running, you can use ``mclient`` to interact
with the server. ``mclient`` needs to be told which language you
want to use, but it does not need to be told whether you're using
diff -r 01e0593bc69e -r a901acf756bb sql/NT/MSQLserver.bat
--- a/sql/NT/MSQLserver.bat Sun May 09 13:55:04 2010 +0200
+++ b/sql/NT/MSQLserver.bat Mon May 10 08:06:52 2010 +0200
@@ -10,6 +10,6 @@
rem start the real server
-"%MONETDB%\M5server.bat" --dbinit="include sql;" %*
+"%MONETDB%\M5server.bat" %*
endlocal
diff -r 01e0593bc69e -r a901acf756bb sql/src/backends/monet5/embeddedclient.c.in
--- a/sql/src/backends/monet5/embeddedclient.c.in Sun May 09 13:55:04
2010 +0200
+++ b/sql/src/backends/monet5/embeddedclient.c.in Mon May 10 08:06:52
2010 +0200
@@ -101,7 +101,6 @@
out = ((stream **) arg)[1];
free(arg);
snprintf(buf, sizeof(buf),
- "include sql;\n"
"in := \"" PTRFMT "\":streams;\n"
"out := \"" PTRFMT "\":streams;\n"
"mapi.malclient(in, out);\n", PTRFMTCAST in, PTRFMTCAST out);
diff -r 01e0593bc69e -r a901acf756bb
sql/src/backends/monet5/merovingian/merovingian_forkmserver.c
--- a/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Sun May
09 13:55:04 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Mon May
10 08:06:52 2010 +0200
@@ -292,7 +292,6 @@
argv[c++] = _mero_mserver;
argv[c++] = conffile;
argv[c++] = dbname;
- argv[c++] = "--dbinit=include sql;"; /* yep, no quotes needed!
*/
argv[c++] = "--set"; argv[c++] = muri;
if (mydoproxy == 1) {
argv[c++] = "--set"; argv[c++] = "mapi_open=false";
diff -r 01e0593bc69e -r a901acf756bb sql/src/test/Connections/run.all
--- a/sql/src/test/Connections/run.all Sun May 09 13:55:04 2010 +0200
+++ b/sql/src/test/Connections/run.all Mon May 10 08:06:52 2010 +0200
@@ -28,8 +28,8 @@
#Generate Data...
#Bulk-Load into SQL server...
-mserver5 --dbname=demo --set mapi_port=50000 --dbinit="include sql;"
--daemon=yes &
-mserver5 --dbname=demo2 --set mapi_port=40000 --dbinit="include sql;"
--daemon=yes &
+mserver5 --dbname=demo --set mapi_port=50000 --daemon=yes &
+mserver5 --dbname=demo2 --set mapi_port=40000 --daemon=yes &
sleep 5
echo syntax
diff -r 01e0593bc69e -r a901acf756bb sql/src/test/Update_Delete_action/run.all
--- a/sql/src/test/Update_Delete_action/run.all Sun May 09 13:55:04 2010 +0200
+++ b/sql/src/test/Update_Delete_action/run.all Mon May 10 08:06:52 2010 +0200
@@ -20,7 +20,7 @@
PWD=`pwd`
echo $PWD
SQL='mclient -p$MAPIPORT -lsql -umonetdb -Pmonetdb'
-M5='mserver5 --dbname=demo --set mapi_port=$MAPIPORT --dbinit="include sql;"'
+M5='mserver5 --dbname=demo --set mapi_port=$MAPIPORT'
if [ $# -eq 1 ]; then
SQL=$1
fi
diff -r 01e0593bc69e -r a901acf756bb testing/README
--- a/testing/README Sun May 09 13:55:04 2010 +0200
+++ b/testing/README Mon May 10 08:06:52 2010 +0200
@@ -140,7 +140,7 @@
mclient -lsql < TST[_(s|p)XX].sql
or TST.SQL.(sh|exe|com|bat|cmd) TST
or python TST.SQL.py
- * mserver5 --dbname=TSTDB --set mapi_port=$MAPIPORT --set
xrpc_port=$XRPCPORT --dbinit="[<TST.dbinit5] include sql;" [TST.prologue5] &
+ * mserver5 --dbname=TSTDB --set mapi_port=$MAPIPORT --set
xrpc_port=$XRPCPORT --dbinit="[<TST.dbinit5]" [TST.prologue5] &
mclient -lsql < TST[_(s|p)XX].sql
or TST.SQL.(sh|exe|com|bat|cmd) TST
or python TST..SQL.py
diff -r 01e0593bc69e -r a901acf756bb testing/src/Mtest.py.in
--- a/testing/src/Mtest.py.in Sun May 09 13:55:04 2010 +0200
+++ b/testing/src/Mtest.py.in Mon May 10 08:06:52 2010 +0200
@@ -2324,7 +2324,9 @@
if SERVER == "SQL":
lang="sql"
if par['M5']:
- Srvr = '%s --set mal_listing=0 "--dbinit=%s include sql;"'
% (Srvr, DBINIT)
+ Srvr = '%s --set mal_listing=0' % Srvr
+ if DBINIT:
+ Srvr = '%s "--dbinit=%s"' % (Srvr, DBINIT)
if par['M4']:
Srvr = '%s "--dbinit=%s module(sql_server);"' % (Srvr,
DBINIT)
if SERVER == "XQUERY":
@@ -3660,14 +3662,11 @@
MissingMods = CheckMods(env, '', 'SQL', '')
if MissingMods:
ErrXit('Stopping SQL testing as modules "%s" are missing!' %
str(MissingMods))
- if par['M5']:
- mod_name = 'sql'
- mod_load = 'include %s;' % mod_name
if par['M4']:
mod_name = 'sql_server'
mod_load = 'module(%s);' % mod_name
- if Check('%s --dbname=%s "--dbinit=%s"' %
(env['exe']['Mserver'][1], TSTPREF, mod_load), QUIT):
- ErrXit('Stopping SQL testing as module "%s" fails to load!' %
mod_name)
+ if Check('%s --dbname=%s "--dbinit=%s"' %
(env['exe']['Mserver'][1], TSTPREF, mod_load), QUIT):
+ ErrXit('Stopping SQL testing as module "%s" fails to
load!' % mod_name)
is_pf = par['PACKAGE'] == 'monetdb-xquery'
if not is_pf:
diff -r 01e0593bc69e -r a901acf756bb testing/src/process.py
--- a/testing/src/process.py Sun May 09 13:55:04 2010 +0200
+++ b/testing/src/process.py Mon May 10 08:06:52 2010 +0200
@@ -135,9 +135,7 @@
'--set', 'xrpc_open=true', '--set', 'monet_prompt=',
'--trace'])
if dbinit is None:
- if lang == 'sql':
- dbinit = 'include sql;'
- elif lang == 'xquery':
+ if lang == 'xquery':
dbinit = 'module(pathfinder);'
if dbinit is not None:
cmd.append('--dbinit')
diff -r 01e0593bc69e -r a901acf756bb testing/src/quicktest
--- a/testing/src/quicktest Sun May 09 13:55:04 2010 +0200
+++ b/testing/src/quicktest Mon May 10 08:06:52 2010 +0200
@@ -224,10 +224,6 @@
--set mapi_port=${port}
--set monet_daemon=yes
)
- [[ ${lang} == sql ]] && args=(
- ${ar...@]}
- --dbinit="include sql;"
- )
echo "#" "${ar...@]}" > "${p}"/stdout
echo "#" "${ar...@]}" > "${p}"/stderr
"${ar...@]}" \
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
