MonetDB: hot-snapshot - Some minor changes

[Joeri van Ruth]

Changeset: 1629a1d748aa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1629a1d748aa
Modified Files:
        tools/merovingian/client/monetdb.c
        tools/merovingian/daemon/snapshot.c
Branch: hot-snapshot
Log Message:

Some minor changes


diffs (64 lines):

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
@@ -1692,6 +1692,7 @@ command_profilerstop(int argc, char *arg
        simple_command(argc, argv, "profilerstop", "stopped profiler", 1);
 }
 
+/* Snapshot this single database to the given file */
 static void
 snapshot_create_adhoc(sabdb *databases, char *filename) {
        /* databases is supposed to only hold a single database */
@@ -1706,11 +1707,13 @@ snapshot_create_adhoc(sabdb *databases, 
        free(merocmd);
 }
 
+/* Create automatic snapshots of the given databases */
 static void
 snapshot_create_automatic(sabdb *databases) {
        simple_argv_cmd("snapshot", databases, "snapshot create automatic", 
NULL, "snapshotting database");
 }
 
+/* Comparison function used for qsort */
 static int
 snapshot_enumerate_helper(const void *left, const void *right)
 {
@@ -1732,6 +1735,7 @@ snapshot_enumerate_helper(const void *le
        return 0;
 }
 
+/* Retrieve a list of all snapshots and Store it in the array. */
 static char*
 snapshot_enumerate(struct snapshot **snapshots, int *nsnapshots)
 {
@@ -1782,7 +1786,7 @@ snapshot_enumerate(struct snapshot **sna
                return out;
        }
 
-       // Sort them and give names
+       // Sort them and give names of the form dbname@seqno
        if (*nsnapshots > ninitial) {
                int sort_len = *nsnapshots - ninitial;
                struct snapshot *sort_start = *snapshots + ninitial;
diff --git a/tools/merovingian/daemon/snapshot.c 
b/tools/merovingian/daemon/snapshot.c
--- a/tools/merovingian/daemon/snapshot.c
+++ b/tools/merovingian/daemon/snapshot.c
@@ -53,6 +53,7 @@ snapshot_database_to(char *dbname, char 
        if (e != NO_ERR) {
                goto bailout;
        }
+
        if (!stats) {
                e = newErr("No such database: '%s'", dbname);
                goto bailout;
@@ -117,6 +118,10 @@ snapshot_restore_from(char *dbname, char
        char *destpath = NULL;
        stream *instream = NULL;
 
+       e = db_validname(dbname);
+       if (e != NO_ERR)
+               goto bailout;
+
        /* Do not read random files on the system. */
        e = validate_location(source);
        if (e != NO_ERR) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list