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

变更

Browse Source
This commit is contained in:
向林
2023-02-13 17:00:32 +08:00
parent 677bb7ad42
commit af3e6d580e
2 changed files with 34 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Connection.php
+26 -24
View File
@@ -223,7 +223,7 @@ class Connection extends Component
if ($pdo->inTransaction()) {
$pdo->rollback();
}
$this->release($pdo, true);
$this->release(true);
}
/**
@@ -236,7 +236,7 @@ class Connection extends Component
if ($pdo->inTransaction()) {
$pdo->commit();
}
$this->release($pdo, true);
$this->release(true);
}
@@ -255,12 +255,7 @@ class Connection extends Component
public function restore($isMaster)
{
if ($isMaster) {
Context::remove($this->cds . 'master');
} else {
$slave = ($this->slaveConfig['cds'] ?? $this->cds) . 'slave';
Context::remove($slave);
}
Context::remove($this->alias($isMaster));
}
@@ -269,16 +264,27 @@ class Connection extends Component
* 回收链接
* @throws
*/
public function release(PDO $pdo, bool $isMaster)
public function release(bool $isMaster)
{
$connections = $this->connection;
if (!$isMaster) {
$connections->addItem(($this->slaveConfig['cds'] ?? $this->cds) . 'slave', $pdo);
} else {
if (!$pdo->inTransaction()) {
$connections->addItem($this->cds . 'master', $pdo);
}
$name = $this->alias($isMaster);
if (!Context::hasContext($name)) {
return;
}
$connections = $this->connection;
if (($pdo = Context::getContext($name)) instanceof PDO) {
$connections->addItem($name, $pdo);
}
Context::remove($name);
}
/**
* @param bool $isMaster
* @return string
*/
private function alias(bool $isMaster): string
{
return !$isMaster ? ($this->slaveConfig['cds'] ?? $this->cds) . 'slave' : $this->cds . 'master';
}
@@ -289,10 +295,8 @@ class Connection extends Component
*/
public function clear_connection()
{
$cds = $this->slaveConfig['cds'] ?? $this->cds;
$this->connection->connection_clear($cds . 'master');
$this->connection->connection_clear($cds . 'slave');
$this->connection->connection_clear($this->alias(true));
$this->connection->connection_clear($this->alias(false));
}
@@ -301,10 +305,8 @@ class Connection extends Component
*/
public function disconnect()
{
$cds = $this->slaveConfig['cds'] ?? $this->cds;
$this->connection->connection_clear($cds . 'master');
$this->connection->connection_clear($cds . 'slave');
$this->connection->connection_clear($this->alias(true));
$this->connection->connection_clear($this->alias(false));
}
}