104 -- Use correct base method for zrevrange overload methods

Author: Mordil

Sources/RediStack/Commands/SortedSetCommands.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -1121,7 +1121,7 @@ extension RedisClient {
         indices range: ClosedRange<Int>,
         includeScoresInResponse includeScores: Bool = false
     ) -> EventLoopFuture<[RESPValue]> {
-        return self.zrange(from: key, firstIndex: range.lowerBound, lastIndex: range.upperBound, includeScoresInResponse: includeScores)
+        return self.zrevrange(from: key, firstIndex: range.lowerBound, lastIndex: range.upperBound, includeScoresInResponse: includeScores)
     }
 
     /// Gets all the elements from a SortedSet starting with the first index bound up to, but not including, the element at the last index bound.
@@ -1163,7 +1163,7 @@ extension RedisClient {
         indices range: Range<Int>,
         includeScoresInResponse includeScores: Bool = false
     ) -> EventLoopFuture<[RESPValue]> {
-        return self.zrange(from: key, firstIndex: range.lowerBound, lastIndex: range.upperBound - 1, includeScoresInResponse: includeScores)
+        return self.zrevrange(from: key, firstIndex: range.lowerBound, lastIndex: range.upperBound - 1, includeScoresInResponse: includeScores)
     }
 
     /// Gets all elements from the index specified to the end of a SortedSet.
@@ -1191,7 +1191,7 @@ extension RedisClient {
         fromIndex index: Int,
         includeScoresInResponse includeScores: Bool = false
     ) -> EventLoopFuture<[RESPValue]> {
-        return self.zrange(from: key, firstIndex: index, lastIndex: -1, includeScoresInResponse: includeScores)
+        return self.zrevrange(from: key, firstIndex: index, lastIndex: -1, includeScoresInResponse: includeScores)
     }
 
     /// Gets all elements from the start of a SortedSet up to, and including, the element at the index specified.
@@ -1219,7 +1219,7 @@ extension RedisClient {
         throughIndex index: Int,
         includeScoresInResponse includeScores: Bool = false
     ) -> EventLoopFuture<[RESPValue]> {
-        return self.zrange(from: key, firstIndex: 0, lastIndex: index, includeScoresInResponse: includeScores)
+        return self.zrevrange(from: key, firstIndex: 0, lastIndex: index, includeScoresInResponse: includeScores)
     }
 
     /// Gets all elements from the start of a SortedSet up to, but not including, the element at the index specified.
@@ -1247,7 +1247,7 @@ extension RedisClient {
         upToIndex index: Int,
         includeScoresInResponse includeScores: Bool = false
     ) -> EventLoopFuture<[RESPValue]> {
-        return self.zrange(from: key, firstIndex: 0, lastIndex: index - 1, includeScoresInResponse: includeScores)
+        return self.zrevrange(from: key, firstIndex: 0, lastIndex: index - 1, includeScoresInResponse: includeScores)
     }
 
     func _zrange(

Tests/RediStackIntegrationTests/Commands/SortedSetCommandsTests.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -518,3 +518,57 @@ final class SortedSetCommandsTests: RediStackIntegrationTestCase {
         XCTAssertEqual(count, 1)
     }
 }
+
+// MARK: - #104 zrevrange & zrange bug
+
+extension SortedSetCommandsTests {
+    func test_zrange_realworld() throws {
+        struct Keys {
+            static let first  = "1E4FD2C5-C32E-4E3F-91B3-45478BCF0185"
+            static let second = "1E4FD2C5-C32E-4E3F-91B3-45478BCF0186"
+            static let third  = "1E4FD2C5-C32E-4E3F-91B3-45478BCF0187"
+            static let fourth = "1E4FD2C5-C32E-4E3F-91B3-45478BCF0188"
+            static let fifth  = "1E4FD2C5-C32E-4E3F-91B3-45478BCF0189"
+        }
+        _ = try self.connection.zadd([
+            (Keys.first, 1),
+            (Keys.second, 1),
+            (Keys.third, 1),
+            (Keys.fourth, 1),
+            (Keys.fifth, 1),
+        ], to: #function).wait()
+
+        let elements = try self.connection
+            .zrange(from: #function, fromIndex: 0)
+            .wait()
+            .compactMap { $0.string }
+
+        XCTAssertEqual(elements.count, 5)
+        XCTAssertEqual(elements, elements.sorted(by: <))
+    }
+
+    func test_zrevrange_realworld() throws {
+        struct Keys {
+            static let first  = "1E4FD2C5-C32E-4E3F-91B3-45478BCF0185"
+            static let second = "1E4FD2C5-C32E-4E3F-91B3-45478BCF0186"
+            static let third  = "1E4FD2C5-C32E-4E3F-91B3-45478BCF0187"
+            static let fourth = "1E4FD2C5-C32E-4E3F-91B3-45478BCF0188"
+            static let fifth  = "1E4FD2C5-C32E-4E3F-91B3-45478BCF0189"
+        }
+        _ = try self.connection.zadd([
+            (Keys.first, 1),
+            (Keys.second, 1),
+            (Keys.third, 1),
+            (Keys.fourth, 1),
+            (Keys.fifth, 1),
+        ], to: #function).wait()
+
+        let elements = try self.connection
+            .zrevrange(from: #function, fromIndex: 0)
+            .wait()
+            .compactMap { $0.string }
+
+        XCTAssertEqual(elements.count, 5)
+        XCTAssertEqual(elements, elements.sorted(by: >))
+    }
+}