Merge pull request phpredis#177 from michael-grunder/master

nicolasff · nicolasff · commit 807f9cc8e504 · 2012-05-07T02:10:26.000-07:00
INFO with optional argument
diff --git a/redis.c b/redis.c
@@ -3181,19 +3181,25 @@ PHP_METHOD(Redis, info) {
 
     zval *object;
     RedisSock *redis_sock;
+    char *cmd, *opt = NULL;
+    int cmd_len, opt_len;
 
-    char *cmd;
-    int cmd_len = redis_cmd_format_static(&cmd, "INFO", "");
-
-    if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
-                                     &object, redis_ce) == FAILURE) {
+    if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|s",
+                                     &object, redis_ce, &opt, &opt_len) == FAILURE) {
         RETURN_FALSE;
     }
 
     if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) {
         RETURN_FALSE;
     }
 
+    // Build a standalone INFO command or one with an option
+    if(opt != NULL) {
+    	cmd_len = redis_cmd_format_static(&cmd, "INFO", "s", opt, opt_len);
+    } else {
+    	cmd_len = redis_cmd_format_static(&cmd, "INFO", "");
+    }
+
 	REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
 	IF_ATOMIC() {
 	  redis_info_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);
diff --git a/tests/TestRedis.php b/tests/TestRedis.php
@@ -1574,6 +1574,13 @@ public function testinfo() {
 	foreach($keys as $k) {
 	    $this->assertTrue(in_array($k, array_keys($info)));
 	}
+
+	// INFO COMMANDSTATS
+	$info = $this->redis->info("COMMANDSTATS");
+
+	foreach($info as $k => $value) {
+		$this->assertTrue(strpos($k, 'cmdstat_') !== false);
+    }
     }
 
     public function testSelect() {

Original file line number	Diff line number	Diff line change
`@@ -1574,6 +1574,13 @@ public function testinfo() {`
`1574`	`1574`	`foreach($keys as $k) {`
`1575`	`1575`	`$this->assertTrue(in_array($k, array_keys($info)));`
`1576`	`1576`	`}`
	`1577`	`+`
	`1578`	`+ // INFO COMMANDSTATS`
	`1579`	`+ $info = $this->redis->info("COMMANDSTATS");`
	`1580`	`+`
	`1581`	`+ foreach($info as $k => $value) {`
	`1582`	`+ $this->assertTrue(strpos($k, 'cmdstat_') !== false);`
	`1583`	`+ }`
`1577`	`1584`	`}`
`1578`	`1585`
`1579`	`1586`	`public function testSelect() {`