Review changes

michael-grunder · michael-grunder · commit 7a4cee2d6696 · 2022-11-25T13:41:47.000-08:00
See #2106
diff --git a/library.c b/library.c
@@ -3274,9 +3274,8 @@ PHP_REDIS_API int
 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)
+        redis_sock_write_raw(redis_sock, cmd, sz) == sz)
     {
-        redis_sock->txBytes += sz;
         return sz;
     }
 
diff --git a/redis_cluster.c b/redis_cluster.c
@@ -1717,21 +1717,41 @@ PHP_METHOD(RedisCluster, clearlasterror) {
     RETURN_TRUE;
 }
 
+static void redisSumNodeBytes(redisClusterNode *node, zend_long *tx, zend_long *rx) {
+    struct redisClusterNode *slave;
+
+    *tx += node->sock->txBytes;
+    *rx += node->sock->rxBytes;
+
+    if (node->slaves) {
+        ZEND_HASH_FOREACH_PTR(node->slaves, slave) {
+            *tx += slave->sock->txBytes;
+            *rx += slave->sock->rxBytes;
+        } ZEND_HASH_FOREACH_END();
+    }
+}
+
+static void redisClearNodeBytes(redisClusterNode *node) {
+    struct redisClusterNode *slave;
+
+    node->sock->txBytes = 0;
+    node->sock->rxBytes = 0;
+
+    if (node->slaves) {
+        ZEND_HASH_FOREACH_PTR(node->slaves, slave) {
+            slave->sock->txBytes = 0;
+            slave->sock->rxBytes = 0;
+        } ZEND_HASH_FOREACH_END();
+    }
+}
+
 PHP_METHOD(RedisCluster, gettransferredbytes) {
     redisCluster *c = GET_CONTEXT();
-    redisClusterNode *node, *slave;
     zend_long rx = 0, tx = 0;
+    redisClusterNode *node;
 
     ZEND_HASH_FOREACH_PTR(c->nodes, node) {
-        tx += node->sock->txBytes;
-        rx += node->sock->rxBytes;
-
-        if (node->slaves) {
-            ZEND_HASH_FOREACH_PTR(node->slaves, slave) {
-                tx += slave->sock->txBytes;
-                rx += slave->sock->rxBytes;
-            } ZEND_HASH_FOREACH_END();
-        }
+        redisSumNodeBytes(node, &tx, &rx);
     } ZEND_HASH_FOREACH_END();
 
     array_init_size(return_value, 2);
@@ -1742,18 +1762,10 @@ PHP_METHOD(RedisCluster, gettransferredbytes) {
 
 PHP_METHOD(RedisCluster, cleartransferredbytes) {
     redisCluster *c = GET_CONTEXT();
-    redisClusterNode *node, *slave;
+    redisClusterNode *node;
 
     ZEND_HASH_FOREACH_PTR(c->nodes, node) {
-        node->sock->txBytes = 0;
-        node->sock->rxBytes = 0;
-
-        if (node->slaves) {
-            ZEND_HASH_FOREACH_PTR(node->slaves, slave) {
-                slave->sock->txBytes = 0;
-                slave->sock->rxBytes = 0;
-            } ZEND_HASH_FOREACH_END();
-        }
+        redisClearNodeBytes(node);
     } ZEND_HASH_FOREACH_END();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3274,9 +3274,8 @@ PHP_REDIS_API int`
`3274`	`3274`	`redis_sock_write(RedisSock redis_sock, char cmd, size_t sz)`
`3275`	`3275`	`{`
`3276`	`3276`	`if (redis_check_eof(redis_sock, 0, 0) == 0 &&`
`3277`		`- php_stream_write(redis_sock->stream, cmd, sz) == sz)`
	`3277`	`+ redis_sock_write_raw(redis_sock, cmd, sz) == sz)`
`3278`	`3278`	`{`
`3279`		`- redis_sock->txBytes += sz;`
`3280`	`3279`	`return sz;`
`3281`	`3280`	`}`
`3282`	`3281`