Commit571ffbc

authored and

committed

Switch pipeline_cmd from smart_str to smart_string

As we don't need to extract zend_string from pipeline_cmd, we can use simple smart_string structure

1 parent7895636 commit571ffbcCopy full SHA for 571ffbc

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ typedef enum {`
`177`	`177`	`#defineIS_PIPELINE(redis_sock) (redis_sock->mode & PIPELINE)`
`178`	`178`
`179`	`179`	`#definePIPELINE_ENQUEUE_COMMAND(cmd,cmd_len) do { \`
`180`		`-smart_str_appendl(&redis_sock->pipeline_cmd, cmd, cmd_len); \`
	`180`	`+smart_string_appendl(&redis_sock->pipeline_cmd, cmd, cmd_len); \`
`181`	`181`	`} while (0)`
`182`	`182`
`183`	`183`	`#defineREDIS_SAVE_CALLBACK(callback,closure_context) do { \`
`@@ -318,7 +318,7 @@ typedef struct {`
`318`	`318`	`structfold_item*head;`
`319`	`319`	`structfold_item*current;`
`320`	`320`
`321`		`-smart_strpipeline_cmd;`
	`321`	`+smart_stringpipeline_cmd;`
`322`	`322`
`323`	`323`	`zend_string*err;`
`324`	`324`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3564,7 +3564,7 @@ PHP_REDIS_API void redis_free_socket(RedisSock *redis_sock)`
`3564`	`3564`	`if (redis_sock->prefix) {`
`3565`	`3565`	`zend_string_release(redis_sock->prefix);`
`3566`	`3566`	`}`
`3567`		`-smart_str_free(&redis_sock->pipeline_cmd);`
	`3567`	`+smart_string_free(&redis_sock->pipeline_cmd);`
`3568`	`3568`	`if (redis_sock->err) {`
`3569`	`3569`	`zend_string_release(redis_sock->err);`
`3570`	`3570`	`}`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1948,7 +1948,7 @@ PHP_METHOD(Redis, discard)`
`1948`	`1948`
`1949`	`1949`	`if (IS_PIPELINE(redis_sock)) {`
`1950`	`1950`	`ret=SUCCESS;`
`1951`		`-smart_str_free(&redis_sock->pipeline_cmd);`
	`1951`	`+smart_string_free(&redis_sock->pipeline_cmd);`
`1952`	`1952`	`}elseif (IS_MULTI(redis_sock)) {`
`1953`	`1953`	`ret=redis_send_discard(redis_sock);`
`1954`	`1954`	`}`
`@@ -2025,12 +2025,12 @@ PHP_METHOD(Redis, exec)`
`2025`	`2025`	`}`
`2026`	`2026`
`2027`	`2027`	`if (IS_PIPELINE(redis_sock)) {`
`2028`		`-if (smart_str_get_len(&redis_sock->pipeline_cmd)==0) {`
	`2028`	`+if (redis_sock->pipeline_cmd.len==0) {`
`2029`	`2029`	`/* Empty array when no command was run. */`
`2030`	`2030`	`ZVAL_EMPTY_ARRAY(&z_ret);`
`2031`	`2031`	`}else {`
`2032`		`-if (redis_sock_write(redis_sock,ZSTR_VAL(redis_sock->pipeline_cmd.s),`
`2033`		`-ZSTR_LEN(redis_sock->pipeline_cmd.s))<0) {`
	`2032`	`+if (redis_sock_write(redis_sock,redis_sock->pipeline_cmd.c,`
	`2033`	`+redis_sock->pipeline_cmd.len)<0) {`
`2034`	`2034`	`ZVAL_FALSE(&z_ret);`
`2035`	`2035`	`}else {`
`2036`	`2036`	`array_init(&z_ret);`
`@@ -2040,7 +2040,7 @@ PHP_METHOD(Redis, exec)`
`2040`	`2040`	`ZVAL_FALSE(&z_ret);`
`2041`	`2041`	`}`
`2042`	`2042`	`}`
`2043`		`-smart_str_free(&redis_sock->pipeline_cmd);`
	`2043`	`+smart_string_free(&redis_sock->pipeline_cmd);`
`2044`	`2044`	`}`
`2045`	`2045`	`free_reply_callbacks(redis_sock);`
`2046`	`2046`	`REDIS_DISABLE_MODE(redis_sock,PIPELINE);`

Comments

(0)