Optimization fixed and re-activated

diff --git a/Changelog b/Changelog
index 00722ddbd1d466d7656030bf14f548f11a2919f8..09b80b715ef839f601875b6659a969cc4da6a041 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,23 @@
+2010-03-18 reverted an optimization that makes Redis not stable
+2010-03-18 Fixed redis-cli auth code
+2010-03-17 HDEL fix, an optimization for comparison of objects in hash table lookups when they are integer encoding
+2010-03-17 Version is now 1.3.5
+2010-03-17 Merged Pietern patch for VM key args helper function. Fixed an obvious bug in the redis-cli passwd auth stuff
+2010-03-17 Merge branch 'aggregates' of git://github.com/pietern/redis
+2010-03-17 Added Authentication to redis-cli.c using -a switch Update usage fixed Makefile to delete redis-check-dump during make clean
+2010-03-17 HEXISTS and tests implemented
+2010-03-17 More hash tests
+2010-03-17 better HSET test
+2010-03-17 Fixed a bug in HSET, a memory leak, and a theoretical bug in dict.c
+2010-03-17 More Hash tests
+2010-03-13 added preloading keys from VM when using ZINTER or ZUNION
+2010-03-13 added explicit AGGREGATE [SUM|MIN|MAX] option to ZUNION/ZINTER
+2010-03-16 HGET fix for integer encoded field against zipmap encoded hash
+2010-03-16 zrevrank support in redis-cli
+2010-03-16 HKEYS / HVALS / HGETALL
+2010-03-16 Solved a memory leak with Hashes
+2010-03-15 pretty big refactoring
+2010-03-15 An interesting refactoring + more expressive internal API
 2010-03-15 Fixed the same problem in ZREVRANK
 2010-03-15 Fixed a ZRANK bug
 2010-03-15 zipmap to hash conversion in HSET

diff --git a/redis.c b/redis.c
index 9203d1c17066f8f7184da41afd7248215b2e0d16..3f09763fbd179da1cdba2e84d2415de9f5c28e1c 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -1005,11 +1005,9 @@ 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->ptr == o2->ptr) return 1;
 
     o1 = getDecodedObject(o1);
     o2 = getDecodedObject(o2);