Commitc4b2ea6

committed

FixVEMB reply handling inRedisCluster

1 parent0b4b4ed commitc4b2ea6Copy full SHA for c4b2ea6

File tree

+30

-2

lines changed

+30

-2

lines changed

Lines changed: 27 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2506,6 +2506,33 @@ cluster_xclaim_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster c, void ctx) {`
`2506`	`2506`
`2507`	`2507`	`}`
`2508`	`2508`
	`2509`	`+PHP_REDIS_APIvoid`
	`2510`	`+cluster_vemb_resp(INTERNAL_FUNCTION_PARAMETERS,redisClusterc,voidctx) {`
	`2511`	`+zvalz_ret;`
	`2512`	`+`
	`2513`	`+ZVAL_FALSE(&z_ret);`
	`2514`	`+`
	`2515`	`+if (c->reply_type!=TYPE_MULTIBULK\|\|c->reply_len<0)`
	`2516`	`+ gotofail;`
	`2517`	`+`
	`2518`	`+array_init(&z_ret);`
	`2519`	`+`
	`2520`	`+if (redis_read_vemb_response(c->cmd_sock,&z_ret,c->reply_len)!=SUCCESS)`
	`2521`	`+ gotofail;`
	`2522`	`+`
	`2523`	`+if (CLUSTER_IS_ATOMIC(c)) {`
	`2524`	`+RETURN_ZVAL(&z_ret,0,1);`
	`2525`	`+ }else {`
	`2526`	`+add_next_index_zval(&c->multi_resp,&z_ret);`
	`2527`	`+ }`
	`2528`	`+`
	`2529`	`+return;`
	`2530`	`+`
	`2531`	`+fail:`
	`2532`	`+zval_dtor(&z_ret);`
	`2533`	`+CLUSTER_RETURN_FALSE(c);`
	`2534`	`+}`
	`2535`	`+`
`2509`	`2536`	`PHP_REDIS_APIvoid`
`2510`	`2537`	`cluster_vinfo_resp(INTERNAL_FUNCTION_PARAMETERS,redisClusterc,voidctx) {`
`2511`	`2538`	`zvalz_ret;`
`@@ -2554,7 +2581,6 @@ cluster_vgetattr_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster c, void ctx)`
`2554`	`2581`	`}`
`2555`	`2582`	`}`
`2556`	`2583`
`2557`		`-`
`2558`	`2584`	`PHP_REDIS_APIvoid`
`2559`	`2585`	`cluster_vlinks_resp(INTERNAL_FUNCTION_PARAMETERS,redisClusterc,voidctx) {`
`2560`	`2586`	`zvalz_ret;`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -448,6 +448,8 @@ PHP_REDIS_API void cluster_sub_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *`
`448`	`448`	`void*ctx);`
`449`	`449`	`PHP_REDIS_APIvoidcluster_unsub_resp(INTERNAL_FUNCTION_PARAMETERS,redisCluster*c,`
`450`	`450`	`void*ctx);`
	`451`	`+PHP_REDIS_APIvoidcluster_vemb_resp(INTERNAL_FUNCTION_PARAMETERS,redisCluster*c,`
	`452`	`+void*ctx);`
`451`	`453`	`PHP_REDIS_APIvoidcluster_vinfo_resp(INTERNAL_FUNCTION_PARAMETERS,redisCluster*c,`
`452`	`454`	`void*ctx);`
`453`	`455`	`PHP_REDIS_APIvoidcluster_vlinks_resp(INTERNAL_FUNCTION_PARAMETERS,redisCluster*c,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3201,7 +3201,7 @@ PHP_METHOD(RedisCluster, vinfo) {`
`3201`	`3201`	`}`
`3202`	`3202`
`3203`	`3203`	`PHP_METHOD(RedisCluster,vemb) {`
`3204`		`-CLUSTER_PROCESS_CMD(vemb,cluster_variant_resp,1);`
	`3204`	`+CLUSTER_PROCESS_CMD(vemb,cluster_vemb_resp,1);`
`3205`	`3205`	`}`
`3206`	`3206`
`3207`	`3207`	`PHP_METHOD(RedisCluster,vrandmember) {`

Comments

(0)