#170: make the behavior of the ConnectionPool::get() methods consiste…

…nt without throwing out an exception When failed to get a connection from the pool, method get() should always return false instead of throwing out any exception. For method get(), returning a value of false means that the pool is at full capacity, yet all connections are currently in use.
swoole · Mar 1, 2024 · 587127c · 587127c
1 parent 041533d
commit 587127c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 32 deletions.
diff --git a/src/__init__.php b/src/__init__.php
@@ -24,7 +24,6 @@
         'core/StringObject.php',
         'core/MultibyteStringObject.php',
         'core/Exception/ArrayKeyNotExists.php',
-        'core/Exception/TimeoutException.php',
         'core/ArrayObject.php',
         'core/ObjectProxy.php',
         'core/Coroutine/WaitGroup.php',

diff --git a/src/core/Database/PDOPool.php b/src/core/Database/PDOPool.php
@@ -13,7 +13,6 @@
 
 use PDO;
 use Swoole\ConnectionPool;
-use Swoole\Exception\TimeoutException;
 
 /**
  * @method void put(PDO|PDOProxy $connection)
@@ -44,7 +43,7 @@ public function get(float $timeout = -1)
         /* @var \Swoole\Database\PDOProxy|false $pdo */
         $pdo = parent::get($timeout);
         if ($pdo === false) {
-            throw new TimeoutException('Failed to get a PDO connection: The pool is at full capacity, yet all connections are currently in use.');
+            return false;
         }
 
         $pdo->reset();

diff --git a/src/core/Exception/TimeoutException.php b/src/core/Exception/TimeoutException.php
diff --git a/tests/unit/Database/PDOPoolTest.php b/tests/unit/Database/PDOPoolTest.php
@@ -14,7 +14,6 @@
 use PHPUnit\Framework\TestCase;
 use Swoole\Coroutine;
 use Swoole\Coroutine\WaitGroup;
-use Swoole\Exception\TimeoutException;
 use Swoole\Tests\HookFlagsTrait;
 
 use function Swoole\Coroutine\go;
@@ -222,8 +221,7 @@ public function testTimeoutException(): void
     {
         self::saveHookFlags();
         self::setHookFlags(SWOOLE_HOOK_ALL);
-        $failed = false;
-        run(function () use (&$failed) {
+        run(function () {
             $config = (new PDOConfig())
                 ->withHost(MYSQL_SERVER_HOST)
                 ->withPort(MYSQL_SERVER_PORT)
@@ -241,22 +239,15 @@ public function testTimeoutException(): void
                 $waitGroup->done();
             });
 
-            go(function () use ($pool, $waitGroup, &$failed) {
+            go(function () use ($pool, $waitGroup) {
                 Coroutine::sleep(0.1); // Sleep for 0.1 second to ensure the 1st connection is in use by the 1st coroutine.
-                try {
-                    $pool->get(0.5); // Try to get a 2nd connection from the pool within 0.5 seconds.
-                } catch (TimeoutException) {
-                    $failed = true;
-                } finally {
-                    $waitGroup->done();
-                }
+                self::assertFalse($pool->get(0.5), 'Failed to get a 2nd connection from the pool within 0.5 seconds');
+                $waitGroup->done();
             });
 
             $waitGroup->wait();
             $pool->close();
             self::restoreHookFlags();
-
-            self::assertTrue($failed, 'Failed to get a 2nd connection from the pool within 0.5 seconds');
         });
     }
 }