mirror/phpredis
1
0
Fork 0
mirror of https://github.com/phpredis/phpredis.git synced 2026-06-19 07:35:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added SMOVE + tests.

Browse Source
This commit is contained in:
Nicolas Favre-Felix
2009-11-18 15:04:03 +01:00
parent a2d436df7a
commit 948811943c
3 changed files with 72 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php_redis.h
+1
View File
@@ -50,6 +50,7 @@ PHP_METHOD(Redis, lSet);
PHP_METHOD(Redis, sAdd);
PHP_METHOD(Redis, sSize);
PHP_METHOD(Redis, sRemove);
PHP_METHOD(Redis, sMove);
PHP_METHOD(Redis, sContains);
PHP_METHOD(Redis, sGetMembers);
PHP_METHOD(Redis, setTimeout);
redis.c
+52 -1
View File
@@ -64,6 +64,7 @@ zend_function_entry redis_functions[] = {
PHP_ME(Redis, sAdd, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Redis, sSize, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Redis, sRemove, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Redis, sMove, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Redis, sContains, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Redis, sGetMembers, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Redis, setTimeout, NULL, ZEND_ACC_PUBLIC)
@@ -1583,6 +1584,7 @@ PHP_METHOD(Redis, sRemove)
RedisSock *redis_sock;
char *key = NULL, *val = NULL, *cmd, *response;
int key_len, val_len, cmd_len, response_len;
int ret;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss",
&object, redis_ce,
@@ -1607,7 +1609,56 @@ PHP_METHOD(Redis, sRemove)
RETURN_FALSE;
}
if (response[1] == '1') {
ret = response[1];
efree(response);
if (ret == '1') {
RETURN_TRUE;
} else {
RETURN_FALSE;
}
}
/* }}} */
/* {{{ proto boolean Redis::sMove(string set_src, string set_dst, string value)
*/
PHP_METHOD(Redis, sMove)
{
zval *object;
RedisSock *redis_sock;
char *src = NULL, *dst = NULL, *val = NULL, *cmd, *response;
int src_len, dst_len, val_len, cmd_len, response_len;
char ret;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osss",
&object, redis_ce,
&src, &src_len,
&dst, &dst_len,
&val, &val_len) == FAILURE) {
RETURN_FALSE;
}
if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) {
RETURN_FALSE;
}
cmd_len = redis_cmd_format(&cmd, "SMOVE %s %s %d\r\n%s\r\n",
src, src_len,
dst, dst_len,
val_len,
val, val_len);
if (redis_sock_write(redis_sock, cmd, cmd_len) < 0) {
RETURN_FALSE;
}
if ((response = redis_sock_read(redis_sock, &response_len TSRMLS_CC)) == NULL) {
RETURN_FALSE;
}
ret = response[1];
efree(response);
if (ret == '1') {
RETURN_TRUE;
} else {
RETURN_FALSE;
tests/TestRedis.php
+19
View File
@@ -515,6 +515,25 @@ class Redis_Test extends PHPUnit_Framework_TestCase
$this->assertEquals(0, $this->redis->sSize('set'));
}
public function testsMove()
{
$this->redis->delete('set0');
$this->redis->delete('set1');
$this->redis->sAdd('set0', 'val');
$this->redis->sAdd('set0', 'val2');
$this->assertTrue($this->redis->sMove('set0', 'set1', 'val'));
$this->assertFalse($this->redis->sMove('set0', 'set1', 'val'));
$this->assertFalse($this->redis->sMove('set0', 'set1', 'val-what'));
$this->assertEquals(1, $this->redis->sSize('set0'));
$this->assertEquals(1, $this->redis->sSize('set1'));
$this->assertEquals(array('val2'), $this->redis->sGetMembers('set0'));
$this->assertEquals(array('val'), $this->redis->sGetMembers('set1'));
}
public function testsContains()
{
$this->redis->delete('set');