NotificationsYou must be signed in to change notification settings
Fork9.7k
Star30.8k

Commit235dfe8

committed

Fix Predis client cluster with pipeline

1 parent035d526 commit235dfe8Copy full SHA for 235dfe8

File tree

1 file changed

-3

lines changed

src/Symfony/Component/Cache/Traits
- RedisTrait.php

1 file changed

-3

lines changed

`‎src/Symfony/Component/Cache/Traits/RedisTrait.php‎`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespaceSymfony\Component\Cache\Traits;`
`13`	`13`
`14`	`14`	`usePredis\Connection\Factory;`
	`15`	`+usePredis\Connection\Aggregate\ClusterInterface;`
`15`	`16`	`usePredis\Connection\Aggregate\PredisCluster;`
`16`	`17`	`usePredis\Connection\Aggregate\RedisCluster;`
`17`	`18`	`usePredis\Response\Status;`
`@@ -284,7 +285,7 @@ private function pipeline(\Closure $generator)`
`284`	`285`	`{`
`285`	`286`	`$ids =array();`
`286`	`287`
`287`		`-if ($this->redisinstanceof \Predis\Client) {`
	`288`	`+if ($this->redisinstanceof \Predis\Client && !$this->redis->getConnection()instanceof ClusterInterface) {`
`288`	`289`	`$results =$this->redis->pipeline(function ($redis)use ($generator, &$ids) {`
`289`	`290`	`foreach ($generator()as$command =>$args) {`
`290`	`291`	`call_user_func_array(array($redis,$command),$args);`
`@@ -308,9 +309,10 @@ private function pipeline(\Closure $generator)`
`308`	`309`	`foreach ($resultsas$k =>list($h,$c)) {`
`309`	`310`	`$results[$k] =$connections[$h][$c];`
`310`	`311`	`}`
`311`		`- }elseif ($this->redisinstanceof \RedisCluster) {`
`312`		`-// phpredis doesn't support pipelining with RedisCluster`
	`312`	`+ }elseif ($this->redisinstanceof \RedisCluster \|\| ($this->redisinstanceof \Predis\Client &&$this->redis->getConnection()instanceof ClusterInterface)) {`
	`313`	`+// phpredis& predisdoesn't support pipelining with RedisCluster`
`313`	`314`	`// see https://github.com/phpredis/phpredis/blob/develop/cluster.markdown#pipelining`
	`315`	`+// see https://github.com/nrk/predis/issues/267#issuecomment-123781423`
`314`	`316`	`$results =array();`
`315`	`317`	`foreach ($generator()as$command =>$args) {`
`316`	`318`	`$results[] =call_user_func_array(array($this->redis,$command),$args);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit235dfe8

File tree

1 file changed

1 file changed

`‎src/Symfony/Component/Cache/Traits/RedisTrait.php‎`

0 commit comments