Commit 0b7f6d09 authored by antirez's avatar antirez
Browse files

make sure that OBJECT ENCODING returns skiplist for sorted sets, and not raw,...

make sure that OBJECT ENCODING returns skiplist for sorted sets, and not raw, so that once we will merge specially encoded sorted sets everything will make sense.
parent ece74202
...@@ -93,10 +93,13 @@ robj *createHashObject(void) { ...@@ -93,10 +93,13 @@ robj *createHashObject(void) {
robj *createZsetObject(void) { robj *createZsetObject(void) {
zset *zs = zmalloc(sizeof(*zs)); zset *zs = zmalloc(sizeof(*zs));
robj *o;
zs->dict = dictCreate(&zsetDictType,NULL); zs->dict = dictCreate(&zsetDictType,NULL);
zs->zsl = zslCreate(); zs->zsl = zslCreate();
return createObject(REDIS_ZSET,zs); o = createObject(REDIS_ZSET,zs);
o->encoding = REDIS_ENCODING_SKIPLIST;
return o;
} }
void freeStringObject(robj *o) { void freeStringObject(robj *o) {
...@@ -402,6 +405,7 @@ char *strEncoding(int encoding) { ...@@ -402,6 +405,7 @@ char *strEncoding(int encoding) {
case REDIS_ENCODING_LINKEDLIST: return "linkedlist"; case REDIS_ENCODING_LINKEDLIST: return "linkedlist";
case REDIS_ENCODING_ZIPLIST: return "ziplist"; case REDIS_ENCODING_ZIPLIST: return "ziplist";
case REDIS_ENCODING_INTSET: return "intset"; case REDIS_ENCODING_INTSET: return "intset";
case REDIS_ENCODING_SKIPLIST: return "skiplist";
default: return "unknown"; default: return "unknown";
} }
} }
......
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
#define REDIS_ENCODING_LINKEDLIST 4 /* Encoded as regular linked list */ #define REDIS_ENCODING_LINKEDLIST 4 /* Encoded as regular linked list */
#define REDIS_ENCODING_ZIPLIST 5 /* Encoded as ziplist */ #define REDIS_ENCODING_ZIPLIST 5 /* Encoded as ziplist */
#define REDIS_ENCODING_INTSET 6 /* Encoded as intset */ #define REDIS_ENCODING_INTSET 6 /* Encoded as intset */
#define REDIS_ENCODING_SKIPLIST 7 /* Encoded as skiplist */
/* Object types only used for dumping to disk */ /* Object types only used for dumping to disk */
#define REDIS_EXPIRETIME 253 #define REDIS_EXPIRETIME 253
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment