SORT support for sorted sets

diff --git a/redis.c b/redis.c
index bff40cecc9284609c49852241bfac36496387b6e..65571f32878aface07453e9e3a5d4adf4df763f8 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -4805,7 +4805,9 @@ static void sortCommand(redisClient *c) {
         addReply(c,shared.nokeyerr);
         return;
     }
         addReply(c,shared.nokeyerr);
         return;
     }

-    if (sortval->type != REDIS_SET && sortval->type != REDIS_LIST) {
+    if (sortval->type != REDIS_SET && sortval->type != REDIS_LIST &&
+        sortval->type != REDIS_ZSET)
+    {

         addReply(c,shared.wrongtypeerr);
         return;
     }
         addReply(c,shared.wrongtypeerr);
         return;
     }


@@ -4858,11 +4860,15 @@ static void sortCommand(redisClient *c) {
     }
 
     /* Load the sorting vector with all the objects to sort */
     }
 
     /* Load the sorting vector with all the objects to sort */

-    vectorlen = (sortval->type == REDIS_LIST) ?
-        listLength((list*)sortval->ptr) :
-        dictSize((dict*)sortval->ptr);
+    switch(sortval->type) {
+    case REDIS_LIST: vectorlen = listLength((list*)sortval->ptr); break;
+    case REDIS_SET: vectorlen =  dictSize((dict*)sortval->ptr); break;
+    case REDIS_ZSET: vectorlen = dictSize(((zset*)sortval->ptr)->dict); break;
+    default: vectorlen = 0; assert(0); /* Avoid GCC warning */
+    }

     vector = zmalloc(sizeof(redisSortObject)*vectorlen);
     j = 0;
     vector = zmalloc(sizeof(redisSortObject)*vectorlen);
     j = 0;

+

     if (sortval->type == REDIS_LIST) {
         list *list = sortval->ptr;
         listNode *ln;
     if (sortval->type == REDIS_LIST) {
         list *list = sortval->ptr;
         listNode *ln;


@@ -4876,10 +4882,17 @@ static void sortCommand(redisClient *c) {
             j++;
         }
     } else {
             j++;
         }
     } else {

-        dict *set = sortval->ptr;
+        dict *set;

         dictIterator *di;
         dictEntry *setele;
 
         dictIterator *di;
         dictEntry *setele;
 

+        if (sortval->type == REDIS_SET) {
+            set = sortval->ptr;
+        } else {
+            zset *zs = sortval->ptr;
+            set = zs->dict;
+        }
+

         di = dictGetIterator(set);
         while((setele = dictNext(di)) != NULL) {
             vector[j].obj = dictGetEntryKey(setele);
         di = dictGetIterator(set);
         while((setele = dictNext(di)) != NULL) {
             vector[j].obj = dictGetEntryKey(setele);