An interesting refactoring + more expressive internal API

diff --git a/Changelog b/Changelog
index 3154cf53a79a36dfa28971290646ef5ecac3afb2..00722ddbd1d466d7656030bf14f548f11a2919f8 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+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

 2010-03-14 max zipmap entries and max zipmap value parameters added into INFO output
 2010-03-14 HDEL and some improvement in DEBUG OBJECT command
 2010-03-14 Append only file support for hashes
 2010-03-14 max zipmap entries and max zipmap value parameters added into INFO output
 2010-03-14 HDEL and some improvement in DEBUG OBJECT command
 2010-03-14 Append only file support for hashes

diff --git a/redis-cli.c b/redis-cli.c
index daff870120386579ccd38b343b9eac48e249a929..93d80caa58f76d00ac52540f20f9f5487bef1c41 100644 (file)
--- a/redis-cli.c
+++ b/redis-cli.c
@@ -148,6 +148,7 @@ static struct redisCommand cmdTable[] = {
     {"hset",4,REDIS_CMD_MULTIBULK},
     {"hget",3,REDIS_CMD_BULK},
     {"hdel",3,REDIS_CMD_BULK},
     {"hset",4,REDIS_CMD_MULTIBULK},
     {"hget",3,REDIS_CMD_BULK},
     {"hdel",3,REDIS_CMD_BULK},

+    {"hlen",2,REDIS_CMD_INLINE},

     {NULL,0,0}
 };
 
     {NULL,0,0}
 };
 

diff --git a/redis.c b/redis.c
index c43f7fd9605a38da950234097c41544b7e5006ef..46ca16553f8e0de4bd7eb3406c6b40d01f726f15 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -682,6 +682,7 @@ static void zrevrankCommand(redisClient *c);
 static void hsetCommand(redisClient *c);
 static void hgetCommand(redisClient *c);
 static void hdelCommand(redisClient *c);
 static void hsetCommand(redisClient *c);
 static void hgetCommand(redisClient *c);
 static void hdelCommand(redisClient *c);

+static void hlenCommand(redisClient *c);

 static void zremrangebyrankCommand(redisClient *c);
 static void zunionCommand(redisClient *c);
 static void zinterCommand(redisClient *c);
 static void zremrangebyrankCommand(redisClient *c);
 static void zunionCommand(redisClient *c);
 static void zinterCommand(redisClient *c);


@@ -746,6 +747,7 @@ static struct redisCommand cmdTable[] = {
     {"hset",hsetCommand,4,REDIS_CMD_BULK|REDIS_CMD_DENYOOM,1,1,1},
     {"hget",hgetCommand,3,REDIS_CMD_BULK,1,1,1},
     {"hdel",hdelCommand,3,REDIS_CMD_BULK,1,1,1},
     {"hset",hsetCommand,4,REDIS_CMD_BULK|REDIS_CMD_DENYOOM,1,1,1},
     {"hget",hgetCommand,3,REDIS_CMD_BULK,1,1,1},
     {"hdel",hdelCommand,3,REDIS_CMD_BULK,1,1,1},

+    {"hlen",hlenCommand,2,REDIS_CMD_INLINE,1,1,1},

     {"incrby",incrbyCommand,3,REDIS_CMD_INLINE|REDIS_CMD_DENYOOM,1,1,1},
     {"decrby",decrbyCommand,3,REDIS_CMD_INLINE|REDIS_CMD_DENYOOM,1,1,1},
     {"getset",getsetCommand,3,REDIS_CMD_BULK|REDIS_CMD_DENYOOM,1,1,1},
     {"incrby",incrbyCommand,3,REDIS_CMD_INLINE|REDIS_CMD_DENYOOM,1,1,1},
     {"decrby",decrbyCommand,3,REDIS_CMD_INLINE|REDIS_CMD_DENYOOM,1,1,1},
     {"getset",getsetCommand,3,REDIS_CMD_BULK|REDIS_CMD_DENYOOM,1,1,1},


@@ -2480,6 +2482,14 @@ static void addReplyLong(redisClient *c, long l) {
     addReplySds(c,sdsnewlen(buf,len));
 }
 
     addReplySds(c,sdsnewlen(buf,len));
 }
 

