Allow '-' and '+' arguments and add tests for zLexCount and zRemRangeByLex

Author: michael-grunder

redis_commands.c

@@ -901,6 +901,12 @@ int redis_zrangebylex_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     return SUCCESS;
 }
 
+/* Validate ZLEX* min/max argument strings */
+static int validate_zlex_arg(const char *arg, strlen_t len) {
+    return (len  > 1 && (*arg == '[' || *arg == '(')) ||
+           (len == 1 && (*arg == '+' || *arg == '-'));
+}
+
 /* ZLEXCOUNT/ZREMRANGEBYLEX */
 int redis_gen_zlex_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
                        char *kw, char **cmd, int *cmd_len, short *slot,
@@ -917,11 +923,9 @@ int redis_gen_zlex_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     }
 
     /* Quick sanity check on min/max */
-    if (min_len<1 || max_len<1 || (min[0]!='(' && min[0]!='[') ||
-       (max[0]!='(' && max[0]!='['))
-    {
+    if (!validate_zlex_arg(min, min_len) || !validate_zlex_arg(max, max_len)) {
         php_error_docref(NULL TSRMLS_CC, E_WARNING,
-            "Min and Max arguments must begin with '(' or '['");
+            "Min/Max args can be '-' or '+', or start with '[' or '('");
         return FAILURE;
     }
 

tests/RedisTest.php

@@ -2333,11 +2333,60 @@ public function testZRangeByLex() {
         $this->assertEquals($this->redis->zRangeByLex('key', '-', '[c'), Array('a', 'b', 'c'));
         $this->assertEquals($this->redis->zRangeByLex('key', '(e', '+'), Array('f', 'g'));
 
-	// with limit offset
+        // with limit offset
         $this->assertEquals($this->redis->zRangeByLex('key', '-', '[c', 1, 2), Array('b', 'c') );
         $this->assertEquals($this->redis->zRangeByLex('key', '-', '(c', 1, 2), Array('b'));
     }
 
+    public function testZLexCount() {
+        if (version_compare($this->version, "2.8.9", "lt")) {
+            $this->MarkTestSkipped();
+            return;
+        }
+
+        $this->redis->del('key');
+        foreach (range('a', 'g') as $c) {
+            $entries[] = $c;
+            $this->redis->zAdd('key', 0, $c);
+        }
+
+        /* Special -/+ values */
+        $this->assertEquals($this->redis->zLexCount('key', '-', '-'), 0);
+        $this->assertEquals($this->redis->zLexCount('key', '-', '+'), count($entries));
+
+        /* Verify invalid arguments return FALSE */
+        $this->assertFalse(@$this->redis->zLexCount('key', '[a', 'bad'));
+        $this->assertFalse(@$this->redis->zLexCount('key', 'bad', '[a'));
+
+        /* Now iterate through */
+        $start = $entries[0];
+        for ($i = 1; $i < count($entries); $i++) {
+            $end = $entries[$i];
+            $this->assertEquals($this->redis->zLexCount('key', "[$start", "[$end"), $i + 1);
+            $this->assertEquals($this->redis->zLexCount('key', "[$start", "($end"), $i);
+            $this->assertEquals($this->redis->zLexCount('key', "($start", "($end"), $i - 1);
+        }
+    }
+
+    public function testZRemRangeByLex() {
+        if (version_compare($this->version, "2.8.9", "lt")) {
+            $this->MarkTestSkipped();
+            return;
+        }
+
+        $this->redis->del('key');
+        $this->redis->zAdd('key', 0, 'a', 0, 'b', 0, 'c');
+        $this->assertEquals($this->redis->zRemRangeByLex('key', '-', '+'), 3);
+
+        $this->redis->zAdd('key', 0, 'a', 0, 'b', 0, 'c');
+        $this->assertEquals($this->redis->zRemRangeByLex('key', '[a', '[c'), 3);
+
+        $this->redis->zAdd('key', 0, 'a', 0, 'b', 0, 'c');
+        $this->assertEquals($this->redis->zRemRangeByLex('key', '[a', '(a'), 0);
+        $this->assertEquals($this->redis->zRemRangeByLex('key', '(a', '(c'), 1);
+        $this->assertEquals($this->redis->zRemRangeByLex('key', '[a', '[c'), 2);
+    }
+
     public function testHashes() {
         $this->redis->del('h', 'key');
         $this->assertTrue(0 === $this->redis->hLen('h'));