Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15221/src/backends/monet5
Modified Files:
merovingian.1 merovingian.mx monetdb.1 monetdb.mx
Log Message:
propagated changes of Tuesday Nov 20 2007 - Friday Nov 23 2007
from the SQL_2-20 branch to the development trunk
Index: monetdb.1
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/monetdb.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- monetdb.1 12 Sep 2007 12:54:05 -0000 1.1
+++ monetdb.1 23 Nov 2007 11:53:49 -0000 1.2
@@ -39,7 +39,7 @@
.IP \-f
By default, a confirmation question is asked, however the
.I \-f
-option, when provided, supresses this question and removal is executed
+option, when provided, suppresses this question and removal is executed
right away. Note that you cannot destroy a running database, bring it
down first using the
.B stop
@@ -52,10 +52,10 @@
account). A database which is under maintenance is not started
automatically by
.BR merovingian (1)
-, the MonetDB Database Server when clients request for it. Use the
+, the MonetDB Database Server, when clients request for it. Use the
.B release
command to bring the database back for normal usage. To start a
-database which in under maintenance for administrator access, the
+database which is under maintenance for administrator access, the
.B start
command can be used.
.IP "release database"
@@ -64,29 +64,28 @@
Use the
.B lock
command to take a database under maintenance.
-.IP "status [\-ls] [database ...]"
+.IP "status [\-lc] [database ...]"
Shows the state of the given database(s) or, when none given, all known
-databases. Three modes control the level of
-detail in the displayed output. By default the most used properties of
-a database are being shown. This includes the state of the database
-(running, crashed, stopped), whether it is under maintenance or not, the
-crash averages and uptime statistics. The crash average is the number
-of times the database has crashed over the last 1, 15 or 30 starts. The
-lower the average, the healthier the database is.
+databases. Three modes control the level of detail in the displayed
+output. By default a condensed one-line output per database format is
+used. This output resembles pretty much the output of various
+.B XXXstat
+functions, and is ideal for quickly gaining an overview of the system
+state.
+.IP \-c
+The
+.I \-c
+flag shows the most used properties of a database. This includes the
+state of the database (running, crashed, stopped), whether it is under
+maintenance or not, the crash averages and uptime statistics. The crash
+average is the number of times the database has crashed over the last 1,
+15 or 30 starts. The lower the average, the healthier the database is.
.IP \-l
Triggered by the
.I \-l
flag, a long listing is used. This listing spans many rows with on each
row one property and its value separated by a colon (`:'). The long
-listing includes every information that is available.
-.IP \-s
-Contrary to the long listing, the
-.I \-s
-flag produces a short, one-line output per database. This output
-resembles pretty much the output of various
-.B XXXstat
-functions, and is ideal for quickly gaining an overview of the system
-state.
+listing includes all information that is available.
.IP "start [\-a] [database ...]"
.IP "stop [\-a] [database ...]"
.IP "kill [\-a] [database ...]"
Index: merovingian.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian.mx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- merovingian.mx 12 Sep 2007 12:54:05 -0000 1.1
+++ merovingian.mx 23 Nov 2007 11:53:49 -0000 1.2
@@ -663,34 +663,13 @@
}
if (*database == '\0') {
- /* send a redirect to the "default" database, since we don't
- * know what "default" is, we can't do much more than
- * redirecting to the first database which appears to be
online. */
- str er = SABAOTHgetStatus(&top, NULL);
- if (er != MAL_SUCCEED) {
- err e = newErr(er);
- GDKfree(er);
- stream_printf(fout, "!internal error, please try again
later\n");
- stream_flush(fout);
- stream_close(fout);
- stream_close(fdin);
- return(e);
- }
- stat = top;
- while (stat != NULL) {
- if (stat->state == SABdbRunning) {
- break;
- }
- stat = stat->next;
- }
- if (stat == NULL) {
- SABAOTHfreeStatus(&top);
- stream_printf(fout, "!no database running, and no
database specified\n");
- stream_flush(fout);
- stream_close(fout);
- stream_close(fdin);
- return(newErr("no database running, and no database
specified"));
- }
+ /* we need to have a database, if we haven't gotten one,
+ * complain */
+ stream_printf(fout, "!please specify a database\n");
+ stream_flush(fout);
+ stream_close(fout);
+ stream_close(fdin);
+ return(newErr("no database specified"));
} else {
err e = forkMserver(database, &top, 0);
if (e != NO_ERR) {
Index: monetdb.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/monetdb.mx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- monetdb.mx 12 Sep 2007 12:54:05 -0000 1.1
+++ monetdb.mx 23 Nov 2007 11:53:49 -0000 1.2
@@ -330,8 +330,8 @@
printf(" average of crashes in the last 30 start attempts:
%.2f\n",
uplog.crashavg30);
} else {
- /* this is the default, also for modes that are added but we
- * don't understand (yet) */
+ /* this shows most used properties, and is shown also for modes
+ * that are added but we don't understand (yet) */
char buf[64];
char min[8], avg[8], max[8];
struct tm *t;
Index: merovingian.1
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- merovingian.1 12 Sep 2007 12:54:05 -0000 1.1
+++ merovingian.1 23 Nov 2007 11:53:49 -0000 1.2
@@ -101,15 +101,15 @@
option to a positive
non-zero value, causes each started database server to be shut down by
.B merovingian
-when it shuts doen itself with a given time-out in seconds. If the
+when it shuts down itself with a given time-out in seconds. If the
time-out expires, the database server is killed using the SIGKILL
signal. A time-out value of
.B 0
means that no attempt is made to shut down started database servers. As
a result, database servers will remain active after
.B merovingian
-is stopped. This situation may yield in confusing scenarios, hence you
-are strongly adviced to set the
+has stopped. This situation may yield in confusing scenarios, hence you
+are strongly advised to set the
.B mero_exittimeout
option as to override the
.B 0
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
