TODO now points to the unstable release

00-RELEASENOTES

@@ -1,3 +1,31 @@
+Welcome to Redis 2.0.5
+
+This release fixes an important bug related to a file descriptor leak with
+AOF enabled.
+
+We strongly suggest upgrading to Redis 2.2.x ASAP to all the 2.0.x users!
+
+Cheers,
+Salvatore
+
+--------------------------------------------------------------------------------
+
+Welcome to Redis 2.0.4
+
+This release fixes two non critical bugs:
+
+    - HMGET used to crash when called against a key that was not holding
+      an hash. Fixed by Pieter Noordhuis.
+    
+    - Redis will now not try to save the DB if no save points for RDB are
+      configured, when used as a non persistent cache. Thanks to Robey
+      Pointer from Twitter for providing this patch.
+
+Waiting 2.2 ...
+Salvatore
+
+--------------------------------------------------------------------------------
+
 Welcome to Redis 2.0.3
 
 This release fixes two important bugs:

TODO

@@ -1,66 +1,3 @@
-Redis TODO and Roadmap
-----------------------
+Please check the TODO list in the unstable branch at github.
 
-VERSION 2.2 TODO (Optimizations and latency)
-============================================
-
-* Lower the CPU usage.
-* Lower the RAM usage everywhere possible.
-* Specially encoded Sets (like Hashes).
-* Implement an UDP interface for low-latency operations.
-* What about a special coding that is about storing the "rdb" serialized format instead of the actual value? This can be used when we have LRU in order to super-compress data into memory, for data not accessed frequetly. It's a VM-alike strategy but fully in memory, may reduce the space to hold some dataset in an impressive way. Trivial to implement.
-* Another idea: LRU does not need to be super precise right? Maybe it's a good idea to just put into the skiplist implementing the LRU just the pointer to the key without evne incr/decr business, nor the need to remove the pointer when the key is deleted. There is to think more about that.
-
-VERSION 2.x TODO
-================
-
-* BRPOPLPUSH
-* Save dataset / fsync() on SIGTERM
-* Change the implementation of ZCOUNT to use the augmented skiplist in order to be much faster.
-
-Virtual Memory optimizations:
-* Use multiple open FDs against the VM file, one for thread.
-* Check what happens performance-wise if instead of creating threads again and again the same threads are reused forever. Note: this requires a way to disable this clients in the child, but waiting for empty new jobs queue can be enough.
-* Implement LEN, PEEK, POKE, SETBIT, GETBIT
-
-OTHER IMPORTANT THINGS THAT WILL BE ADDED BUT I'M NOT SURE WHEN
-===============================================================
-
-BIG ONES:
-
-* Specially encoded memory-saving integer sets.
-* A command to export a JSON dump (there should be mostly working patch needing major reworking).
-* Specially encoded sets of integers (this includes a big refactoring providing an higher level layer for Sets manipulation)
-
-SMALL ONES:
-
-* If sizeof(double) == sizeof(void*) we could store the double value of sorted sets directly in place of the pointer instead of allocating it in the heap.
-* Delete on writes against expire policy should only happen after argument parsing for commands doing their own arg parsing stuff.
-* Give errors when incrementing a key that does not look like an integer, when providing as a sorted set score something can't be parsed as a double, and so forth.
-* MSADD (n keys) (n values). See this thread in the Redis google group: http://groups.google.com/group/redis-db/browse_thread/thread/e766d84eb375cd41
-* Don't save empty lists / sets / zsets on disk with snapshotting.
-* Remove keys when a list / set / zset reaches length of 0.
-* An option to exec a command slave-side if the master connection is lost: even cooler: if the script returns "0" the slave elects itself as master, otherwise continue trying to reconnect.
-* PING the master from time to time to check if it's gone.
-
-THE "MAYBE" TODO LIST: things that may or may not get implemented
-=================================================================
-
-Most of this can be seen just as proposals, the fact they are in this list
-it's not a guarantee they'll ever get implemented ;)
-
-* Move dict.c from hash table to skip list, in order to avoid the blocking resize operation needed for the hash table.
-* FORK command (fork()s executing the commands received by the current
-  client in the new process). Hint: large SORTs can use more cores,
-  copy-on-write will avoid memory problems.
-* DUP command? DUP srckey dstkey, creates an exact clone of srckey value in dstkey.
-* SORT: Don't copy the list into a vector when BY argument is constant.
-* Write the hash table size of every db in the dump, so that Redis can resize the hash table just one time when loading a big DB.
-* LOCK / TRYLOCK / UNLOCK as described many times in the google group
-* Replication automated tests
-* Byte Array type (BA prefixed commands): BASETBIT BAGETBIT BASETU8 U16 U32 U64 S8 S16 S32 S64, ability to atomically INCRBY all the base types. BARANGE to get a range of bytes as a bulk value, BASETRANGE to set a range of bytes.
-* zmalloc() should avoid to add a private header for archs where there is some other kind of libc-specific way to get the size of a malloced block. Already done for Mac OS X.
-* Read-only mode.
-* Pattern-matching replication.
-* Add an option to relax the delete-expiring-keys-on-write semantic *denying* replication and AOF when this is on? Can be handy sometimes, when using Redis for non persistent state, but can create problems. For instance should rename and move also "move" the timeouts? How does this affect other commands?
-* Multiple BY in SORT.
+    https://github.com/antirez/redis/blob/unstable/TODO

