MOD: sirange(sirevrange) syntax opti , add cursor keyword

apache · Sep 3, 2019 · cf0b630 · cf0b630
1 parent 1a62f28
commit cf0b630
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/docs/support-commands.md b/docs/support-commands.md
@@ -163,11 +163,11 @@
 
 | Command | Supported OR Not | Desc |
 | ------------ | ---------------- | ---- |
-| sicard | √ | like scard |
-| siadd | √ | like sadd, but member is int |
-| sirem | √ | like srem, but member is int |
-| sirange | √ | sirange key offset count since_id  |
-| sirevrange | √ | sirevrange key offset count max_id  |
+| sicard | √ | like scard  |
+| siadd | √ | like sadd, but member is int  |
+| sirem | √ | like srem, but member is int  |
+| sirange | √ | sirange key offset count cursor since_id |
+| sirevrange | √ | sirevrange key offset count cursor max_id |
 
 ## Administrator Commands
 

diff --git a/src/redis_cmd.cc b/src/redis_cmd.cc
@@ -2522,8 +2522,11 @@ class CommandSortedintRange : public Commander {
  try {
  offset_ = std::stoi(args[2]);
  limit_ = std::stoi(args[3]);
- if (args.size() == 5) {
- cursor_id_ = std::stoull(args[4]);
+ if (args.size() == 6) {
+ if (args[4] != "cursor") {
+ return Status(Status::RedisParseErr, "syntax error");
+ }
+ cursor_id_ = std::stoull(args[5]);
  }
  } catch (const std::exception &e) {
  return Status(Status::RedisParseErr, kValueNotInterger);

diff --git a/tests/functional/sortint_test.py → tests/functional/sortedint_test.py b/tests/functional/sortint_test.py → tests/functional/sortedint_test.py
@@ -37,6 +37,7 @@ def test_sicard():
 def test_sirange():
  conn = get_redis_conn()
  key = "test_sirange"
+ ret = conn.delete(key)
  ret = conn.execute_command("siadd", key, 1, 2, 3, 4, 60, 231, 9999)
  assert (ret == 7)
  ret = conn.execute_command("sirange", key, 0, 20)
@@ -45,7 +46,7 @@ def test_sirange():
  assert (ret == ['1', '2'])
  ret = conn.execute_command("sirange", key, 3, 2)
  assert (ret == ['4', '60'])
- ret = conn.execute_command("sirange", key, 0, 2, 3)
+ ret = conn.execute_command("sirange", key, 0, 2, "cursor", 3)
  assert (ret == ['4', '60'])
 
  ret = conn.delete(key)
@@ -55,6 +56,7 @@ def test_sirange():
 def test_sirevrange():
  conn = get_redis_conn()
  key = "test_sirevrange"
+ ret = conn.delete(key)
  ret = conn.execute_command("siadd", key, 1, 2, 3, 4, 60, 231, 9999)
  assert (ret == 7)
  ret = conn.execute_command("sirevrange", key, 0, 20)
@@ -63,7 +65,7 @@ def test_sirevrange():
  assert (ret == ['9999', '231'])
  ret = conn.execute_command("sirevrange", key, 3, 2)
  assert (ret == ['4', '3'])
- ret = conn.execute_command("sirevrange", key, 0, 2, 3)
+ ret = conn.execute_command("sirevrange", key, 0, 2, "cursor", 3)
  assert (ret == ['2', '1'])
 
  ret = conn.delete(key)