summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2010-03-18 02:59:28 +0100
committerantirez <antirez@gmail.com>2010-03-18 02:59:28 +0100
commitbf0da6174c71ac6032c5a97aba059c902f799297 (patch)
tree0acccb394a378c17f95d4051f6e00f3fbc610da9
parent288799e04addb974b85cd6c266918adc8a33964b (diff)
downloadredis-bf0da6174c71ac6032c5a97aba059c902f799297.tar.gz
reverted an optimization that makes Redis not stable
-rw-r--r--redis.c2
-rw-r--r--test-redis.tcl1
2 files changed, 2 insertions, 1 deletions
diff --git a/redis.c b/redis.c
index ec971419f..9203d1c17 100644
--- 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);
diff --git a/test-redis.tcl b/test-redis.tcl
index 3ffb33e46..3dd03fd24 100644
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -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
}
}