fix:issue with ZRANGE and ZRANGESTORE with BYLEX (#214)

Fix #203

fakeredis/_commands.py

@@ -238,6 +238,9 @@ def __gt__(self, other):
     def __eq__(self, other):
         return isinstance(other, BeforeAny)
 
+    def __hash__(self):
+        return 1
+
 
 @functools.total_ordering
 class AfterAny:
@@ -247,6 +250,9 @@ def __lt__(self, other):
     def __eq__(self, other):
         return isinstance(other, AfterAny)
 
+    def __hash__(self):
+        return 1
+
 
 class ScoreTest:
     """Argument converter for sorted set score endpoints."""

fakeredis/_zset.py

@@ -74,8 +74,10 @@ def islice_score(self, start, stop, reverse=False):
     def irange_lex(self, start, stop, inclusive=(True, True), reverse=False):
         if not self._byscore:
             return iter([])
-        score = self._byscore[0][0]
-        it = self._byscore.irange((score, start), (score, stop),
+        default_score = self._byscore[0][0]
+        start_score = self._bylex.get(start, default_score)
+        stop_score = self._bylex.get(stop, default_score)
+        it = self._byscore.irange((start_score, start), (stop_score, stop),
                                   inclusive=inclusive, reverse=reverse)
         return (item[1] for item in it)
 

test/test_mixins/test_sortedset_commands.py

@@ -1164,10 +1164,9 @@ def test_zrangestore(r: redis.Redis):
     assert r.zrangestore("b", "a", 2, 1, byscore=True, offset=0, num=1, desc=True)
     assert r.zrange("b", 0, -1) == [b"a2"]
     # by lex
-    # TODO: fix
-    # assert r.zrange("a", "[a2", "(a3", bylex=True, offset=0, num=1) == [b"a2"]
-    # assert r.zrangestore("b", "a", "[a2", "(a3", bylex=True, offset=0, num=1)
-    # assert r.zrange("b", 0, -1) == [b"a2"]
+    assert r.zrange("a", "[a2", "(a3", bylex=True, offset=0, num=1) == [b"a2"]
+    assert r.zrangestore("b", "a", "[a2", "(a3", bylex=True, offset=0, num=1)
+    assert r.zrange("b", 0, -1) == [b"a2"]
 
 
 @pytest.mark.min_server('7')

test/test_mixins/test_transactions_commands.py

@@ -318,6 +318,7 @@ def test_get_within_pipeline(r: redis.Redis):
         p.watch("test")
         assert set(r.keys()) == expected_keys
 
+
 @pytest.mark.fake
 def test_get_within_pipeline_w_host():
     r = fakeredis.FakeRedis('localhost')
@@ -329,6 +330,7 @@ def test_get_within_pipeline_w_host():
         p.watch("test")
         assert set(r.keys()) == expected_keys
 
+
 @pytest.mark.fake
 def test_get_within_pipeline_no_args():
     r = fakeredis.FakeRedis()