HDEL fix, an optimization for comparison of objects in hash table lookups when they...

diff --git a/redis.c b/redis.c
index c40b6eec86cf5f6bec4e6ebd4a7c32e5ae7f38e9..ec971419f2a178a97eb13a648ea3b863415667c7 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -1005,6 +1005,10 @@ static int dictEncObjKeyCompare(void *privdata, const void *key1,
     robj *o1 = (robj*) key1, *o2 = (robj*) key2;
     int cmp;
 
     robj *o1 = (robj*) key1, *o2 = (robj*) key2;
     int cmp;
 

+    if (o1->encoding == REDIS_ENCODING_INT &&
+        o2->encoding == REDIS_ENCODING_INT &&
+        o1->ptr == o2->ptr) return 0;
+

     o1 = getDecodedObject(o1);
     o2 = getDecodedObject(o2);
     cmp = sdsDictKeyCompare(privdata,o1->ptr,o2->ptr);
     o1 = getDecodedObject(o1);
     o2 = getDecodedObject(o2);
     cmp = sdsDictKeyCompare(privdata,o1->ptr,o2->ptr);


@@ -5943,9 +5947,12 @@ static void hdelCommand(redisClient *c) {
         checkType(c,o,REDIS_HASH)) return;
 
     if (o->encoding == REDIS_ENCODING_ZIPMAP) {
         checkType(c,o,REDIS_HASH)) return;
 
     if (o->encoding == REDIS_ENCODING_ZIPMAP) {

+        robj *field = getDecodedObject(c->argv[2]);
+

         o->ptr = zipmapDel((unsigned char*) o->ptr,
         o->ptr = zipmapDel((unsigned char*) o->ptr,

-            (unsigned char*) c->argv[2]->ptr,
-            sdslen(c->argv[2]->ptr), &deleted);
+            (unsigned char*) field->ptr,
+            sdslen(field->ptr), &deleted);
+        decrRefCount(field);

     } else {
         deleted = dictDelete((dict*)o->ptr,c->argv[2]) == DICT_OK;
     }
     } else {
         deleted = dictDelete((dict*)o->ptr,c->argv[2]) == DICT_OK;
     }

diff --git a/test-redis.tcl b/test-redis.tcl
index d7a4d7fd9950671abd35277e3c0c997c0167bac1..3dd03fd24a424c56cf477a28dc6b3fedc07d3135 100644 (file)
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -125,6 +125,7 @@ proc randomKey {} {
 proc createComplexDataset {r ops} {
     for {set j 0} {$j < $ops} {incr j} {
         set k [randomKey]
 proc createComplexDataset {r ops} {
     for {set j 0} {$j < $ops} {incr j} {
         set k [randomKey]

+        set f [randomValue]

         set v [randomValue]
         randpath {
             set d [expr {rand()}]
         set v [randomValue]
         randpath {
             set d [expr {rand()}]


@@ -150,6 +151,8 @@ proc createComplexDataset {r ops} {
                 $r sadd $k $v
             } {
                 $r zadd $k $d $v
                 $r sadd $k $v
             } {
                 $r zadd $k $d $v

+            } {
+                $r hset $k $f $v

             }
             set t [$r type $k]
         }
             }
             set t [$r type $k]
         }


@@ -173,6 +176,10 @@ proc createComplexDataset {r ops} {
                 randpath {$r zadd $k $d $v} \
                         {$r zrem $k $v}
             }
                 randpath {$r zadd $k $d $v} \
                         {$r zrem $k $v}
             }

+            {hash} {
+                randpath {$r hset $k $f $v} \
+                        {$r hdel $k $f}
+            }

         }
     }
 }
         }
     }
 }