X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/1de98301f66bb32af01ea76fc485a88b5d0a9b50..9d7165e885b3de44577dea2917bb4f3afa2ed335:/src/debug.c diff --git a/src/debug.c b/src/debug.c index b364dd16..fff8d727 100644 --- a/src/debug.c +++ b/src/debug.c @@ -121,7 +121,7 @@ void computeDatasetDigest(unsigned char *final) { } else if (o->type == REDIS_SET) { setTypeIterator *si = setTypeInitIterator(o); robj *ele; - while((ele = setTypeNext(si)) != NULL) { + while((ele = setTypeNextObject(si)) != NULL) { xorObjectDigest(digest,ele); decrRefCount(ele); } @@ -152,10 +152,10 @@ void computeDatasetDigest(unsigned char *final) { unsigned char eledigest[20]; memset(eledigest,0,20); - obj = hashTypeCurrent(hi,REDIS_HASH_KEY); + obj = hashTypeCurrentObject(hi,REDIS_HASH_KEY); mixObjectDigest(eledigest,obj); decrRefCount(obj); - obj = hashTypeCurrent(hi,REDIS_HASH_VALUE); + obj = hashTypeCurrentObject(hi,REDIS_HASH_VALUE); mixObjectDigest(eledigest,obj); decrRefCount(obj); xorDigest(digest,eledigest,20); @@ -216,7 +216,7 @@ void debugCommand(redisClient *c) { "encoding:%s serializedlength:%lld " "lru:%d lru_seconds_idle:%lu", (void*)val, val->refcount, - strenc, (long long) rdbSavedObjectLen(val,NULL), + strenc, (long long) rdbSavedObjectLen(val), val->lru, estimateObjectIdleTime(val)); } else { vmpointer *vp = (vmpointer*) val;