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

Rework REDIS_SAVE_CALLBACK to be a function.

Browse Source
This commit is contained in:
michael-grunder
2025-08-19 08:47:01 -07:00
committed by Michael Grunder
parent 58e1a04f76
commit 9802fc0e46
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common.h
View File

@@ -187,22 +187,6 @@ typedef enum {
#define IS_MULTI(redis_sock) (redis_sock->mode & MULTI)
#define IS_PIPELINE(redis_sock) (redis_sock->mode & PIPELINE)
#define REDIS_SAVE_CALLBACK(callback, closure_context) do { \
fold_item *fi = redis_add_reply_callback(redis_sock); \
fi->fun = callback; \
fi->flags = redis_sock->flags; \
fi->ctx = closure_context; \
} while (0)
#define REDIS_PROCESS_RESPONSE_CLOSURE(function, closure_context) \
if (!IS_PIPELINE(redis_sock)) { \
if (redis_response_enqueued(redis_sock) != SUCCESS) { \
RETURN_FALSE; \
} \
} \
REDIS_SAVE_CALLBACK(function, closure_context); \
RETURN_ZVAL(getThis(), 1, 0); \
/* Case sensitive compare against compile-time static string */
#define REDIS_STRCMP_STATIC(s, len, sstr) \
(len == sizeof(sstr) - 1 && !strncmp(s, sstr, len))

25
redis.c
View File

@@ -634,6 +634,27 @@ pipeline_enqueue_command(RedisSock *redis_sock, const char *cmd, int cmd_len) {
smart_string_appendl(&redis_sock->pipeline_cmd, cmd, cmd_len);
}
static void
redis_save_callback(RedisSock *redis_sock, FailableResultCallback cb, void *ctx)
{
fold_item *fi;
fi = redis_add_reply_callback(redis_sock);
fi->fun = cb;
fi->flags = redis_sock->flags;
fi->ctx = ctx;
}
#define REDIS_PROCESS_RESPONSE_CLOSURE(function, closure_context) \
if (!IS_PIPELINE(redis_sock)) { \
if (redis_response_enqueued(redis_sock) != SUCCESS) { \
RETURN_FALSE; \
} \
} \
redis_save_callback(redis_sock, function, closure_context); \
RETURN_ZVAL(getThis(), 1, 0); \
static int redis_process_request(RedisSock *redis_sock, char *cmd, int cmdlen) {
int res = SUCCESS;
@@ -2080,7 +2101,7 @@ PHP_METHOD(Redis, multi)
if (!IS_MULTI(redis_sock)) {
if (IS_PIPELINE(redis_sock)) {
pipeline_enqueue_command(redis_sock, ZEND_STRL(RESP_MULTI_CMD));
REDIS_SAVE_CALLBACK(NULL, NULL);
redis_save_callback(redis_sock, NULL, NULL);
redis_sock->mode |= MULTI;
} else {
if (redis_sock_write(redis_sock, ZEND_STRL(RESP_MULTI_CMD)) < 0) {
@@ -2180,7 +2201,7 @@ PHP_METHOD(Redis, exec)
if (IS_MULTI(redis_sock)) {
if (IS_PIPELINE(redis_sock)) {
pipeline_enqueue_command(redis_sock, ZEND_STRL(RESP_EXEC_CMD));
REDIS_SAVE_CALLBACK(NULL, NULL);
redis_save_callback(redis_sock, NULL, NULL);
redis_sock->mode &= ~MULTI;
RETURN_ZVAL(getThis(), 1, 0);
}