Fixed LIMIT input for sorts.

nicolasff · nicolasff · commit 9ad4b9e68f49 · 2011-04-25T22:41:32.000+02:00
diff --git a/redis.c b/redis.c
@@ -2343,26 +2343,38 @@ PHP_METHOD(Redis, sort) {
                 zval **z_offset_pp, **z_count_pp;
                 // get the two values from the table, check that they are indeed of LONG type
                 if(SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(z_cur), 0, (void**)&z_offset_pp) &&
-                  SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(z_cur), 1, (void**)&z_count_pp) &&
-                  Z_TYPE_PP(z_offset_pp) == IS_LONG &&
-                  Z_TYPE_PP(z_count_pp) == IS_LONG) {
-
-                    long limit_low = Z_LVAL_PP(z_offset_pp);
-                    long limit_high = Z_LVAL_PP(z_count_pp);
-
-                    old_cmd = cmd;
-                    cmd_len = redis_cmd_format(&cmd, "%s"
-                                                     "$5" _NL
-                                                     "LIMIT" _NL
-                                                     "$%d" _NL
-                                                     "%d" _NL
-                                                     "$%d" _NL
-                                                     "%d" _NL
-                                                     , cmd, cmd_len
-                                                     , integer_length(limit_low), limit_low
-                                                     , integer_length(limit_high), limit_high);
-                    elements += 3;
-                    efree(old_cmd);
+                  SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(z_cur), 1, (void**)&z_count_pp)) {
+
+                    long limit_low, limit_high;
+					if((Z_TYPE_PP(z_offset_pp) == IS_LONG || Z_TYPE_PP(z_offset_pp) == IS_STRING) &&
+						(Z_TYPE_PP(z_count_pp) == IS_LONG || Z_TYPE_PP(z_count_pp) == IS_STRING)) {
+
+
+						if(Z_TYPE_PP(z_offset_pp) == IS_LONG) {
+							limit_low = Z_LVAL_PP(z_offset_pp);
+						} else {
+							limit_low = atol(Z_STRVAL_PP(z_offset_pp));
+						}
+						if(Z_TYPE_PP(z_count_pp) == IS_LONG) {
+							limit_high = Z_LVAL_PP(z_count_pp);
+						} else {
+							limit_high = atol(Z_STRVAL_PP(z_count_pp));
+						}
+
+						old_cmd = cmd;
+						cmd_len = redis_cmd_format(&cmd, "%s"
+														 "$5" _NL
+														 "LIMIT" _NL
+														 "$%d" _NL
+														 "%d" _NL
+														 "$%d" _NL
+														 "%d" _NL
+														 , cmd, cmd_len
+														 , integer_length(limit_low), limit_low
+														 , integer_length(limit_high), limit_high);
+						elements += 3;
+						efree(old_cmd);
+					}
                 }
             }
         }
diff --git a/tests/TestRedis.php b/tests/TestRedis.php
@@ -759,6 +759,8 @@ public function testSortAsc() {
 	$this->assertEquals(array_slice($byAgeAsc, 0, 3), $this->redis->sortAsc('person:id', 'person:age_*', 'person:name_*', NULL, 3)); // NULL is transformed to 0 if there is something after it.
 	$this->assertEquals($byAgeAsc, $this->redis->sortAsc('person:id', 'person:age_*', 'person:name_*', 0, 4));
 	$this->assertEquals($byAgeAsc, $this->redis->sort('person:id', array('by' => 'person:age_*', 'get' => 'person:name_*', 'limit' => array(0, 4))));
+	$this->assertEquals($byAgeAsc, $this->redis->sort('person:id', array('by' => 'person:age_*', 'get' => 'person:name_*', 'limit' => array(0, "4")))); // with strings
+	$this->assertEquals($byAgeAsc, $this->redis->sort('person:id', array('by' => 'person:age_*', 'get' => 'person:name_*', 'limit' => array("0", 4))));
 	$this->assertEquals(array(), $this->redis->sortAsc('person:id', 'person:age_*', 'person:name_*', NULL, NULL)); // NULL, NULL is the same as (0,0). That returns no element.
 
 	// sort by salary and get ages
@@ -2547,12 +2549,14 @@ public function testSerializerPHP() {
 
     public function testSerializerIGBinary() {
 
-	    $this->checkSerializer(Redis::SERIALIZER_IGBINARY);
+	    if(defined('Redis::SERIALIZER_IGBINARY')) {
+		    $this->checkSerializer(Redis::SERIALIZER_IGBINARY);
 
-	    // with prefix
-	    $this->redis->setOption(Redis::OPT_PREFIX, "test:");
-	    $this->checkSerializer(Redis::SERIALIZER_IGBINARY);
-	    $this->redis->setOption(Redis::OPT_PREFIX, "");
+		    // with prefix
+		    $this->redis->setOption(Redis::OPT_PREFIX, "test:");
+		    $this->checkSerializer(Redis::SERIALIZER_IGBINARY);
+		    $this->redis->setOption(Redis::OPT_PREFIX, "");
+	    }
     }
 
     private function checkSerializer($mode) {
