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

Merge pull request #2137 from phpredis/issue-2106

Browse Source 
Issue #2106
This commit is contained in:
Pavlo Yatsukhnenko
2022-10-24 09:31:05 +03:00
committed by GitHub
parent 8c7c5a3aa2 e0a88b7bdf
commit 141ca2e05f
13 changed files with 72 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cluster_library.c
View File

@@ -299,9 +299,8 @@ static int cluster_send_readonly(RedisSock *redis_sock) {
/* Send MULTI to a specific ReidsSock */
static int cluster_send_multi(redisCluster *c, short slot) {
if (cluster_send_direct(SLOT_SOCK(c,slot), RESP_MULTI_CMD,
sizeof(RESP_MULTI_CMD) - 1, TYPE_LINE) == 0)
{
if (cluster_send_direct(SLOT_SOCK(c,slot), ZEND_STRL(RESP_MULTI_CMD), TYPE_LINE) == 0) {
c->flags->txBytes += sizeof(RESP_MULTI_CMD) - 1;
c->cmd_sock->mode = MULTI;
return 0;
}
@@ -1513,6 +1512,9 @@ PHP_REDIS_API int cluster_send_slot(redisCluster *c, short slot, char *cmd,
/* Point our cluster to this slot and it's socket */
c->cmd_slot = slot;
c->cmd_sock = SLOT_SOCK(c, slot);
if (c->flags->mode != MULTI) {
c->flags->txBytes = 0;
}
/* Enable multi mode on this slot if we've been directed to but haven't
* send it to this node yet */
@@ -1527,6 +1529,7 @@ PHP_REDIS_API int cluster_send_slot(redisCluster *c, short slot, char *cmd,
if (cluster_sock_write(c, cmd, cmd_len, 1) == -1) {
return -1;
}
c->flags->txBytes += cmd_len;
/* Check our response */
if (cluster_check_response(c, &c->reply_type) != 0 ||

1
common.h
View File

@@ -323,6 +323,7 @@ typedef struct {
int null_mbulk_as_null;
int tcp_keepalive;
int sentinel;
size_t txBytes;
} RedisSock;
/* }}} */

5
library.c
View File

@@ -3128,6 +3128,11 @@ redis_sock_write(RedisSock *redis_sock, char *cmd, size_t sz)
if (redis_check_eof(redis_sock, 0, 0) == 0 &&
php_stream_write(redis_sock->stream, cmd, sz) == sz
) {
if (IS_MULTI(redis_sock)) {
redis_sock->txBytes += sz;
} else {
redis_sock->txBytes = sz;
}
return sz;
}
return -1;

9
redis.c
View File

@@ -3131,6 +3131,15 @@ PHP_METHOD(Redis, getDBNum) {
}
}
PHP_METHOD(Redis, getTransferredBytes) {
RedisSock *redis_sock;
if ((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU)) == NULL) {
RETURN_FALSE;
}
RETURN_LONG(redis_sock->txBytes);
}
/* {{{ proto Redis::getTimeout */
PHP_METHOD(Redis, getTimeout) {
RedisSock *redis_sock;

2
redis.stub.php
View File

@@ -294,6 +294,8 @@ class Redis {
public function getTimeout(): int;
public function getTransferredBytes(): int|false;
public function hDel(string $key, string $member, string ...$other_members): Redis|int|false;
public function hExists(string $key, string $member): Redis|bool;

7
redis_arginfo.h
View File

@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 0ff60ed233053935cfc7c5a5ecacd6adaf06a458 */
* Stub hash: 894a03b9e9db1e8ded0f016a00e7e7150dc26f31 */
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis___construct, 0, 0, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "null")
@@ -359,6 +359,9 @@ ZEND_END_ARG_INFO()
#define arginfo_class_Redis_getTimeout arginfo_class_Redis_getDBNum
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_Redis_getTransferredBytes, 0, 0, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_hDel, 0, 2, Redis, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, member, IS_STRING, 0)
@@ -1191,6 +1194,7 @@ ZEND_METHOD(Redis, lcs);
ZEND_METHOD(Redis, getReadTimeout);
ZEND_METHOD(Redis, getset);
ZEND_METHOD(Redis, getTimeout);
ZEND_METHOD(Redis, getTransferredBytes);
ZEND_METHOD(Redis, hDel);
ZEND_METHOD(Redis, hExists);
ZEND_METHOD(Redis, hGet);
@@ -1436,6 +1440,7 @@ static const zend_function_entry class_Redis_methods[] = {
ZEND_ME(Redis, getReadTimeout, arginfo_class_Redis_getReadTimeout, ZEND_ACC_PUBLIC)
ZEND_ME(Redis, getset, arginfo_class_Redis_getset, ZEND_ACC_PUBLIC)
ZEND_ME(Redis, getTimeout, arginfo_class_Redis_getTimeout, ZEND_ACC_PUBLIC)
ZEND_ME(Redis, getTransferredBytes, arginfo_class_Redis_getTransferredBytes, ZEND_ACC_PUBLIC)
ZEND_ME(Redis, hDel, arginfo_class_Redis_hDel, ZEND_ACC_PUBLIC)
ZEND_ME(Redis, hExists, arginfo_class_Redis_hExists, ZEND_ACC_PUBLIC)
ZEND_ME(Redis, hGet, arginfo_class_Redis_hGet, ZEND_ACC_PUBLIC)

7
redis_cluster.c
View File

@@ -1710,6 +1710,11 @@ PHP_METHOD(RedisCluster, clearlasterror) {
RETURN_TRUE;
}
PHP_METHOD(RedisCluster, gettransferredbytes) {
redisCluster *c = GET_CONTEXT();
RETURN_LONG(c->flags->txBytes);
}
/* }}} */
/* {{{ proto long RedisCluster::getOption(long option */
@@ -1829,6 +1834,8 @@ PHP_METHOD(RedisCluster, multi) {
/* Flag that we're in MULTI mode */
c->flags->mode = MULTI;
c->flags->txBytes = 0;
/* Return our object so we can chain MULTI calls */
RETVAL_ZVAL(getThis(), 1, 0);
}

2
redis_cluster.stub.php
View File

@@ -155,6 +155,8 @@ class RedisCluster {
public function getset(string $key, mixed $value): RedisCluster|string|bool;
public function gettransferredbytes(): int|false;
public function hdel(string $key, string $member, string ...$other_members): RedisCluster|int|false;
public function hexists(string $key, string $member): RedisCluster|bool;

7
redis_cluster_arginfo.h
View File

@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 3d10a4c161f9a4bcf65ac9acfebbb86d11f9cf0d */
* Stub hash: b9d2d6314c74dbf1e80662aa867b36c4a3ecfe8d */
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster___construct, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 1)
@@ -306,6 +306,9 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_getset, 0
ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_RedisCluster_gettransferredbytes, 0, 0, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_hdel, 0, 2, RedisCluster, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, member, IS_STRING, 0)
@@ -1012,6 +1015,7 @@ ZEND_METHOD(RedisCluster, getoption);
ZEND_METHOD(RedisCluster, getrange);
ZEND_METHOD(RedisCluster, lcs);
ZEND_METHOD(RedisCluster, getset);
ZEND_METHOD(RedisCluster, gettransferredbytes);
ZEND_METHOD(RedisCluster, hdel);
ZEND_METHOD(RedisCluster, hexists);
ZEND_METHOD(RedisCluster, hget);
@@ -1219,6 +1223,7 @@ static const zend_function_entry class_RedisCluster_methods[] = {
ZEND_ME(RedisCluster, getrange, arginfo_class_RedisCluster_getrange, ZEND_ACC_PUBLIC)
ZEND_ME(RedisCluster, lcs, arginfo_class_RedisCluster_lcs, ZEND_ACC_PUBLIC)
ZEND_ME(RedisCluster, getset, arginfo_class_RedisCluster_getset, ZEND_ACC_PUBLIC)
ZEND_ME(RedisCluster, gettransferredbytes, arginfo_class_RedisCluster_gettransferredbytes, ZEND_ACC_PUBLIC)
ZEND_ME(RedisCluster, hdel, arginfo_class_RedisCluster_hdel, ZEND_ACC_PUBLIC)
ZEND_ME(RedisCluster, hexists, arginfo_class_RedisCluster_hexists, ZEND_ACC_PUBLIC)
ZEND_ME(RedisCluster, hget, arginfo_class_RedisCluster_hget, ZEND_ACC_PUBLIC)

6
redis_cluster_legacy_arginfo.h
View File

@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 3d10a4c161f9a4bcf65ac9acfebbb86d11f9cf0d */
* Stub hash: b9d2d6314c74dbf1e80662aa867b36c4a3ecfe8d */
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster___construct, 0, 0, 1)
ZEND_ARG_INFO(0, name)
@@ -272,6 +272,8 @@ ZEND_END_ARG_INFO()
#define arginfo_class_RedisCluster_getset arginfo_class_RedisCluster_append
#define arginfo_class_RedisCluster_gettransferredbytes arginfo_class_RedisCluster__masters
#define arginfo_class_RedisCluster_hdel arginfo_class_RedisCluster_geohash
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_hexists, 0, 0, 2)
@@ -864,6 +866,7 @@ ZEND_METHOD(RedisCluster, getoption);
ZEND_METHOD(RedisCluster, getrange);
ZEND_METHOD(RedisCluster, lcs);
ZEND_METHOD(RedisCluster, getset);
ZEND_METHOD(RedisCluster, gettransferredbytes);
ZEND_METHOD(RedisCluster, hdel);
ZEND_METHOD(RedisCluster, hexists);
ZEND_METHOD(RedisCluster, hget);
@@ -1071,6 +1074,7 @@ static const zend_function_entry class_RedisCluster_methods[] = {
ZEND_ME(RedisCluster, getrange, arginfo_class_RedisCluster_getrange, ZEND_ACC_PUBLIC)
ZEND_ME(RedisCluster, lcs, arginfo_class_RedisCluster_lcs, ZEND_ACC_PUBLIC)
ZEND_ME(RedisCluster, getset, arginfo_class_RedisCluster_getset, ZEND_ACC_PUBLIC)
ZEND_ME(RedisCluster, gettransferredbytes, arginfo_class_RedisCluster_gettransferredbytes, ZEND_ACC_PUBLIC)
ZEND_ME(RedisCluster, hdel, arginfo_class_RedisCluster_hdel, ZEND_ACC_PUBLIC)
ZEND_ME(RedisCluster, hexists, arginfo_class_RedisCluster_hexists, ZEND_ACC_PUBLIC)
ZEND_ME(RedisCluster, hget, arginfo_class_RedisCluster_hget, ZEND_ACC_PUBLIC)

6
redis_legacy_arginfo.h
View File

@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 0ff60ed233053935cfc7c5a5ecacd6adaf06a458 */
* Stub hash: 894a03b9e9db1e8ded0f016a00e7e7150dc26f31 */
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis___construct, 0, 0, 0)
ZEND_ARG_INFO(0, options)
@@ -326,6 +326,8 @@ ZEND_END_ARG_INFO()
#define arginfo_class_Redis_getTimeout arginfo_class_Redis___destruct
#define arginfo_class_Redis_getTransferredBytes arginfo_class_Redis___destruct
#define arginfo_class_Redis_hDel arginfo_class_Redis_geohash
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis_hExists, 0, 0, 2)
@@ -1023,6 +1025,7 @@ ZEND_METHOD(Redis, lcs);
ZEND_METHOD(Redis, getReadTimeout);
ZEND_METHOD(Redis, getset);
ZEND_METHOD(Redis, getTimeout);
ZEND_METHOD(Redis, getTransferredBytes);
ZEND_METHOD(Redis, hDel);
ZEND_METHOD(Redis, hExists);
ZEND_METHOD(Redis, hGet);
@@ -1268,6 +1271,7 @@ static const zend_function_entry class_Redis_methods[] = {
ZEND_ME(Redis, getReadTimeout, arginfo_class_Redis_getReadTimeout, ZEND_ACC_PUBLIC)
ZEND_ME(Redis, getset, arginfo_class_Redis_getset, ZEND_ACC_PUBLIC)
ZEND_ME(Redis, getTimeout, arginfo_class_Redis_getTimeout, ZEND_ACC_PUBLIC)
ZEND_ME(Redis, getTransferredBytes, arginfo_class_Redis_getTransferredBytes, ZEND_ACC_PUBLIC)
ZEND_ME(Redis, hDel, arginfo_class_Redis_hDel, ZEND_ACC_PUBLIC)
ZEND_ME(Redis, hExists, arginfo_class_Redis_hExists, ZEND_ACC_PUBLIC)
ZEND_ME(Redis, hGet, arginfo_class_Redis_hGet, ZEND_ACC_PUBLIC)

9
tests/RedisClusterTest.php
View File

@@ -758,6 +758,15 @@ class Redis_Cluster_Test extends Redis_Test {
ini_set('redis.pconnect.pooling_enabled', $prev_value);
}
public function testTransferredBytes() {
$this->assertTrue($this->redis->ping(''));
$this->assertEquals(strlen("*1\r\n$4\r\nPING\r\n"), $this->redis->getTransferredBytes());
$this->assertEquals(['cluster_enabled' => 1], $this->redis->info('', 'cluster'));
$this->assertEquals(strlen("*2\r\n$4\r\nINFO\r\n$7\r\ncluster\r\n"), $this->redis->getTransferredBytes());
$this->assertEquals([true, true], $this->redis->multi()->ping('')->ping('')->exec());
$this->assertEquals(strlen("*1\r\n$5\r\nMULTI\r\n*1\r\n$4\r\nEXEC\r\n") + 2 * strlen("*2\r\n$4\r\nPING\r\n"), $this->redis->getTransferredBytes());
}
/**
* @inheritdoc
*/

9
tests/RedisTest.php
View File

@@ -5752,6 +5752,15 @@ class Redis_Test extends TestSuite
$this->assertTrue($this->redis->getAuth() === $this->getAuth());
}
public function testTransferredBytes() {
$this->assertTrue($this->redis->ping());
$this->assertEquals(strlen("*1\r\n$4\r\nPING\r\n"), $this->redis->getTransferredBytes());
$this->assertEquals(['cluster_enabled' => 0], $this->redis->info('cluster'));
$this->assertEquals(strlen("*2\r\n$4\r\nINFO\r\n$7\r\ncluster\r\n"), $this->redis->getTransferredBytes());
$this->assertEquals([true, true], $this->redis->multi()->ping()->ping()->exec());
$this->assertEquals(strlen("*1\r\n$5\r\nMULTI\r\n*1\r\n$4\r\nEXEC\r\n") + 2 * strlen("*2\r\n$4\r\nPING\r\n"), $this->redis->getTransferredBytes());
}
/**
* Scan and variants
*/