+static void addReplyUlong(redisClient *c, unsigned long ul) {
+    char buf[128];
+    size_t len;
+
+    len = snprintf(buf,sizeof(buf),":%lu\r\n",ul);
+    addReplySds(c,sdsnewlen(buf,len));
+}
+

 static void addReplyBulkLen(redisClient *c, robj *obj) {
     size_t len;
 
 static void addReplyBulkLen(redisClient *c, robj *obj) {
     size_t len;
 


@@ -2739,6 +2749,26 @@ static robj *lookupKeyWrite(redisDb *db, robj *key) {
     return lookupKey(db,key);
 }
 
     return lookupKey(db,key);
 }
 

+static robj *lookupKeyReadOrReply(redisClient *c, robj *key, robj *reply) {
+    robj *o = lookupKeyRead(c->db, key);
+    if (!o) addReply(c,reply);
+    return o;
+}
+
+static robj *lookupKeyWriteOrReply(redisClient *c, robj *key, robj *reply) {
+    robj *o = lookupKeyWrite(c->db, key);
+    if (!o) addReply(c,reply);
+    return o;
+}
+
+static int checkType(redisClient *c, robj *o, int type) {
+    if (o->type != type) {
+        addReply(c,shared.wrongtypeerr);
+        return 1;
+    }
+    return 0;
+}
+

 static int deleteKey(redisDb *db, robj *key) {
     int retval;
 
 static int deleteKey(redisDb *db, robj *key) {
     int retval;
 


@@ -6019,7 +6049,7 @@ static void hgetCommand(redisClient *c) {
 }
 
 static void hdelCommand(redisClient *c) {
 }
 
 static void hdelCommand(redisClient *c) {

-    robj *o = lookupKeyRead(c->db,c->argv[1]);
+    robj *o = lookupKeyWrite(c->db,c->argv[1]);

 
     if (o == NULL) {
         addReply(c,shared.czero);
 
     if (o == NULL) {
         addReply(c,shared.czero);


@@ -6043,6 +6073,18 @@ static void hdelCommand(redisClient *c) {
     }
 }
 
     }
 }
 

+static void hlenCommand(redisClient *c) {
+    robj *o;
+    unsigned long len;
+
+    if ((o = lookupKeyWriteOrReply(c,c->argv[1],shared.czero)) == NULL ||
+        checkType(c,o,REDIS_HASH)) return;
+
+    len = (o->encoding == REDIS_ENCODING_ZIPMAP) ?
+            zipmapLen((unsigned char*)o->ptr) : dictSize((dict*)o->ptr);
+    addReplyUlong(c,len);
+}
+

 static void convertToRealHash(robj *o) {
     unsigned char *key, *val, *p, *zm = o->ptr;
     unsigned int klen, vlen;
 static void convertToRealHash(robj *o) {
     unsigned char *key, *val, *p, *zm = o->ptr;
     unsigned int klen, vlen;

diff --git a/redis.tcl b/redis.tcl
index f3bf4559720f7dc8d9f50bdfbb4d4bee3d953d10..ac9f860184c060e5c65c4c11c67a9bde01b516af 100644 (file)
--- a/redis.tcl
+++ b/redis.tcl
@@ -20,14 +20,14 @@ array set ::redis::multibulkarg {}
 
 # Flag commands requiring last argument as a bulk write operation
 foreach redis_bulk_cmd {
 
 # Flag commands requiring last argument as a bulk write operation
 foreach redis_bulk_cmd {

-    set setnx rpush lpush lset lrem sadd srem sismember echo getset smove zadd zrem zscore zincrby append zrank zrevrank
+    set setnx rpush lpush lset lrem sadd srem sismember echo getset smove zadd zrem zscore zincrby append zrank zrevrank hget hdel

 } {
     set ::redis::bulkarg($redis_bulk_cmd) {}
 }
 
 # Flag commands requiring last argument as a bulk write operation
 foreach redis_multibulk_cmd {
 } {
     set ::redis::bulkarg($redis_bulk_cmd) {}
 }
 
 # Flag commands requiring last argument as a bulk write operation
 foreach redis_multibulk_cmd {

-    mset msetnx
+    mset msetnx hset

 } {
     set ::redis::multibulkarg($redis_multibulk_cmd) {}
 }
 } {
     set ::redis::multibulkarg($redis_multibulk_cmd) {}
 }