use rank to find starting point for ZRANGE and ZREVRANGE

diff --git a/redis.c b/redis.c
index cdc9c950b73adee361c0014282b2a5effb31be66..d5e47e9f0cd8e7eda9f548e781dc0a781a6b9199 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -5081,6 +5081,26 @@ static unsigned long zslGetRank(zskiplist *zsl, double score, robj *o) {
     return 0;
 }
 
+/* Finds an element by its rank. The rank argument needs to be 1-based. */
+zskiplistNode* zslGetElementByRank(zskiplist *zsl, unsigned long rank) {
+    zskiplistNode *x;
+    unsigned long traversed = 0;
+    int i;
+
+    x = zsl->header;
+    for (i = zsl->level-1; i >= 0; i--) {
+        while (x->forward[i] && (traversed + x->span[i]) <= rank) {
+            traversed += x->span[i];
+            x = x->forward[i];
+        }
+
+        if (traversed == rank) {
+            return x;
+        }
+    }
+    return NULL;
+}
+
 /* The actual Z-commands implementations */
 
 /* This generic command implements both ZADD and ZINCRBY.
@@ -5282,13 +5302,9 @@ static void zrangeGenericCommand(redisClient *c, int reverse) {
 
             /* Return the result in form of a multi-bulk reply */
             if (reverse) {
-                ln = zsl->tail;
-                while (start--)
-                    ln = ln->backward;
+                ln = zslGetElementByRank(zsl, llen - start);
             } else {
-                ln = zsl->header->forward[0];
-                while (start--)
-                    ln = ln->forward[0];
+                ln = zslGetElementByRank(zsl, start + 1);
             }
 
             addReplySds(c,sdscatprintf(sdsempty(),"*%d\r\n",