]> git.saurik.com Git - redis.git/commitdiff
reverted an optimization that makes Redis not stable
authorantirez <antirez@gmail.com>
Thu, 18 Mar 2010 01:59:28 +0000 (02:59 +0100)
committerantirez <antirez@gmail.com>
Thu, 18 Mar 2010 01:59:28 +0000 (02:59 +0100)
redis.c
test-redis.tcl

diff --git a/redis.c b/redis.c
index ec971419f2a178a97eb13a648ea3b863415667c7..9203d1c17066f8f7184da41afd7248215b2e0d16 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -1005,9 +1005,11 @@ static int dictEncObjKeyCompare(void *privdata, const void *key1,
     robj *o1 = (robj*) key1, *o2 = (robj*) key2;
     int cmp;
 
+#if 0
     if (o1->encoding == REDIS_ENCODING_INT &&
         o2->encoding == REDIS_ENCODING_INT &&
         o1->ptr == o2->ptr) return 0;
+#endif
 
     o1 = getDecodedObject(o1);
     o2 = getDecodedObject(o2);
index 3ffb33e4622417d29a05da69cdc0eca1e02aedd5..3dd03fd24a424c56cf477a28dc6b3fedc07d3135 100644 (file)
@@ -1763,7 +1763,6 @@ proc main {server port} {
                 set rank [$r zrank myzset $ele]
                 if {$rank != $index} {
                     set err "$ele RANK is wrong! ($rank != $index)"
-                    exit
                     break
                 }
             }