diff --git a/src/db.c b/src/db.c index 65144e5a..83806e71 100644 --- a/src/db.c +++ b/src/db.c @@ -469,7 +469,7 @@ void scanGenericCommand(redisClient *c, robj *o) { listAddNodeTail(keys, (vstr != NULL) ? createStringObject((char*)vstr,vlen) : createStringObjectFromLongLong(vll)); - ziplistNext(o->ptr,p); + p = ziplistNext(o->ptr,p); } } else { redisPanic("Not handled encoding in SCAN."); diff --git a/src/redis.c b/src/redis.c index 6cfa0ec5..f44c9908 100644 --- a/src/redis.c +++ b/src/redis.c @@ -195,6 +195,7 @@ struct redisCommand redisCommandTable[] = { {"hvals",hvalsCommand,2,"rS",0,NULL,1,1,1,0,0}, {"hgetall",hgetallCommand,2,"r",0,NULL,1,1,1,0,0}, {"hexists",hexistsCommand,3,"r",0,NULL,1,1,1,0,0}, + {"hscan",hscanCommand,-3,"rR",0,NULL,1,1,1,0,0}, {"incrby",incrbyCommand,3,"wm",0,NULL,1,1,1,0,0}, {"decrby",decrbyCommand,3,"wm",0,NULL,1,1,1,0,0}, {"incrbyfloat",incrbyfloatCommand,3,"wm",0,NULL,1,1,1,0,0}, diff --git a/src/redis.h b/src/redis.h index 7d0a733e..55c3ea77 100644 --- a/src/redis.h +++ b/src/redis.h @@ -1344,6 +1344,7 @@ void hkeysCommand(redisClient *c); void hvalsCommand(redisClient *c); void hgetallCommand(redisClient *c); void hexistsCommand(redisClient *c); +void hscanCommand(redisClient *c); void configCommand(redisClient *c); void hincrbyCommand(redisClient *c); void hincrbyfloatCommand(redisClient *c); diff --git a/src/t_hash.c b/src/t_hash.c index 3b87b92c..3ccacdc1 100644 --- a/src/t_hash.c +++ b/src/t_hash.c @@ -759,3 +759,11 @@ void hexistsCommand(redisClient *c) { addReply(c, hashTypeExists(o,c->argv[2]) ? shared.cone : shared.czero); } + +void hscanCommand(redisClient *c) { + robj *o; + + if ((o= lookupKeyReadOrReply(c,c->argv[1],shared.emptyscan)) == NULL || + checkType(c,o,REDIS_HASH)) return; + scanGenericCommand(c,o); +}