as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-07-05 10:37:29 +08:00
parent 6612040b3a
commit a671719896
2 changed files with 75 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/Connection.php
+24 -15
View File
@@ -17,6 +17,7 @@ use JetBrains\PhpStorm\Pure;
use PDO;
use ReflectionException;
use Snowflake\Abstracts\Component;
use Snowflake\Abstracts\Config;
use Snowflake\Event;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake;
@@ -106,9 +107,11 @@ class Connection extends Component
public function fill()
{
$connections = $this->connections();
$connections->initConnections('mysql', $this->cds, true, $this->maxNumber);
if (!empty($this->slaveConfig)) {
$connections->initConnections('mysql', $this->slaveConfig['cds'], false, $this->maxNumber);
$pool = Config::get('databases.pool.max',10);
$connections->initConnections('mysql', $this->cds, true, $pool);
if (!empty($this->slaveConfig) && $this->cds != $this->slaveConfig['cds']) {
$connections->initConnections('mysql', $this->slaveConfig['cds'], false, $pool);
}
}
@@ -258,12 +261,13 @@ class Connection extends Component
}
/**
* @param $sql
* @param null $sql
* @param string $dbname
* @param array $attributes
* @return Command
* @throws
* @throws Exception
*/
public function createCommand($sql = null, $dbname = '', array $attributes = []): Command
public function createCommand($sql = null, string $dbname = '', array $attributes = []): Command
{
if (!empty($dbname)) {
$sql = $this->clear($dbname, $sql);
@@ -273,7 +277,12 @@ class Connection extends Component
}
private function clear($dbname, $sql)
/**
* @param $dbname
* @param $sql
* @return array|string|null
*/
private function clear($dbname, $sql): array|string|null
{
$substr = strtoupper(substr($sql, 0, 6));
return match ($substr) {
@@ -300,9 +309,9 @@ class Connection extends Component
/**
* @param $dbname
* @param $sql
* @return array|string|string[]|null
* @return array|string|null
*/
private function innerJoinMatch($dbname, $sql)
private function innerJoinMatch($dbname, $sql): array|string|null
{
return preg_replace('/(INNER|LEFT|RIGHT) JOIN\s+(\w+)\s/', '$1 JOIN `' . $dbname . '`.$2 ', $sql);
}
@@ -311,9 +320,9 @@ class Connection extends Component
/**
* @param $dbname
* @param $sql
* @return array|string|string[]|null
* @return array|string|null
*/
private function updateMatch($dbname, $sql)
private function updateMatch($dbname, $sql): array|string|null
{
return preg_replace('/UPDATE\s+(\w+)\s+SET/', 'UPDATE `' . $dbname . '`.$1 SET', $sql);
}
@@ -322,9 +331,9 @@ class Connection extends Component
/**
* @param $dbname
* @param $sql
* @return array|string|string[]|null
* @return array|string|null
*/
private function insertMatch($dbname, $sql)
private function insertMatch($dbname, $sql): array|string|null
{
return preg_replace('/INSERT INTO\s+(\w+)/', 'INSERT INTO `' . $dbname . '`.$1', $sql);
}
@@ -333,9 +342,9 @@ class Connection extends Component
/**
* @param $dbname
* @param $sql
* @return array|string|string[]|null
* @return array|string|null
*/
private function truncateMatch($dbname, $sql)
private function truncateMatch($dbname, $sql): array|string|null
{
return preg_replace('/TRUNCATE\s+(\w+)\s+/', 'TRUNCATE `' . $dbname . '`.$1', $sql);
}
System/Abstracts/Pool.php
+31 -16
View File
@@ -73,17 +73,16 @@ abstract class Pool extends Component
/**
* @throws Exception
*/
public function Heartbeat_detection()
public function Heartbeat_detection(string $name)
{
if (env('state') == 'exit') {
Timer::clear($this->creates);
$this->creates = -1;
} else if ($this->lastTime != 0) {
[$firstClear, $lastClear] = $this->getClearTime();
if ($this->lastTime + $firstClear < time()) {
$this->flush(0);
} else if ($this->lastTime + $lastClear < time()) {
$this->flush(2);
} else {
$min = Config::get('databases.pool.min', 1);
$channel = $this->getChannel($name);
if ($channel->length() > $min) {
$this->flush($min);
}
}
}
@@ -147,7 +146,7 @@ abstract class Pool extends Component
* @param false $isMaster
* @param int $max
*/
public function initConnections($driver, $name, $isMaster = false, $max = 60)
public function initConnections($driver, $name, bool $isMaster = false, int $max = 60)
{
$name = $this->name($driver, $name, $isMaster);
if (isset(static::$_items[$name]) && static::$_items[$name] instanceof Channel) {
@@ -156,8 +155,23 @@ abstract class Pool extends Component
if (Coroutine::getCid() === -1) {
return;
}
static::$_items[$name] = new Channel((int)$max);
$this->max = (int)$max;
static::$_items[$name] = new Channel($max);
$this->max = $max;
}
/**
* @param $name
* @return Channel
* @throws ConfigException
*/
private function getChannel($name): Channel
{
$channel = static::$_items[$name] ?? new Channel(Config::get('databases.pool.max', 10));
if (!((static::$_items[$name] ?? null) instanceof Channel)) {
static::$_items[$name] = $channel;
}
return $channel;
}
@@ -172,16 +186,17 @@ abstract class Pool extends Component
if (Coroutine::getCid() === -1) {
return $this->createClient($name, $callback);
}
$channel = static::$_items[$name] ?? new Channel($this->max);
if (!((static::$_items[$name] ?? null) instanceof Channel)) {
static::$_items[$name] = $channel;
}
$channel = $this->getChannel($name);
if (!$channel->isEmpty()) {
$connection = $channel->pop();
if ($this->checkCanUse($name, $connection)) {
return $connection;
}
}
if ($this->creates === -1 && !is_callable($callback)) {
$this->creates = Timer::tick(1000, [$this, 'Heartbeat_detection'], $name);
}
return $this->createClient($name, $callback);
}
@@ -221,7 +236,7 @@ abstract class Pool extends Component
/**
* @param string $name
* @param $client
* @param mixed $client
* @return bool
* 检查连接可靠性
*/
@@ -233,7 +248,7 @@ abstract class Pool extends Component
/**
* @param array $config
* @param $isMaster
* @param bool $isMaster
* @return mixed
* @throws Exception
*/