From ef53911bf8cae447c323f94c54b6aa6ab6d4000c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=93=AD=E6=98=95?= <715557344@qq.com>
Date: Thu, 30 Aug 2018 12:26:44 +0800
Subject: [PATCH] =?UTF-8?q?DbConnection::check=E6=97=B6=EF=BC=8C=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E9=97=B2=E7=BD=AE=E6=97=B6=E9=97=B4=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E8=B6=85=E8=BF=87=E6=9C=80=E5=A4=A7=E5=80=BC=20(https://github?=
 =?UTF-8?q?.com/swoft-cloud/swoft-component/pull/189)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 验证空闲时间是否超过最大值

* 验证空闲时间是否超过最大值

* 验证空闲时间是否超过最大值

* 完善对应单测

* 抽离验证空闲时间是否超过最大值的逻辑

* 代码格式化

* 抽离验证空闲时间是否超过最大值的逻辑

* Update AbstractDbConnection.php
---
 src/AbstractDbConnection.php              | 10 +++++++
 src/Driver/Mysql/MysqlConnection.php      |  3 ++
 src/Driver/Mysql/SyncMysqlConnection.php  |  4 +++
 test/Cases/PoolTest.php                   | 34 +++++++++++++++++++++++
 test/Testing/Pool/MaxIdleTimeDbConfig.php | 33 ++++++++++++++++++++++
 test/Testing/Pool/MaxIdleTimeDbPool.php   | 28 +++++++++++++++++++
 6 files changed, 112 insertions(+)
 create mode 100644 test/Testing/Pool/MaxIdleTimeDbConfig.php
 create mode 100644 test/Testing/Pool/MaxIdleTimeDbPool.php

diff --git a/src/AbstractDbConnection.php b/src/AbstractDbConnection.php
index 06bb856..ebab4de 100644
--- a/src/AbstractDbConnection.php
+++ b/src/AbstractDbConnection.php
@@ -97,4 +97,14 @@ protected function pushSqlToStack(string $sql)
 
         RequestContext::setContextDataByKey($contextSqlKey, $stack);
     }
+
+    /**
+     * Verify whether the idle time exceeds the maximum value.
+     */
+    protected function isIdleTimeOut(): bool
+    {
+        $idleTime = time() - $this->getLastTime();
+        $maxIdleTime = $this->getPool()->getPoolConfig()->getMaxIdleTime();
+        return $idleTime > $maxIdleTime;
+    }
 }
diff --git a/src/Driver/Mysql/MysqlConnection.php b/src/Driver/Mysql/MysqlConnection.php
index b035ad0..754faea 100644
--- a/src/Driver/Mysql/MysqlConnection.php
+++ b/src/Driver/Mysql/MysqlConnection.php
@@ -205,6 +205,9 @@ public function reconnect()
      */
     public function check(): bool
     {
+        if ($this->isIdleTimeOut()) {
+            return false;
+        }
         return $this->connection->connected;
     }
 
diff --git a/src/Driver/Mysql/SyncMysqlConnection.php b/src/Driver/Mysql/SyncMysqlConnection.php
index d2273d2..034bfd3 100644
--- a/src/Driver/Mysql/SyncMysqlConnection.php
+++ b/src/Driver/Mysql/SyncMysqlConnection.php
@@ -124,6 +124,10 @@ public function reconnect()
      */
     public function check(): bool
     {
+        if ($this->isIdleTimeOut()) {
+            return false;
+        }
+        
         try {
             $this->connection->getAttribute(\PDO::ATTR_SERVER_INFO);
         } catch (\Throwable $e) {
diff --git a/test/Cases/PoolTest.php b/test/Cases/PoolTest.php
index e4be5b2..de7eb22 100644
--- a/test/Cases/PoolTest.php
+++ b/test/Cases/PoolTest.php
@@ -14,6 +14,7 @@
 use SwoftTest\Db\Testing\Pool\DbPptPoolConfig;
 use SwoftTest\Db\Testing\Pool\DbSlaveEnvPoolConfig;
 use SwoftTest\Db\Testing\Pool\DbSlavePptConfig;
+use SwoftTest\Db\Testing\Pool\OtherDbPool;
 
 /**
  * PoolTest
@@ -89,4 +90,37 @@ public function testDbSlaveEnv()
         $this->assertEquals($pConfig->isUseProvider(), false);
         $this->assertEquals($pConfig->getMaxWait(), 10);
     }
+
+    public function testMaxIdleTime()
+    {
+        $pool = App::getPool('idle.master');
+        $connection = $pool->getConnection();
+        $this->assertTrue($connection->check());
+        $connection->release(true);
+        $connection2 = $pool->getConnection();
+        $this->assertTrue($connection2->check());
+        $connection2->release(true);
+    }
+
+    public function testMaxIdleTimeByCo()
+    {
+        go(function () {
+            $this->testMaxIdleTime();
+
+            $pool = App::getPool('idle.master');
+            $connection = $pool->getConnection();
+            $this->assertTrue($connection->check());
+            $connection->release(true);
+
+            \co::sleep(2);
+
+            $connection2 = $pool->getConnection();
+            $this->assertFalse($connection2->check());
+            $connection2->release(true);
+
+            $connection3 = $pool->getConnection();
+            $this->assertTrue($connection3->check());
+            $connection2->release(true);
+        });
+    }
 }
diff --git a/test/Testing/Pool/MaxIdleTimeDbConfig.php b/test/Testing/Pool/MaxIdleTimeDbConfig.php
new file mode 100644
index 0000000..33bd9f2
--- /dev/null
+++ b/test/Testing/Pool/MaxIdleTimeDbConfig.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * This file is part of Swoft.
+ *
+ * @link     https://swoft.org
+ * @document https://doc.swoft.org
+ * @contact  group@swoft.org
+ * @license  https://github.com/swoft-cloud/swoft/blob/master/LICENSE
+ */
+namespace SwoftTest\Db\Testing\Pool;
+
+use Swoft\Bean\Annotation\Bean;
+use Swoft\Bean\Annotation\Value;
+use Swoft\Db\Driver\Driver;
+use Swoft\Db\Pool\Config\DbPoolProperties;
+
+/**
+ * OtherDbConfig
+ *
+ * @Bean()
+ */
+class MaxIdleTimeDbConfig extends OtherDbConfig
+{
+    /**
+     * @var string
+     */
+    protected $name = 'idle.master';
+
+    /**
+     * @var int
+     */
+    protected $maxIdleTime = 1;
+}
diff --git a/test/Testing/Pool/MaxIdleTimeDbPool.php b/test/Testing/Pool/MaxIdleTimeDbPool.php
new file mode 100644
index 0000000..34920f5
--- /dev/null
+++ b/test/Testing/Pool/MaxIdleTimeDbPool.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * This file is part of Swoft.
+ *
+ * @link     https://swoft.org
+ * @document https://doc.swoft.org
+ * @contact  group@swoft.org
+ * @license  https://github.com/swoft-cloud/swoft/blob/master/LICENSE
+ */
+namespace SwoftTest\Db\Testing\Pool;
+
+use Swoft\Bean\Annotation\Inject;
+use Swoft\Bean\Annotation\Pool;
+use Swoft\Db\Pool\DbPool;
+
+/**
+ * OtherDbPool
+ *
+ * @Pool("idle.master")
+ */
+class MaxIdleTimeDbPool extends DbPool
+{
+    /**
+     * @Inject()
+     * @var MaxIdleTimeDbConfig
+     */
+    protected $poolConfig;
+}