php-win-ext/phpredis
1
0
Fork 0
mirror of https://github.com/php-win-ext/phpredis.git synced 2026-03-24 00:52:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added serialization to lots of functions.

Browse Source
This commit is contained in:
Nicolas Favre-Felix
2010-12-12 18:42:47 +01:00
parent 1e6145b90e
commit ca904bc7e0
4 changed files with 128 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library.c
View File

@@ -872,7 +872,12 @@ redis_sock_read_multibulk_reply_loop(INTERNAL_FUNCTION_PARAMETERS, RedisSock *re
int response_len;
response = redis_sock_read(redis_sock, &response_len TSRMLS_CC);
if(response != NULL) {
add_next_index_stringl(z_tab, response, response_len, 0);
zval *z = NULL;
if(redis_unserialize(redis_sock, response, response_len, &z TSRMLS_CC) == 1) {
add_next_index_zval(z_tab, z);
} else {
add_next_index_stringl(z_tab, response, response_len, 0);
}
} else {
add_next_index_bool(z_tab, 0);
}

69
redis.c
View File

@@ -1213,14 +1213,16 @@ PHP_METHOD(Redis, lInsert)
zval *z_array, **z_curr;
char *pivot, *position, *key, *val, *cmd;
int pivot_len, position_len, key_len, val_len, cmd_len;
int val_free, pivot_free;
zval *z_value, *z_pivot;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ossss",
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osszz",
&object, redis_ce,
&key, &key_len,
&position, &position_len,
&pivot, &pivot_len,
&val, &val_len) == FAILURE) {
&z_pivot,
&z_value) == FAILURE) {
RETURN_NULL();
}
@@ -1229,7 +1231,13 @@ PHP_METHOD(Redis, lInsert)
}
if(strncasecmp(position, "after", 5) == 0 || strncasecmp(position, "before", 6) == 0) {
cmd_len = redis_cmd_format_static(&cmd, "LINSERT", "ssss", key, key_len, position, position_len, pivot, pivot_len, val, val_len);
val_free = redis_serialize(redis_sock, z_value, &val, &val_len);
pivot_free = redis_serialize(redis_sock, z_pivot, &pivot, &pivot_len);
cmd_len = redis_cmd_format_static(&cmd, "LINSERT", "ssss", key, key_len, position, position_len, pivot, pivot_len, val, val_len);
if(val_free) efree(val);
if(pivot_free) efree(pivot);
REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
IF_ATOMIC() {
redis_long_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);
@@ -1380,10 +1388,12 @@ PHP_METHOD(Redis, lRemove)
int cmd_len, key_len, val_len;
char *key, *val;
long count = 0;
zval *z_value;
int val_free;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss|l",
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osz|l",
&object, redis_ce,
&key, &key_len, &val, &val_len, &count) == FAILURE) {
&key, &key_len, &z_value, &count) == FAILURE) {
RETURN_NULL();
}
@@ -1391,8 +1401,11 @@ PHP_METHOD(Redis, lRemove)
RETURN_FALSE;
}
/* LREM key count value */
val_free = redis_serialize(redis_sock, z_value, &val, &val_len);
cmd_len = redis_cmd_format_static(&cmd, "LREM", "sds", key, key_len, count, val, val_len);
if(val_free) efree(val);
REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
IF_ATOMIC() {
@@ -1496,7 +1509,7 @@ PHP_METHOD(Redis, lGetRange)
}
/* }}} */
/* {{{ proto boolean Redis::sAdd(string key , string value)
/* {{{ proto boolean Redis::sAdd(string key , mixed value)
*/
PHP_METHOD(Redis, sAdd)
{
@@ -1504,10 +1517,12 @@ PHP_METHOD(Redis, sAdd)
RedisSock *redis_sock;
char *key = NULL, *val = NULL, *cmd;
int key_len, val_len, cmd_len;
int val_free;
zval *z_value;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss",
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osz",
&object, redis_ce, &key, &key_len,
&val, &val_len) == FAILURE) {
&z_value) == FAILURE) {
RETURN_NULL();
}
@@ -1515,7 +1530,9 @@ PHP_METHOD(Redis, sAdd)
RETURN_FALSE;
}
val_free = redis_serialize(redis_sock, z_value, &val, &val_len);
cmd_len = redis_cmd_format_static(&cmd, "SADD", "ss", key, key_len, val, val_len);
if(val_free) efree(val);
REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
IF_ATOMIC() {
@@ -1562,10 +1579,12 @@ PHP_METHOD(Redis, sRemove)
RedisSock *redis_sock;
char *key = NULL, *val = NULL, *cmd;
int key_len, val_len, cmd_len;
int val_free;
zval *z_value;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss",
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osz",
&object, redis_ce,
&key, &key_len, &val, &val_len) == FAILURE) {
&key, &key_len, &z_value) == FAILURE) {
RETURN_FALSE;
}
@@ -1573,7 +1592,9 @@ PHP_METHOD(Redis, sRemove)
RETURN_FALSE;
}
val_free = redis_serialize(redis_sock, z_value, &val, &val_len);
cmd_len = redis_cmd_format_static(&cmd, "SREM", "ss", key, key_len, val, val_len);
if(val_free) efree(val);
REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
IF_ATOMIC() {
@@ -1582,7 +1603,7 @@ PHP_METHOD(Redis, sRemove)
REDIS_PROCESS_RESPONSE(redis_1_response);
}
/* }}} */
/* {{{ proto boolean Redis::sMove(string set_src, string set_dst, string value)
/* {{{ proto boolean Redis::sMove(string set_src, string set_dst, mixed value)
*/
PHP_METHOD(Redis, sMove)
{
@@ -1590,12 +1611,14 @@ PHP_METHOD(Redis, sMove)
RedisSock *redis_sock;
char *src = NULL, *dst = NULL, *val = NULL, *cmd;
int src_len, dst_len, val_len, cmd_len;
int val_free;
zval *z_value;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osss",
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ossz",
&object, redis_ce,
&src, &src_len,
&dst, &dst_len,
&val, &val_len) == FAILURE) {
&z_value) == FAILURE) {
RETURN_FALSE;
}
@@ -1603,7 +1626,9 @@ PHP_METHOD(Redis, sMove)
RETURN_FALSE;
}
val_free = redis_serialize(redis_sock, z_value, &val, &val_len);
cmd_len = redis_cmd_format_static(&cmd, "SMOVE", "sss", src, src_len, dst, dst_len, val, val_len);
if(val_free) efree(val);
REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
IF_ATOMIC() {
@@ -1639,10 +1664,12 @@ PHP_METHOD(Redis, sContains)
RedisSock *redis_sock;
char *key = NULL, *val = NULL, *cmd;
int key_len, val_len, cmd_len;
int val_free;
zval *z_value;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss",
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osz",
&object, redis_ce,
&key, &key_len, &val, &val_len) == FAILURE) {
&key, &key_len, &z_value) == FAILURE) {
return;
}
@@ -1650,7 +1677,9 @@ PHP_METHOD(Redis, sContains)
RETURN_FALSE;
}
val_free = redis_serialize(redis_sock, z_value, &val, &val_len);
cmd_len = redis_cmd_format_static(&cmd, "SISMEMBER", "ss", key, key_len, val, val_len);
if(val_free) efree(val);
REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
IF_ATOMIC() {
@@ -2421,9 +2450,11 @@ PHP_METHOD(Redis, lSet) {
int cmd_len, key_len, val_len;
long index;
char *key, *val;
int val_free;
zval *z_value;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osls",
&object, redis_ce, &key, &key_len, &index, &val, &val_len) == FAILURE) {
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oslz",
&object, redis_ce, &key, &key_len, &index, &z_value) == FAILURE) {
RETURN_FALSE;
}
@@ -2431,7 +2462,9 @@ PHP_METHOD(Redis, lSet) {
RETURN_FALSE;
}
val_free = redis_serialize(redis_sock, z_value, &val, &val_len);
cmd_len = redis_cmd_format_static(&cmd, "LSET", "sds", key, key_len, index, val, val_len);
if(val_free) efree(val);
REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
IF_ATOMIC() {

27
serialize.list
View File

@@ -17,23 +17,16 @@ strlen
rPop
blPop
brPop
lSize
lRemove
listTrim
lGet
lGetRange
lSet
lInsert
sAdd
sRemove
sMove
sContains
sInter
sInterStore
sUnion
sUnionStore
sDiff
sDiffStore
lRemove
lGet
lGetRange
lSet
lInsert
sAdd
sRemove
sMove
sContains
zAdd
zDelete

61
tests/TestRedis.php
View File

@@ -2369,6 +2369,67 @@ $r->lPush($_ENV["PHPREDIS_key"], $_ENV["PHPREDIS_value"]);
$this->assertTrue($this->redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP) === TRUE); // set ok
$this->assertTrue($this->redis->getOption(Redis::OPT_SERIALIZER) === Redis::SERIALIZER_PHP); // get ok
// lPush, rPush
$a = array('hello world', 42, TRUE, array('<tag>' => 1729));
$this->redis->delete('key');
$this->redis->lPush('key', $a[0]);
$this->redis->rPush('key', $a[1]);
$this->redis->rPush('key', $a[2]);
$this->redis->rPush('key', $a[3]);
// lGetRange
$this->assertTrue($a === $this->redis->lGetRange('key', 0, -1));
// lGet
$this->assertTrue($a[0] === $this->redis->lGet('key', 0));
$this->assertTrue($a[1] === $this->redis->lGet('key', 1));
$this->assertTrue($a[2] === $this->redis->lGet('key', 2));
$this->assertTrue($a[3] === $this->redis->lGet('key', 3));
// lRemove
$this->assertTrue($this->redis->lRemove('key', $a[3]) === 1);
$this->assertTrue(array_slice($a, 0, 3) === $this->redis->lGetRange('key', 0, -1));
// lSet
$a[0] = array('k' => 'v'); // update
$this->assertTrue(TRUE === $this->redis->lSet('key', 0, $a[0]));
$this->assertTrue($a[0] === $this->redis->lGet('key', 0));
// lInsert
$this->assertTrue($this->redis->lInsert('key', Redis::BEFORE, $a[0], array(1,2,3)) === 4);
$this->assertTrue($this->redis->lInsert('key', Redis::AFTER, $a[0], array(4,5,6)) === 5);
$a = array(array(1,2,3), $a[0], array(4,5,6), $a[1], $a[2]);
$this->assertTrue($a === $this->redis->lGetRange('key', 0, -1));
// sAdd
$this->redis->delete('key');
$s = array(1,'a', array(1,2,3), array('k' => 'v'));
$this->assertTrue(TRUE === $this->redis->sAdd('key', $s[0]));
$this->assertTrue(TRUE === $this->redis->sAdd('key', $s[1]));
$this->assertTrue(TRUE === $this->redis->sAdd('key', $s[2]));
$this->assertTrue(TRUE === $this->redis->sAdd('key', $s[3]));
// sRemove
$this->assertTrue(TRUE === $this->redis->sRemove('key', $s[3]));
$this->assertTrue(FALSE === $this->redis->sRemove('key', $s[3]));
// sContains
$this->assertTrue(TRUE === $this->redis->sContains('key', $s[0]));
$this->assertTrue(TRUE === $this->redis->sContains('key', $s[1]));
$this->assertTrue(TRUE === $this->redis->sContains('key', $s[2]));
$this->assertTrue(FALSE === $this->redis->sContains('key', $s[3]));
unset($s[3]);
// sMove
$this->redis->delete('tmp');
$this->redis->sMove('key', 'tmp', $s[0]);
$this->assertTrue(FALSE === $this->redis->sContains('key', $s[0]));
$this->assertTrue(TRUE === $this->redis->sContains('tmp', $s[0]));
unset($s[0]);
}
}