From b02c9190019be5733b67d249920ea208c6c173e3 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sun, 21 Oct 2018 00:44:45 -0700 Subject: [PATCH] Remove unused fields in ForeignDBViaLBRepo Change-Id: Ia60139c5670ad572058cf39c7e7bf78972d29d9f --- includes/filerepo/ForeignDBViaLBRepo.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/includes/filerepo/ForeignDBViaLBRepo.php b/includes/filerepo/ForeignDBViaLBRepo.php index 302b194a2c..ad6ec472f4 100644 --- a/includes/filerepo/ForeignDBViaLBRepo.php +++ b/includes/filerepo/ForeignDBViaLBRepo.php @@ -23,7 +23,7 @@ use MediaWiki\MediaWikiServices; use Wikimedia\Rdbms\IDatabase; -use Wikimedia\Rdbms\LoadBalancer; +use Wikimedia\Rdbms\ILoadBalancer; /** * A foreign repository with a MediaWiki database accessible via the configured LBFactory @@ -34,12 +34,6 @@ class ForeignDBViaLBRepo extends LocalRepo { /** @var string */ protected $wiki; - /** @var string */ - protected $dbName; - - /** @var string */ - protected $tablePrefix; - /** @var array */ protected $fileFactory = [ ForeignDBFile::class, 'newFromTitle' ]; @@ -55,7 +49,6 @@ class ForeignDBViaLBRepo extends LocalRepo { function __construct( $info ) { parent::__construct( $info ); $this->wiki = $info['wiki']; - list( $this->dbName, $this->tablePrefix ) = wfSplitWikiID( $this->wiki ); $this->hasSharedCache = $info['hasSharedCache']; } @@ -83,10 +76,11 @@ class ForeignDBViaLBRepo extends LocalRepo { } /** - * @return LoadBalancer + * @return ILoadBalancer */ protected function getDBLoadBalancer() { $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); + return $lbFactory->getMainLB( $this->wiki ); } -- 2.20.1