Update RedisCluster.php

lynnclub · lynnclub · commit e470c22bf146 · 2025-01-16T21:10:32.000+08:00
diff --git a/src/Connection/Cluster/RedisCluster.php b/src/Connection/Cluster/RedisCluster.php
@@ -330,17 +330,23 @@ protected function guessNode($slot)
      * Creates a new connection instance from the given connection ID.
      *
      * @param string $connectionID Identifier for the connection.
+     * @param CommandInterface|null $command Optional command instance.
      *
      * @return NodeConnectionInterface
      */
-    protected function createConnection($connectionID)
+    protected function createConnection($connectionID, CommandInterface $command = null)
     {
         $separator = strrpos($connectionID, ':');
 
-        return $this->connections->create([
+        $config = [
             'host' => substr($connectionID, 0, $separator),
             'port' => substr($connectionID, $separator + 1),
-        ]);
+        ];
+        if ($command) {
+            $config['scheme'] = $this->getConnectionByCommand($command)->getParameters()->scheme;
+        }
+
+        return $this->connections->create($config);
     }
 
     /**
@@ -473,7 +479,7 @@ protected function onMovedResponse(CommandInterface $command, $details)
         }
 
         if (!$connection = $this->getConnectionById($connectionID)) {
-            $connection = $this->createConnection($connectionID);
+            $connection = $this->createConnection($connectionID, $command);
         }
 
         if ($this->useClusterSlots) {
@@ -499,7 +505,7 @@ protected function onAskResponse(CommandInterface $command, $details)
         [$slot, $connectionID] = explode(' ', $details, 2);
 
         if (!$connection = $this->getConnectionById($connectionID)) {
-            $connection = $this->createConnection($connectionID);
+            $connection = $this->createConnection($connectionID, $command);
         }
 
         $connection->executeCommand(RawCommand::create('ASKING'));

Original file line number	Diff line number	Diff line change
`@@ -330,17 +330,23 @@ protected function guessNode($slot)`
`330`	`330`	`* Creates a new connection instance from the given connection ID.`
`331`	`331`	`*`
`332`	`332`	`* @param string $connectionID Identifier for the connection.`
	`333`	`+ * @param CommandInterface\|null $command Optional command instance.`
`333`	`334`	`*`
`334`	`335`	`* @return NodeConnectionInterface`
`335`	`336`	`*/`
`336`		`- protected function createConnection($connectionID)`
	`337`	`+ protected function createConnection($connectionID, CommandInterface $command = null)`
`337`	`338`	`{`
`338`	`339`	`$separator = strrpos($connectionID, ':');`
`339`	`340`
`340`		`- return $this->connections->create([`
	`341`	`+ $config = [`
`341`	`342`	`'host' => substr($connectionID, 0, $separator),`
`342`	`343`	`'port' => substr($connectionID, $separator + 1),`
`343`		`- ]);`
	`344`	`+ ];`
	`345`	`+ if ($command) {`
	`346`	`+ $config['scheme'] = $this->getConnectionByCommand($command)->getParameters()->scheme;`
	`347`	`+ }`
	`348`	`+`
	`349`	`+ return $this->connections->create($config);`
`344`	`350`	`}`
`345`	`351`
`346`	`352`	`/**`
`@@ -473,7 +479,7 @@ protected function onMovedResponse(CommandInterface $command, $details)`
`473`	`479`	`}`
`474`	`480`
`475`	`481`	`if (!$connection = $this->getConnectionById($connectionID)) {`
`476`		`- $connection = $this->createConnection($connectionID);`
	`482`	`+ $connection = $this->createConnection($connectionID, $command);`
`477`	`483`	`}`
`478`	`484`
`479`	`485`	`if ($this->useClusterSlots) {`
`@@ -499,7 +505,7 @@ protected function onAskResponse(CommandInterface $command, $details)`
`499`	`505`	`[$slot, $connectionID] = explode(' ', $details, 2);`
`500`	`506`
`501`	`507`	`if (!$connection = $this->getConnectionById($connectionID)) {`
`502`		`- $connection = $this->createConnection($connectionID);`
	`508`	`+ $connection = $this->createConnection($connectionID, $command);`
`503`	`509`	`}`
`504`	`510`
`505`	`511`	`$connection->executeCommand(RawCommand::create('ASKING'));`