From 677bb7ad42ac3049ade3ff39422ed234b2ebb7d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Mon, 13 Feb 2023 16:47:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Command.php | 87 +++++++++++++++++++++--------------------------------
 1 file changed, 34 insertions(+), 53 deletions(-)

diff --git a/Command.php b/Command.php
index 94de022..9898650 100644
--- a/Command.php
+++ b/Command.php
@@ -118,22 +118,12 @@ class Command extends Component
 
 		$result = $type !== static::EXECUTE ? $this->search($type) : $this->_execute();
 
-		$this->logger->debug('Mysql:' . $this->print_r($time));
+		$this->longExecuteTime($time);
 
 		return $result;
 	}
 
 
-	/**
-	 * @param $time
-	 * @return string
-	 */
-	private function print_r($time): string
-	{
-		return print_r(['time' => microtime(true) - $time, 'sql' => $this->sql, 'param' => $this->params], true);
-	}
-
-
 	/**
 	 * @return bool|int
 	 * @throws Exception
@@ -159,7 +149,6 @@ class Command extends Component
 			if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
 				$this->db->restore(true);
 
-				unset($pdo);
 				return $this->_execute();
 			}
 
@@ -169,34 +158,6 @@ class Command extends Component
 		}
 	}
 
-
-	/**
-	 * @param \PDO $pdo
-	 * @return PDOStatement
-	 * @throws Exception
-	 */
-	private function queryPrev(\PDO $pdo): PDOStatement
-	{
-		try {
-			if (($statement = $pdo->query($this->sql)) === false) {
-				throw new Exception($pdo->errorInfo()[1]);
-			}
-			foreach ($this->params as $key => $param) {
-				$statement->bindValue($key, $param);
-			}
-			return $statement;
-		} catch (\PDOException|\Throwable $throwable) {
-			if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
-				$this->db->restore(false);
-
-				unset($pdo);
-				return $this->queryPrev($this->db->getSlaveClient());
-			}
-			throw new Exception($throwable->getMessage());
-		}
-	}
-
-
 	/**
 	 * @param string $type
 	 * @return array|int|bool|null
@@ -206,22 +167,42 @@ class Command extends Component
 	{
 		$pdo = $this->db->getSlaveClient();
 		try {
-			if ($type == self::FETCH_ALL) {
-				$data = $this->queryPrev($pdo)->fetchAll(\PDO::FETCH_ASSOC);
-			} else if ($type == self::FETCH) {
-				$data = $this->queryPrev($pdo)->fetch(\PDO::FETCH_ASSOC);
-			} else if ($type == self::FETCH_COLUMN) {
-				$data = $this->queryPrev($pdo)->fetchColumn(\PDO::FETCH_ASSOC);
-			} else if ($type == self::ROW_COUNT) {
-				$data = $this->queryPrev($pdo)->rowCount();
-			} else {
-				$data = null;
+			if (($statement = $pdo->query($this->sql)) === false) {
+				throw new Exception($pdo->errorInfo()[1]);
+			}
+			foreach ($this->params as $key => $param) {
+				$statement->bindValue($key, $param);
+			}
+			$data = null;
+			if ($type == self::FETCH_ALL) {
+				$data = $statement->fetchAll(\PDO::FETCH_ASSOC);
+			} else if ($type == self::FETCH) {
+				$data = $statement->fetch(\PDO::FETCH_ASSOC);
+			} else if ($type == self::FETCH_COLUMN) {
+				$data = $statement->fetchColumn(\PDO::FETCH_ASSOC);
+			} else if ($type == self::ROW_COUNT) {
+				$data = $statement->rowCount();
 			}
-		} catch (\Throwable $throwable) {
-			$data = $this->logger->addError($this->sql . '. error: ' . $throwable->getMessage(), 'mysql');
-		} finally {
 			$this->db->release($pdo, false);
 			return $data;
+		} catch (\Throwable $throwable) {
+			if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
+				$this->db->restore(false);
+
+				return $this->search($type);
+			}
+
+			$this->db->release($pdo, false);
+
+			return $this->logger->addError($this->sql . '. error: ' . $throwable->getMessage(), 'mysql');
+		}
+	}
+
+
+	private function longExecuteTime($time)
+	{
+		if (($over = microtime(true) - $time) >= 0.50) {
+			$this->logger->warning($this->sql . '. use time : ' . $over . 'ms');
 		}
 	}