TODO change and minor SETNX optimization

diff --git a/TODO b/TODO
index 2a12f2f386f2cf70d2532016496c08f32ca59733..6ae0bac121dcc3626623b81e402633ac713e94d6 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,7 +6,6 @@ VERSION 1.2 TODO (Zsets, Integer encoding, Append only journal)
 Most of the features already implemented for this release. The following is a list of the missing things in order to release the first beta tar.gz:
 
 * Document "masterauth" in redis.conf, also merge the other related patch if it seems a safe one.
 Most of the features already implemented for this release. The following is a list of the missing things in order to release the first beta tar.gz:
 
 * Document "masterauth" in redis.conf, also merge the other related patch if it seems a safe one.

-* SETNX and MSETNX should use lookupKeWrite() in order to expire volatile keys when a write attempt is made.

 
 VERSION 1.4 TODO (Hash type)
 ============================
 
 VERSION 1.4 TODO (Hash type)
 ============================

diff --git a/redis.c b/redis.c
index 302a2129d660101c61e425703c31faa2a4cc0499..371f789081805346ab3539c2e863aa70e50f5019 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -2979,7 +2979,7 @@ static void echoCommand(redisClient *c) {
 static void setGenericCommand(redisClient *c, int nx) {
     int retval;
 
 static void setGenericCommand(redisClient *c, int nx) {
     int retval;
 

-    deleteIfVolatile(c->db,c->argv[1]);
+    if (nx) deleteIfVolatile(c->db,c->argv[1]);

     retval = dictAdd(c->db->dict,c->argv[1],c->argv[2]);
     if (retval == DICT_ERR) {
         if (!nx) {
     retval = dictAdd(c->db->dict,c->argv[1],c->argv[2]);
     if (retval == DICT_ERR) {
         if (!nx) {