完善测试用例，修复一些问题

imiphp · Nov 26, 2023 · 2623848 · 2623848
1 parent 7178665
commit 2623848
Show file tree

Hide file tree

Showing 23 changed files with 678 additions and 84 deletions.
diff --git a/src/Components/connection-center/src/Contract/AbstractConnectionDriver.php b/src/Components/connection-center/src/Contract/AbstractConnectionDriver.php
@@ -10,13 +10,6 @@ public function __construct(protected IConnectionLoadBalancer $connectionLoadBal
     {
     }
 
-    public function setConnectionLoadBalancer(IConnectionLoadBalancer $connectionLoadBalancer): self
-    {
-        $this->connectionLoadBalancer = $connectionLoadBalancer;
-
-        return $this;
-    }
-
     public function getConnectionLoadBalancer(): IConnectionLoadBalancer
     {
         return $this->connectionLoadBalancer;

diff --git a/src/Components/connection-center/src/Contract/IConnectionDriver.php b/src/Components/connection-center/src/Contract/IConnectionDriver.php
@@ -16,11 +16,6 @@ public static function createConnectionConfig(string|array $config): IConnection
 
     public function __construct(IConnectionLoadBalancer $connectionLoadBalancer);
 
-    /**
-     * 设置连接负载均衡器.
-     */
-    public function setConnectionLoadBalancer(IConnectionLoadBalancer $connectionLoadBalancer): self;
-
     /**
      * 获取连接负载均衡器.
      */

diff --git a/src/Components/connection-center/src/Contract/IConnectionLoadBalancer.php b/src/Components/connection-center/src/Contract/IConnectionLoadBalancer.php
@@ -9,6 +9,11 @@
  */
 interface IConnectionLoadBalancer
 {
+    /**
+     * @param IConnectionConfig[] $configs
+     */
+    public function __construct(array $configs);
+
     /**
      * @param IConnectionConfig[] $configs
      */

diff --git a/src/Components/connection-center/src/Contract/TConnectionManagerWritableStatistics.php b/src/Components/connection-center/src/Contract/TConnectionManagerWritableStatistics.php
@@ -39,6 +39,9 @@ public function changeTotalConnectionCount(int $quantity): int
         return $this->totalConnectionCount += $quantity;
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
     public function changeFreeConnectionCount(int $quantity): int
     {
         return $this->freeConnectionCount += $quantity;

diff --git a/src/Components/connection-center/src/Handler/AlwaysNew/AlwaysNewConnectionManager.php b/src/Components/connection-center/src/Handler/AlwaysNew/AlwaysNewConnectionManager.php
@@ -76,7 +76,7 @@ public function releaseConnection(IConnection $connection): void
     {
         if ($connection->getManager() !== $this)
         {
-            throw new \RuntimeException(sprintf('Connection manager %s cannot release connection, because the connection manager of this connection is %s', static::class, $connection->getManager()::class));
+            throw new \RuntimeException(sprintf('Connection manager %s cannot release connection, because the connection manager of this connection is %s', static::class, $connection->getManager()::class)); // @codeCoverageIgnore
         }
         if (ConnectionStatus::WaitRelease !== $connection->getStatus())
         {
@@ -89,6 +89,9 @@ public function releaseConnection(IConnection $connection): void
         }
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
     public function detachConnection(IConnection $connection): void
     {
         // 本管理器创建的连接本来就是分离的，无需处理

diff --git a/src/Components/connection-center/src/Handler/Pool/InstanceResource.php b/src/Components/connection-center/src/Handler/Pool/InstanceResource.php
@@ -46,7 +46,7 @@ public function __destruct()
         $id = (string) spl_object_id($this);
         if (ChannelContainer::hasChannel($id))
         {
-            ChannelContainer::removeChannel($id);
+            ChannelContainer::removeChannel($id); // @codeCoverageIgnore
         }
     }
 
@@ -65,11 +65,6 @@ public function getConnection(): ?\WeakReference
         return $this->connection;
     }
 
-    public function hasConnection(): bool
-    {
-        return $this->connection && $this->connection->get();
-    }
-
     public function lock(float $timeout = 0): bool
     {
         if ($this->isFree || ChannelContainer::pop((string) spl_object_id($this), $timeout))
@@ -80,7 +75,7 @@ public function lock(float $timeout = 0): bool
             return true;
         }
 
-        return false;
+        return false; // @codeCoverageIgnore
     }
 
     public function release(): void
@@ -90,11 +85,13 @@ public function release(): void
         $id = (string) spl_object_id($this);
         if (ChannelContainer::hasChannel($id))
         {
+            // @codeCoverageIgnoreStart
             $channel = ChannelContainer::getChannel($id);
             if (($channel->stats()['consumer_num'] ?? 0) > 0)
             {
                 $channel->push(true);
             }
+            // @codeCoverageIgnoreEnd
         }
     }
 

diff --git a/src/Components/connection-center/src/Handler/Pool/PoolConnectionManager.php b/src/Components/connection-center/src/Handler/Pool/PoolConnectionManager.php
@@ -136,6 +136,7 @@ public function getConnection(): IConnection
         }
         /** @var InstanceResource|false $resource */
         $resource = $this->queue->pop($waitTimeout);
+        // @codeCoverageIgnoreStart
         if (!$resource)
         {
             if (\SWOOLE_CHANNEL_TIMEOUT === $this->queue->errCode)
@@ -151,6 +152,7 @@ public function getConnection(): IConnection
         {
             throw new \RuntimeException('Pool lock resource failed');
         }
+        // @codeCoverageIgnoreEnd
         $driver = $this->getDriver();
         if ($config->isCheckStateWhenGetResource() && !$driver->checkAvailable($instance = $resource->getInstance()))
         {
@@ -161,11 +163,13 @@ public function getConnection(): IConnection
                 $resource->setInstance($instance);
                 $this->instanceMap[$instance] = $resource;
             }
+            // @codeCoverageIgnoreStart
             catch (\Throwable $th)
             {
                 $this->removeResource($resource);
                 throw $th;
             }
+            // @codeCoverageIgnoreEnd
         }
 
         $connection = new Connection($this, $resource->getInstance());
@@ -184,7 +188,7 @@ public function releaseConnection(IConnection $connection): void
     {
         if ($connection->getManager() !== $this)
         {
-            throw new \RuntimeException(sprintf('Connection manager %s cannot release connection, because the connection manager of this connection is %s', static::class, $connection->getManager()::class));
+            throw new \RuntimeException(sprintf('Connection manager %s cannot release connection, because the connection manager of this connection is %s', static::class, $connection->getManager()::class)); // @codeCoverageIgnore
         }
         if (ConnectionStatus::WaitRelease !== $connection->getStatus())
         {
@@ -217,16 +221,16 @@ public function detachConnection(IConnection $connection): void
     {
         if (!$this->available)
         {
-            throw new \RuntimeException('Connection manager is unavailable');
+            throw new \RuntimeException('Connection manager is unavailable'); // @codeCoverageIgnore
         }
         if ($connection->getManager() !== $this)
         {
-            throw new \RuntimeException(sprintf('Connection manager %s cannot release connection, because the connection manager of this connection is %s', static::class, $connection->getManager()::class));
+            throw new \RuntimeException(sprintf('Connection manager %s cannot release connection, because the connection manager of this connection is %s', static::class, $connection->getManager()::class)); // @codeCoverageIgnore
         }
         $instance = $connection->getInstance();
         if (!isset($this->instanceMap[$instance]))
         {
-            throw new \RuntimeException('Connection is not in this connection manager');
+            throw new \RuntimeException('Connection is not in this connection manager'); // @codeCoverageIgnore
         }
         $resource = $this->instanceMap[$instance];
         $this->resources->detach($resource);
@@ -301,7 +305,10 @@ protected function addResource(): InstanceResource
         }
     }
 
-    public function removeResource(InstanceResource $resource, bool $buildQueue = false): void
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function removeResource(InstanceResource $resource, bool $buildQueue = false): void
     {
         $this->resources->detach($resource);
         if ($buildQueue)
@@ -331,7 +338,7 @@ protected function buildQueue(): void
     /**
      * {@inheritDoc}
      */
-    public function gc(): void
+    protected function gc(): void
     {
         $hasGC = false;
         $poolConfig = $this->config->getPool();
@@ -368,7 +375,7 @@ public function gc(): void
     /**
      * 开始自动垃圾回收.
      */
-    public function startAutoGC(): void
+    protected function startAutoGC(): void
     {
         $gcInterval = $this->config->getPool()->getGCInterval();
         if ($gcInterval > 0)
@@ -381,7 +388,7 @@ public function startAutoGC(): void
     /**
      * 停止自动垃圾回收.
      */
-    public function stopAutoGC(): void
+    protected function stopAutoGC(): void
     {
         if (null !== $this->gcTimerId)
         {
@@ -396,7 +403,7 @@ public function stopAutoGC(): void
     /**
      * 心跳.
      */
-    public function heartbeat(): void
+    protected function heartbeat(): void
     {
         if ($this->heartbeatRunning)
         {
@@ -413,7 +420,7 @@ public function heartbeat(): void
                     $driver ??= $this->getDriver();
                     try
                     {
-                        $available = $driver->checkAvailable($resource->getInstance());
+                        $available = $driver->ping($resource->getInstance());
                     }
                     catch (\Throwable $th)
                     {
@@ -449,7 +456,7 @@ public function heartbeat(): void
     /**
      * 开始心跳维持资源.
      */
-    public function startHeartbeat(): void
+    protected function startHeartbeat(): void
     {
         if (null !== ($heartbeatInterval = $this->config->getPool()->getHeartbeatInterval()))
         {
@@ -461,7 +468,7 @@ public function startHeartbeat(): void
     /**
      * 停止心跳维持资源.
      */
-    public function stopHeartbeat(): void
+    protected function stopHeartbeat(): void
     {
         if (null !== $this->heartbeatTimerId)
         {
@@ -474,12 +481,12 @@ public function stopHeartbeat(): void
         }
     }
 
-    public function getFree(): int
+    protected function getFree(): int
     {
         return $this->queue->length();
     }
 
-    public function getCount(): int
+    protected function getCount(): int
     {
         return \count($this->resources) + $this->addingResources;
     }

diff --git a/src/Components/connection-center/src/Handler/Pool/PoolConnectionManagerConfig.php b/src/Components/connection-center/src/Handler/Pool/PoolConnectionManagerConfig.php
@@ -46,18 +46,10 @@ public function __construct(?string $driver = null, ?bool $enableStatistics = nu
                 {
                     $poolConfig['maxIdleTime'] = $config['pool']['maxIdleTime'];
                 }
-                if (isset($config['pool']['requestResourceCheckInterval']))
-                {
-                    $poolConfig['requestResourceCheckInterval'] = $config['pool']['requestResourceCheckInterval'];
-                }
                 if (isset($config['pool']['heartbeatInterval']))
                 {
                     $poolConfig['heartbeatInterval'] = $config['pool']['heartbeatInterval'];
                 }
-                if (isset($config['pool']['checkStateWhenGetResource']))
-                {
-                    $poolConfig['checkStateWhenGetResource'] = $config['pool']['checkStateWhenGetResource'];
-                }
             }
             $this->pool = new PoolConfig(...$poolConfig);
         }

diff --git a/...n-center/src/Handler/RequestContextSingleton/RequestContextSingletonConnectionManager.php b/...n-center/src/Handler/RequestContextSingleton/RequestContextSingletonConnectionManager.php
@@ -69,7 +69,7 @@ public function getConnection(): IConnection
     {
         if (!$this->available)
         {
-            throw new \RuntimeException('Connection manager is unavailable');
+            throw new \RuntimeException('Connection manager is unavailable'); // @codeCoverageIgnore
         }
 
         return RequestContext::use(function (ContextData $context) {
@@ -97,18 +97,22 @@ public function getConnection(): IConnection
                         $context[static::class][$this->id] = $instance = $driver->connect($instance);
                         $this->instanceMap[$instance] = $connectionData;
                     }
+                    // @codeCoverageIgnoreStart
                     catch (\Throwable $th)
                     {
                         unset($context[static::class][$this->id]);
                         throw $th;
                     }
+                    // @codeCoverageIgnoreEnd
                 }
                 $connectionData = $this->instanceMap[$instance];
                 $connection = $connectionData->getConnection()->get();
                 if (!$connection || ConnectionStatus::Available !== $connection->getStatus())
                 {
+                    // @codeCoverageIgnoreStart
                     $connection = new Connection($this, $instance);
                     $connectionData->setConnection($connection);
+                    // @codeCoverageIgnoreEnd
                 }
             }
             else
@@ -145,7 +149,7 @@ public function releaseConnection(IConnection $connection): void
     {
         if ($connection->getManager() !== $this)
         {
-            throw new \RuntimeException(sprintf('Connection manager %s cannot release connection, because the connection manager of this connection is %s', static::class, $connection->getManager()::class));
+            throw new \RuntimeException(sprintf('Connection manager %s cannot release connection, because the connection manager of this connection is %s', static::class, $connection->getManager()::class)); // @codeCoverageIgnore
         }
         if (ConnectionStatus::WaitRelease !== $connection->getStatus())
         {
@@ -183,16 +187,16 @@ public function detachConnection(IConnection $connection): void
     {
         if (!$this->available)
         {
-            throw new \RuntimeException('Connection manager is unavailable');
+            throw new \RuntimeException('Connection manager is unavailable'); // @codeCoverageIgnore
         }
         if ($connection->getManager() !== $this)
         {
-            throw new \RuntimeException(sprintf('Connection manager %s cannot release connection, because the connection manager of this connection is %s', static::class, $connection->getManager()::class));
+            throw new \RuntimeException(sprintf('Connection manager %s cannot release connection, because the connection manager of this connection is %s', static::class, $connection->getManager()::class)); // @codeCoverageIgnore
         }
         $instance = $connection->getInstance();
         if (!isset($this->instanceMap[$instance]))
         {
-            throw new \RuntimeException('Connection is not in this connection manager');
+            throw new \RuntimeException('Connection is not in this connection manager'); // @codeCoverageIgnore
         }
         $connectionData = $this->instanceMap[$instance];
         $context = RequestContext::getInstance()->get($connectionData->getContextFlag());
@@ -216,7 +220,7 @@ protected function __close(): void
             }
             else
             {
-                $this->getDriver()->close($instance);
+                $this->getDriver()->close($instance); // @codeCoverageIgnore
             }
         }
     }

diff --git a/src/Components/connection-center/src/Handler/Singleton/SingletonConnectionManager.php b/src/Components/connection-center/src/Handler/Singleton/SingletonConnectionManager.php
@@ -79,14 +79,19 @@ public function getConnection(): IConnection
                 try
                 {
                     $driver->close($instance);
-                    $instance = $driver->connect($instance);
-                    $this->connection = new Connection($this, $instance);
+                    $newInstance = $driver->connect($instance);
+                    if ($instance !== $newInstance)
+                    {
+                        $this->connection = new Connection($this, $newInstance);
+                    }
                 }
+                // @codeCoverageIgnoreStart
                 catch (\Throwable $th)
                 {
                     $this->connection = null;
                     throw $th;
                 }
+                // @codeCoverageIgnoreEnd
             }
         }
         if ($enableStatistics)
@@ -102,7 +107,7 @@ public function releaseConnection(IConnection $connection): void
     {
         if ($connection->getManager() !== $this)
         {
-            throw new \RuntimeException(sprintf('Connection manager %s cannot release connection, because the connection manager of this connection is %s', static::class, $connection->getManager()::class));
+            throw new \RuntimeException(sprintf('Connection manager %s cannot release connection, because the connection manager of this connection is %s', static::class, $connection->getManager()::class)); // @codeCoverageIgnore
         }
         if (ConnectionStatus::WaitRelease !== $connection->getStatus())
         {
@@ -130,15 +135,15 @@ public function detachConnection(IConnection $connection): void
     {
         if (!$this->available)
         {
-            throw new \RuntimeException('Connection manager is unavailable');
+            throw new \RuntimeException('Connection manager is unavailable'); // @codeCoverageIgnore
         }
         if ($connection->getManager() !== $this)
         {
-            throw new \RuntimeException(sprintf('Connection manager %s cannot release connection, because the connection manager of this connection is %s', static::class, $connection->getManager()::class));
+            throw new \RuntimeException(sprintf('Connection manager %s cannot release connection, because the connection manager of this connection is %s', static::class, $connection->getManager()::class)); // @codeCoverageIgnore
         }
         if ($this->connection !== $connection)
         {
-            throw new \RuntimeException('Connection is not in this connection manager');
+            throw new \RuntimeException('Connection is not in this connection manager'); // @codeCoverageIgnore
         }
         $this->connection = null;
     }