Changeset: 5df03a5b6c67 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5df03a5b6c67
Modified Files:
tools/merovingian/client/monetdb.1
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/monetdbd.1.in
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (148 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
@@ -78,8 +78,6 @@ utility are
.BR start ,
.BR stop ,
.BR kill ,
-.BR profilerstart ,
-.BR profilerstop ,
.BR snapshot ,
.BR set ,
.BR get ,
@@ -282,7 +280,7 @@ the operation on other databases was suc
\fBmonetdb\fP \fBsnapshot\fP \fBwrite\fP \fIdbname\fP
Takes a snapshot of the given database and writes it to stdout.
.TP
-\fBmonetdb\fP \fBsnapshot\fP \fBcreate\fP [\fB-t\fP \fItargetfile\fP]
\fIdbname\fP [\fIdbname\fP..]
+\fBmonetdb\fP \fBsnapshot\fP \fBcreate\fP [\fB\-t\fP \fItargetfile\fP]
\fIdbname\fP [\fIdbname\fP ...]
Takes a snapshot of the given databases.
Here,
.I dbname
@@ -290,7 +288,7 @@ can be either the name of a single datab
.I staging*
indicating multiple databases to snapshot.
Unless
-.B -t
+.B \-t
is given, the snapshots are written to files named
.I <snapshotdir>/<dbname>_<YYYY><MM><DD>T<HH><MM>UTC<snapshotcompression>
where
@@ -309,7 +307,7 @@ setting which defaults to
or
.IR .tar .
If
-.B -t
+.B \-t
is given, only a single database can be snapshotted and the snapshot
is written to
.IR targetfile ,
@@ -317,7 +315,7 @@ a file on the server which must be somew
.I snapshotdir
but which does not have to follow any particular naming convention.
.TP
-\fBmonetdb\fP \fBsnapshot\fP \fBlist\fP [\fIdbname\fP..]
+\fBmonetdb\fP \fBsnapshot\fP \fBlist\fP [\fIdbname\fP ...]
Lists the snapshots for the given databases, or all databases if none
is given, showing the snapshot id, the time the snapshot was taken and
the (compressed) size of the snapshot file. Only snapshots following
@@ -329,7 +327,7 @@ of a database, 2 for the next most recen
snapshot for each database shows the full snapshot id (\fIdbname\fP@1) and
older snapshots for the same database are listed just as @2, @3, etc.
.TP
-\fBmonetdb\fP \fBsnapshot\fP \fBrestore\fP [\fB-f\fP] \fIsnapshotid\fP
[\fIdbname\fP]
+\fBmonetdb\fP \fBsnapshot\fP \fBrestore\fP [\fB\-f\fP] \fIsnapshotid\fP
[\fIdbname\fP]
Restores a database from the given snapshot, where
.I snapshotid
is either a path on the server or \fIname\fP@\fItag\fP as listed by
@@ -342,17 +340,17 @@ omitted unless
.I snapshotid
is a full path.
When
-.B -f
+.B \-f
is given, no confirmation is asked when overwriting an existing database.
.TP
-\fBmonetdb\fP \fBsnapshot\fP \fBdestroy\fP [\fB-f\fP] \fIname\fP@\fItag\fP..
+\fBmonetdb\fP \fBsnapshot\fP \fBdestroy\fP [\fB\-f\fP] \fIname\fP@\fItag\fP
[\fIname\fP@\fItag\fP ...]
Delete the listed snapshots from the
.I snapshotdir
directory. When
-.B -f
+.B \-f
is given, no confirmation is asked.
.TP
-\fBmonetdb\fP \fBsnapshot\fP \fBdestroy\fP [\fB-f\fP] \fB-r\fP \fIN\fP
\fIdbname\fP..\&
+\fBmonetdb\fP \fBsnapshot\fP \fBdestroy\fP [\fB\-f\fP] \fB\-r\fP \fIN\fP
\fIdbname\fP [\fIdbname\fP ...]\&
Delete all but the
.I N
latest snapshots for the given databases.
@@ -364,7 +362,7 @@ or even
.I *
to work on all snapshotted databases.
When
-.B -f
+.B \-f
is given, no confirmation is asked.
.TP
\fBget\fP <\fBall\fP | \fIproperty\fP[,\fIproperty\fP[,..]]> [\fIdatabase\fP
...]
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -163,11 +163,11 @@ command_help(int argc, char *argv[])
printf(" prints the version of this monetdb utility\n");
} else if (strcmp(argv[1], "snapshot") == 0) {
if (argc > 2 && strcmp(argv[2], "list") == 0) {
- printf("Usage: monetdb snapshot list [<dbname>...]\n");
- printf(" List snapshots for the given database, or all
databases\n");
+ printf("Usage: monetdb snapshot list [<dbname> ...]\n");
+ printf(" List snapshots for the given database(s), or
all databases\n");
printf(" if none given.\n");
} else if (argc > 2 && strcmp(argv[2], "create") == 0) {
- printf("Usage: monetdb snapshot create [-t
<targetfile>] <dbname> [<dbname>..]\n");
+ printf("Usage: monetdb snapshot create [-t
<targetfile>] <dbname> [<dbname> ...]\n");
printf(" Take a snapshot of the listed databases.
Unless -t is given, the snapshots\n");
printf(" are written to files named\n");
printf("
<snapshotdir>/<dbname>_<YYYY><MM><DD>T<HH><MM>UTC<snapshotcompression>.\n");
@@ -175,14 +175,14 @@ command_help(int argc, char *argv[])
printf(" -t <targetfile> File on the server to write
the snapshot to.\n");
} else if (argc > 2 && strcmp(argv[2], "restore") == 0) {
printf("Usage: monetdb snapshot restore [-f] <snapid>
[dbname]\n");
- printf(" Create a database from the given snapshot,
where <snapid> is either\n");
+ printf(" Create a database from the given snapshot,
where <snapid> is either\n");
printf(" a path on the server or <dbname>@<num> as
produced by\n");
printf(" 'monetdb snapshot list'\n");
printf("Options:\n");
printf(" -f do not ask for confirmation\n");
} else if (argc > 2 && strcmp(argv[2], "destroy") == 0) {
- printf("Usage: monetdb snapshot destroy [-f]
<snapid>...\n");
- printf(" monetdb snapshot destroy [-f] -r <N>
<dbname>...\n");
+ printf("Usage: monetdb snapshot destroy [-f] <snapid>
[<snapid> ...]\n");
+ printf(" monetdb snapshot destroy [-f] -r <N>
<dbname> [<dbname> ...]\n");
printf(" Destroy one or more database snapshots,
identified by a database name\n");
printf(" and a sequence number as given by 'monetdb
snapshot list'.\n");
printf(" In the first form, the sequence numbers are
part of the <snapid>.\n");
@@ -195,8 +195,9 @@ command_help(int argc, char *argv[])
printf("Usage: monetdb snapshot write <dbname>\n");
printf(" Write a snapshot of database <dbname> to
standard out.\n");
} else {
- printf("Usage: monetdb
<create|list|restore|destroy|write> [arguments]\n");
- printf(" Manage database snapshots\n");
+ printf("Usage: monetdb snapshot subcommand
[arguments]\n");
+ printf(" where subcommand is one of:\n");
+ printf(" create, list, restore, destroy or write\n");
}
} else {
printf("help: unknown command: %s\n", argv[1]);
diff --git a/tools/merovingian/daemon/monetdbd.1.in
b/tools/merovingian/daemon/monetdbd.1.in
--- a/tools/merovingian/daemon/monetdbd.1.in
+++ b/tools/merovingian/daemon/monetdbd.1.in
@@ -151,7 +151,7 @@ For an explanation of the properties, se
.I CONFIGURATION
section below.
.TP
-\fBhelp [\fP \fIcommand\fP \fB]\fP
+\fBhelp\fP [ \fIcommand\fP ]
Shows general help, or short help for a given command.
.TP
.B version
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
