Skip to content

perf: Pre-size variadic command buffers from their arguments #2865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iliaal wants to merge 1 commit into
base: develop
Choose a base branch
from
+62 −0
Open

perf: Pre-size variadic command buffers from their arguments #2865

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions redis_commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1851,6 +1851,20 @@ int redis_eval_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, char *kw

/* Commands that take a key followed by a variable list of serializable
* values (RPUSH, LPUSH, SADD, SREM, etc...) */
/* Upper-bound RESP frame size of one argument: the framing bytes
* ($<len>\r\n...\r\n, generously 16) plus the payload length when the value is
* already a string. Non-strings format to short text (ints/doubles) and get a
* fixed allowance. Used to reserve a command buffer before a variadic builder's
* append loop so a high-arity (or large-payload) call doesn't regrow the
* smart_string a page at a time. The estimate need not be exact: it only reads
* types and lengths, never converts, so it cannot change the emitted bytes, and
* under-estimating just falls back to the normal growth path. */
static zend_always_inline size_t redis_zval_frame_est(zval *zv)
{
ZVAL_DEREF(zv);
return 16 + (Z_TYPE_P(zv) == IS_STRING ? Z_STRLEN_P(zv) : 24);
}

int redis_key_varval_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
char *kw, char **cmd, int *cmd_len, short *slot,
void **ctx)
Expand All @@ -1869,6 +1883,14 @@ int redis_key_varval_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
/* Initialize our command */
redis_cmd_init_sstr(&cmdstr, argc + 1, kw, strlen(kw));

/* Reserve the buffer up front so a high-arity call doesn't regrow it */
{
size_t est = ZSTR_LEN(key) + 16 +
(redis_sock->prefix ? ZSTR_LEN(redis_sock->prefix) : 0);
for (i = 0; i < argc; i++) est += redis_zval_frame_est(&args[i]);
smart_string_alloc(&cmdstr, est, 0);
}

/* Append key */
redis_cmd_append_sstr_key_zstr(&cmdstr, key, redis_sock, slot);

Expand Down Expand Up @@ -1904,6 +1926,17 @@ static int gen_key_arr_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
return FAILURE;

redis_cmd_init_sstr(&cmdstr, 1 + zend_hash_num_elements(values), kw, strlen(kw));

{
size_t est = ZSTR_LEN(key) + 16 +
(redis_sock->prefix ? ZSTR_LEN(redis_sock->prefix) : 0);
zval *zest;
ZEND_HASH_FOREACH_VAL(values, zest) {
est += redis_zval_frame_est(zest);
} ZEND_HASH_FOREACH_END();
smart_string_alloc(&cmdstr, est, 0);
}

redis_cmd_append_sstr_key_zstr(&cmdstr, key, redis_sock, slot);

ZEND_HASH_FOREACH_VAL(values, zv) {
Expand Down Expand Up @@ -1949,6 +1982,12 @@ gen_vararg_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,

redis_cmd_init_sstr(&cmdstr, argc, kw, strlen(kw));

{
size_t est = 0;
for (i = 0; i < argc; i++) est += redis_zval_frame_est(&argv[i]);
smart_string_alloc(&cmdstr, est, 0);
}

for (i = 0; i < argc; i++) {
redis_cmd_append_sstr_zval(&cmdstr, &argv[i], NULL);
}
Expand Down Expand Up @@ -2651,6 +2690,16 @@ int redis_mget_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,

REDIS_CMD_INIT_SSTR_STATIC(&cmdstr, zend_hash_num_elements(keys), "MGET");

{
size_t est = 0;
size_t prefix_len = redis_sock->prefix ? ZSTR_LEN(redis_sock->prefix) : 0;
zval *zest;
ZEND_HASH_FOREACH_VAL(keys, zest) {
est += redis_zval_frame_est(zest) + prefix_len;
} ZEND_HASH_FOREACH_END();
smart_string_alloc(&cmdstr, est, 0);
}

ZEND_HASH_FOREACH_VAL(keys, zkey) {
ZVAL_DEREF(zkey);
redis_cmd_append_sstr_key_zval(&cmdstr, zkey, redis_sock, slot);
Expand Down Expand Up @@ -3049,6 +3098,19 @@ int redis_hmset_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
return FAILURE;

REDIS_CMD_INIT_SSTR_STATIC(&cmdstr, 1 + (2 * fields), "HMSET");

{
size_t est = ZSTR_LEN(key) + 16 +
(redis_sock->prefix ? ZSTR_LEN(redis_sock->prefix) : 0);
zend_string *fkey;
zend_ulong fidx;
zval *zest;
ZEND_HASH_FOREACH_KEY_VAL(ht, fidx, fkey, zest) {
est += 16 + (fkey ? ZSTR_LEN(fkey) : 20) + redis_zval_frame_est(zest);
} ZEND_HASH_FOREACH_END();
smart_string_alloc(&cmdstr, est, 0);
}

redis_cmd_append_sstr_key_zstr(&cmdstr, key, redis_sock, slot);

ZEND_HASH_FOREACH_KEY_VAL(ht, idx, key, zv) {
Expand Down
Loading