Replaced SUBSTR with GETRANGE.

nicolasff · nicolasff · commit c8a60a1dd573 · 2010-12-16T17:55:20.000+01:00
diff --git a/README.markdown b/README.markdown
@@ -1373,7 +1373,7 @@ $redis->append('key', 'value2'); /* 12 */
 $redis->get('key'); /* 'value1value2' */
 </pre>
 
-## substr
+## getRange (substr also supported but deprecated in redis)
 ##### *Description*
 Return a substring of a larger string 
 
@@ -1388,8 +1388,8 @@ Return a substring of a larger string
 ##### *Example*
 <pre>
 $redis->set('key', 'string value');
-$redis->substr('key', 0, 5); /* 'string' */
-$redis->substr('key', -5, -1); /* 'value' */
+$redis->getRange('key', 0, 5); /* 'string' */
+$redis->getRange('key', -5, -1); /* 'value' */
 </pre>
 
 ## strlen
diff --git a/php_redis.h b/php_redis.h
@@ -45,7 +45,7 @@ PHP_METHOD(Redis, decr);
 PHP_METHOD(Redis, decrBy);
 PHP_METHOD(Redis, type);
 PHP_METHOD(Redis, append);
-PHP_METHOD(Redis, substr);
+PHP_METHOD(Redis, getRange);
 PHP_METHOD(Redis, strlen);
 PHP_METHOD(Redis, getKeys);
 PHP_METHOD(Redis, sort);
diff --git a/redis.c b/redis.c
@@ -69,7 +69,7 @@ static zend_function_entry redis_functions[] = {
      PHP_ME(Redis, decrBy, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, type, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, append, NULL, ZEND_ACC_PUBLIC)
-     PHP_ME(Redis, substr, NULL, ZEND_ACC_PUBLIC)
+     PHP_ME(Redis, getRange, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, strlen, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, getKeys, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, sort, NULL, ZEND_ACC_PUBLIC)
@@ -178,6 +178,7 @@ static zend_function_entry redis_functions[] = {
      PHP_MALIAS(Redis, zRemove, zDelete, NULL, ZEND_ACC_PUBLIC)
      PHP_MALIAS(Redis, zRemoveRangeByScore, zDeleteRangeByScore, NULL, ZEND_ACC_PUBLIC)
      PHP_MALIAS(Redis, zSize, zCard, NULL, ZEND_ACC_PUBLIC)
+     PHP_MALIAS(Redis, substr, getRange, NULL, ZEND_ACC_PUBLIC)
      {NULL, NULL, NULL}
 };
 
@@ -1100,7 +1101,7 @@ PHP_METHOD(Redis, append)
 	REDIS_PROCESS_RESPONSE(redis_long_response);
 }
 
-PHP_METHOD(Redis, substr)
+PHP_METHOD(Redis, getRange)
 {
 	zval *object;
 	RedisSock *redis_sock;
@@ -1118,7 +1119,7 @@ PHP_METHOD(Redis, substr)
 		RETURN_FALSE;
 	}
 
-	cmd_len = redis_cmd_format_static(&cmd, "SUBSTR", "sdd", key, key_len, (int)start, (int)end);
+	cmd_len = redis_cmd_format_static(&cmd, "GETRANGE", "sdd", key, key_len, (int)start, (int)end);
 	REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
 	IF_ATOMIC() {
 		redis_string_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);
