ability to specify a different file name for the DB

diff --git a/Changelog b/Changelog
index e5df8c67bb99a1bc890d72bdac18dd5038a7a4a3..50f10d2c50f407bdb1316d86be9c07be364fed65 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+2009-04-27 log file parsing code improved a bit
+2009-04-27 bgsave_in_progress field in INFO output
+2009-04-27 INCRBY/DECRBY now support 64bit increments, with tests

 2009-04-23 RANDOMKEY regression test added
 2009-04-23 dictGetRandomKey bug fixed, RANDOMKEY will not block the server anymore
 2009-04-22 FLUSHALL/FLUSHDB no longer sync on disk. Just increment the dirty counter by the number of elements removed, that will probably trigger a background saving operation
 2009-04-23 RANDOMKEY regression test added
 2009-04-23 dictGetRandomKey bug fixed, RANDOMKEY will not block the server anymore
 2009-04-22 FLUSHALL/FLUSHDB no longer sync on disk. Just increment the dirty counter by the number of elements removed, that will probably trigger a background saving operation

diff --git a/TODO b/TODO
index 9c9225161736037efc8381ad31e23afeb0a5dad0..9b2fb3535635283661e6b6e8b13fc10536ee3a51 100644 (file)
--- a/TODO
+++ b/TODO
@@ -7,7 +7,6 @@ BEFORE REDIS 1.0.0-rc1
 - network layer stresser in test in demo, make sure to set/get random streams of data and check that what we read back is byte-by-byte the same.
 - maxclients directive
 - check 'server.dirty' everywere
 - network layer stresser in test in demo, make sure to set/get random streams of data and check that what we read back is byte-by-byte the same.
 - maxclients directive
 - check 'server.dirty' everywere

-- config parameter to change the name of the DB file

 - replication automated tests
 - an external tool able to perform the 'difference' between two Redis servers. It's like 'diff', but against Redis servers, and the output is the set of commands needed to turn the first server into the second, suitable to be sent via netcat.
    $ ./redis-diff 192.168.1.1 192.168.1.2 > diff.txt
 - replication automated tests
 - an external tool able to perform the 'difference' between two Redis servers. It's like 'diff', but against Redis servers, and the output is the set of commands needed to turn the first server into the second, suitable to be sent via netcat.
    $ ./redis-diff 192.168.1.1 192.168.1.2 > diff.txt

diff --git a/redis.c b/redis.c
index ae0e869e71547e5b1868b39a7ada58a3ecade08e..b40320de5f67b32066ea204f96e57341469cf0e2 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -1001,6 +1001,8 @@ static void loadServerConfig(char *filename) {
           server.requirepass = zstrdup(argv[1]);
         } else if (!strcmp(argv[0],"pidfile") && argc == 2) {
           server.pidfile = zstrdup(argv[1]);
           server.requirepass = zstrdup(argv[1]);
         } else if (!strcmp(argv[0],"pidfile") && argc == 2) {
           server.pidfile = zstrdup(argv[1]);

+        } else if (!strcmp(argv[0],"dbfilename") && argc == 2) {
+          server.dbfilename = zstrdup(argv[1]);

         } else {
             err = "Bad directive or wrong number of arguments"; goto loaderr;
         }
         } else {
             err = "Bad directive or wrong number of arguments"; goto loaderr;
         }

diff --git a/redis.conf b/redis.conf
index 0083d7f100e9bf0a703bbb8ef2de1dd2268603a8..38592b02e6bc3c49c44fd717f4604d475456950f 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -34,6 +34,9 @@ save 900 1
 save 300 10
 save 60 10000
 
 save 300 10
 save 60 10000
 

+# The filename where to dump the DB
+dbfilename dump.rdb
+

 # For default save/load DB in/from the working directory
 # Note that you must specify a directory not a file name.
 dir ./
 # For default save/load DB in/from the working directory
 # Note that you must specify a directory not a file name.
 dir ./


@@ -50,7 +53,9 @@ loglevel debug
 # output for logging but daemonize, logs will be sent to /dev/null
 logfile stdout
 
 # output for logging but daemonize, logs will be sent to /dev/null
 logfile stdout
 

-# Set the number of databases.
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1

 databases 16
 
 ################################# REPLICATION #################################
 databases 16
 
 ################################# REPLICATION #################################