redis-cli.c

@@ -304,6 +304,7 @@ static int cliSendCommand(int argc, char **argv, int repeat) {
         while (config.monitor_mode) {
             if (cliReadSingleLineReply(fd,0)) exit(1);
             printf("\n");
+            fflush(stdout);
         }
 
         if (config.pubsub_mode) {

redis.c

@@ -27,7 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define REDIS_VERSION "2.0.3"
+#define REDIS_VERSION "2.0.5"
 
 #include "fmacros.h"
 #include "config.h"
@@ -4221,7 +4221,7 @@ static int prepareForShutdown() {
         /* Append only file: fsync() the AOF and exit */
         fsync(server.appendfd);
         if (server.vm_enabled) unlink(server.vm_swap_file);
-    } else {
+    } else if (server.saveparamslen > 0) {
         /* Snapshotting. Perform a SYNC SAVE and exit */
         if (rdbSave(server.dbfilename) == REDIS_OK) {
             if (server.daemonize)
@@ -4236,6 +4236,8 @@ static int prepareForShutdown() {
             redisLog(REDIS_WARNING,"Error trying to save the DB, can't exit");
             return REDIS_ERR;
         }
+    } else {
+        redisLog(REDIS_WARNING,"Not saving DB.");
     }
     redisLog(REDIS_WARNING,"Server exit now, bye bye...");
     return REDIS_OK;
@@ -5195,6 +5197,18 @@ static void spopCommand(redisClient *c) {
         addReply(c,shared.nullbulk);
     } else {
         robj *ele = dictGetEntryKey(de);
+        incrRefCount(ele);
+
+        /* Change argv to replicate as SREM */
+        c->argc = 3;
+        c->argv = zrealloc(c->argv,sizeof(robj*)*(c->argc));
+
+        /* Overwrite SREM with SPOP (same length) */
+        redisAssert(sdslen(c->argv[0]->ptr) == 4);
+        memcpy(c->argv[0]->ptr, "SREM", 4);
+
+        /* Popped element already has incremented refcount */
+        c->argv[2] = ele;
 
         addReplyBulk(c,ele);
         dictDelete(set->ptr,ele);
@@ -6707,6 +6721,7 @@ static void hmgetCommand(redisClient *c) {
     o = lookupKeyRead(c->db,c->argv[1]);
     if (o != NULL && o->type != REDIS_HASH) {
         addReply(c,shared.wrongtypeerr);
+        return;
     }
 
     /* Note the check for o != NULL happens inside the loop. This is
@@ -7586,6 +7601,10 @@ static void execCommand(redisClient *c) {
         c->argc = c->mstate.commands[j].argc;
         c->argv = c->mstate.commands[j].argv;
         call(c,c->mstate.commands[j].cmd);
+
+        /* Commands may alter argc/argv, restore mstate. */
+        c->mstate.commands[j].argc = c->argc;
+        c->mstate.commands[j].argv = c->argv;
     }
     c->argv = orig_argv;
     c->argc = orig_argc;
@@ -8415,8 +8434,10 @@ int loadAppendOnlyFile(char *filename) {
     struct redis_stat sb;
     int appendonly = server.appendonly;
 
-    if (redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0)
+    if (fp && redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0) {
+        fclose(fp);
         return REDIS_ERR;
+    }
 
     if (fp == NULL) {
         redisLog(REDIS_WARNING,"Fatal error: can't open the append log file for reading: %s",strerror(errno));

tests/unit/type/hash.tcl

@@ -140,6 +140,11 @@ start_server {tags {"hash"}} {
         set _ $rv
     } {{{} {}} {{} {}} {{} {}}}
 
+    test {HMGET against wrong type} {
+        r set wrongtype somevalue
+        assert_error "*wrong*" {r hmget wrongtype field1 field2}
+    }
+
     test {HMGET - small hash} {
         set keys {}
         set vals {}

utils/mktarball.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ "$1" = "" ]
+then
+    echo "Usage: mktarball.sh <git tag, branch or commit>"
+    echo "Example: mktarball.sh 2.2-rc4"
+    exit 1
+fi
+
+PREFIX="redis-${1}/"
+TARBALL="/tmp/redis-${1}.tar.gz"
+git archive --format=tar --prefix=$PREFIX $1 | gzip -c > $TARBALL
+echo "File created: $TARBALL"