Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Move LoadBalancerSingle to /libs/rdbms"

Browse source
This commit is contained in:
jenkins-bot 2016-09-18 01:27:50 +00:00 committed by Gerrit Code Review
commit 72953cd703
3 changed files with 76 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autoload.php
View file

@ -733,7 +733,7 @@ $wgAutoloadLocalClasses = [
'ListVariants' => __DIR__ . '/maintenance/language/listVariants.php',
'ListredirectsPage' => __DIR__ . '/includes/specials/SpecialListredirects.php',
'LoadBalancer' => __DIR__ . '/includes/libs/rdbms/loadbalancer/LoadBalancer.php',
'LoadBalancerSingle' => __DIR__ . '/includes/db/loadbalancer/LBFactorySingle.php',
'LoadBalancerSingle' => __DIR__ . '/includes/libs/rdbms/lbfactory/LBFactorySingle.php',
'LoadMonitor' => __DIR__ . '/includes/libs/rdbms/loadmonitor/LoadMonitor.php',
'LoadMonitorMySQL' => __DIR__ . '/includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php',
'LoadMonitorNull' => __DIR__ . '/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php',

48
includes/db/loadbalancer/LBFactorySingle.php
View file

@ -35,6 +35,10 @@ class LBFactorySingle extends LBFactory {
public function __construct( array $conf ) {
parent::__construct( $conf );
if ( !isset( $conf['connection'] ) ) {
throw new InvalidArgumentException( "Missing 'connection' argument." );
}
$this->lb = new LoadBalancerSingle( array_merge( $this->baseLoadBalancerParams(), $conf ) );
}
@ -80,47 +84,3 @@ class LBFactorySingle extends LBFactory {
call_user_func_array( $callback, array_merge( [ $this->lb ], $params ) );
}
}
/**
* Helper class for LBFactorySingle.
*/
class LoadBalancerSingle extends LoadBalancer {
/** @var IDatabase */
private $db;
/**
* @param array $params
*/
public function __construct( array $params ) {
$this->db = $params['connection'];
parent::__construct( [
'servers' => [
[
'type' => $this->db->getType(),
'host' => $this->db->getServer(),
'dbname' => $this->db->getDBname(),
'load' => 1,
]
],
'trxProfiler' => isset( $params['trxProfiler'] ) ? $params['trxProfiler'] : null,
'srvCache' => isset( $params['srvCache'] ) ? $params['srvCache'] : null,
'wanCache' => isset( $params['wanCache'] ) ? $params['wanCache'] : null
] );
if ( isset( $params['readOnlyReason'] ) ) {
$this->db->setLBInfo( 'readOnlyReason', $params['readOnlyReason'] );
}
}
/**
*
* @param string $server
* @param bool $dbNameOverride
*
* @return IDatabase
*/
protected function reallyOpenConnection( $server, $dbNameOverride = false ) {
return $this->db;
}
}

71
includes/libs/rdbms/lbfactory/LBFactorySingle.php Normal file
View file

@ -0,0 +1,71 @@
<?php
/**
* Simple generator of database connections that always returns the same object.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* @file
* @ingroup Database
*/
/**
* Trivial LoadBalancer that always returns an injected connection handle
*/
class LoadBalancerSingle extends LoadBalancer {
/** @var IDatabase */
private $db;
/**
* @param array $params An associative array with one member:
* - connection: An IDatabase connection object
*/
public function __construct( array $params ) {
if ( !isset( $params['connection'] ) ) {
throw new InvalidArgumentException( "Missing 'connection' argument." );
}
$this->db = $params['connection'];
parent::__construct( [
'servers' => [
[
'type' => $this->db->getType(),
'host' => $this->db->getServer(),
'dbname' => $this->db->getDBname(),
'load' => 1,
]
],
'trxProfiler' => isset( $params['trxProfiler'] ) ? $params['trxProfiler'] : null,
'srvCache' => isset( $params['srvCache'] ) ? $params['srvCache'] : null,
'wanCache' => isset( $params['wanCache'] ) ? $params['wanCache'] : null
] );
if ( isset( $params['readOnlyReason'] ) ) {
$this->db->setLBInfo( 'readOnlyReason', $params['readOnlyReason'] );
}
}
/**
*
* @param string $server
* @param bool $dbNameOverride
*
* @return IDatabase
*/
protected function reallyOpenConnection( $server, $dbNameOverride = false ) {
return $this->db;
}
}