Sitelet https://github.com/phpredis/phpredis/pull/2896/files
Skip to content

Use ffc.h for string to double parsing #2896

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
michael-grunder wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Use ffc.h for string to double parsing #2896

Show file tree
Hide file tree
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
17 changes: 13 additions & 4 deletions cluster_library.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1837,7 +1837,7 @@ PHP_REDIS_API void cluster_dbl_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *
}

// Convert to double, free response
dbl = atof(resp);
dbl = ffc_parse_double_simple(c->reply_len, resp, NULL);
efree(resp);

CLUSTER_RETURN_DOUBLE(c, dbl);
Expand Down Expand Up @@ -3052,13 +3052,15 @@ cluster_mbulk_assoc_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
static int mbulk_resp_loop_dbl(RedisSock *redis_sock, zval *z_result,
long long count, RedisCmdCtx ctx)
{
char *line;
int line_len;
char *line;
double d;

while (count--) {
line = redis_sock_read(redis_sock, &line_len);
if (line != NULL) {
add_next_index_double(z_result, atof(line));
d = ffc_parse_double_simple(line_len, line, NULL);
add_next_index_double(z_result, d);
efree(line);
} else if (EG(exception)) {
return FAILURE;
Expand Down Expand Up @@ -3181,9 +3183,16 @@ static int mbulk_resp_loop_zipdbl(RedisSock *redis_sock, zval *z_result,
key_len = line_len;
} else {
zval zv, *z = &zv;
double d;

redis_unpack(redis_sock,key,key_len, z);
zend_string *tmp, *zstr = zval_get_tmp_string(z, &tmp);
add_assoc_double_ex(z_result, ZSTR_VAL(zstr), ZSTR_LEN(zstr), atof(line));

d = ffc_parse_double_simple(line_len, line, NULL);

add_assoc_double_ex(z_result, ZSTR_VAL(zstr),
ZSTR_LEN(zstr), d);

zend_tmp_string_release(tmp);
zval_ptr_dtor_nogc(z);

Expand Down
Loading
Loading