Changeset: 089ccbcf23a4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=089ccbcf23a4
Modified Files:
Branch: default
Log Message:
Merge with Dec2011 branch.
diffs (79 lines):
diff --git a/tools/merovingian/client/monetdb.1
b/tools/merovingian/client/monetdb.1
--- a/tools/merovingian/client/monetdb.1
+++ b/tools/merovingian/client/monetdb.1
@@ -186,17 +186,8 @@ file, or a local override.
Sets property to value for the given database. For a list of
properties, run
.BR "monetdb get all" .
-Most properties require the database to be stopped when set. The
-following properties have special values, or do not have an equivalent
-option for
-.BR mserver5 (1).
-.IP " forward=<redirect|proxy>"
-When set to redirect, monetdbd tells each connecting client to make a
-new connection directly to the database the client looks for. This
-requires that the separate mserver5 processes are reachable by the ports
-they use. Since this may not be the case due to a firewall, when set to
-proxy, monetdbd tunnels the client to the right database.
-.IP " share=<yes|no|tag>"
+Most properties require the database to be stopped when set.
+.IP " shared=<yes|no|tag>"
Defines if and how the database is being announced to other monetdbds
or not. If not set to
.I "yes"
@@ -211,6 +202,19 @@ in the
.BR monetdbd (1)
manpage. Note that this property can be set for a running database, and
that a change takes immediate effect in the network.
+.IP " nthreads=<number>"
+Defines how many worker threads the server should use to perform main
+processing. Normally, this number equals the number of available CPU
+cores in the system. Reducing this number forces the server to use less
+parallelism when executing queries, or none at all if set to
+.IR 1 .
+.IP " optpipe=<string>"
+Each server operates with a given optimiser pipeline. While the default
+usually is the best setting, for some experimental uses the pipeline can
+be changed. See the
+.BR mserver5 (1)
+manpage for available pipelines. Changing this setting is discouraged
+at all times.
.IP " master=<yes|no|id>"
Defines if the database is to be started as a replication master
.RI ( yes ", " id "), or not (" no ).
@@ -233,7 +237,15 @@ A valid URI looks like
.BI mapi:monetdb:// hostname : port / database
which is a regular mapi URI.
.IP " readonly=<yes|no>"
-Defines if the database has to be started in readonly mode.
+Defines if the database has to be started in readonly mode. Updates are
+rejected in this mode, and the server employs some read-only
+optimisations that can lead to improved performance.
+.IP " nclients=<number>"
+Sets the maximum amount of clients that can connect to this database at
+the same time. Setting this to a high value is discouraged. A
+multiplex-funnel may be more performant, see
+.I MULTIPLEX-FUNNEL
+below.
.IP "inherit property database [database ...]"
Like set, but unsets the database-local value, and reverts to inherit
from the default again.
diff --git a/tools/mserver/mserver5.1 b/tools/mserver/mserver5.1
--- a/tools/mserver/mserver5.1
+++ b/tools/mserver/mserver5.1
@@ -197,6 +197,15 @@ database makes that database unusable as
login. If you use
.BR monetdbd (1),
a per-database vault key is set.
+.IP "max_clients"
+Controls how many client slots are allocated for clients to connect.
+This settings limits the maximum number of connected clients at the same
+time. Note that MonetDB is not designed to handle massive amounts of
+connected clients. The funnel capability from
+.BR monetdbd (1)
+might be a more suitable solution for such workloads.
+
+Default 64.
.SH "SQL PARAMETERS"
The SQL component of MonetDB 5 runs on top of the MAL environment. It
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
