From ea09cb139dcfcc30c570b52f46b6ad4fc672fe56 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 24 Oct 2016 14:53:24 -0700 Subject: [PATCH] Cleanup unused LBFactory $domain arguments Change-Id: I17b409a71e263ff5e0175f6a35fb9c5288f00c11 --- includes/libs/rdbms/lbfactory/ILBFactory.php | 13 +++++-------- includes/libs/rdbms/lbfactory/LBFactory.php | 6 ++---- .../libs/rdbms/lbfactory/LBFactoryMulti.php | 17 +++-------------- .../libs/rdbms/lbfactory/LBFactorySimple.php | 17 +++-------------- .../libs/rdbms/lbfactory/LBFactorySingle.php | 18 ++++++++---------- 5 files changed, 21 insertions(+), 50 deletions(-) diff --git a/includes/libs/rdbms/lbfactory/ILBFactory.php b/includes/libs/rdbms/lbfactory/ILBFactory.php index 9c9f18d2b0..ff1bd4370b 100644 --- a/includes/libs/rdbms/lbfactory/ILBFactory.php +++ b/includes/libs/rdbms/lbfactory/ILBFactory.php @@ -86,28 +86,25 @@ interface ILBFactory { /** * Create a new load balancer for external storage. The resulting object will be - * untracked, not chronology-protected, and the caller is responsible for - * cleaning it up. + * untracked, not chronology-protected, and the caller is responsible for cleaning it up. * * This method is for only advanced usage and callers should almost always use * getExternalLB() instead. This method can be useful when a table is used as a * key/value store. In that cases, one might want to query it in autocommit mode * (DBO_TRX off) but still use DBO_TRX transaction rounds on other tables. * - * @param string $cluster External storage cluster, or false for core - * @param bool|string $domain Domain ID, or false for the current domain + * @param string $cluster External storage cluster name * @return ILoadBalancer */ - public function newExternalLB( $cluster, $domain = false ); + public function newExternalLB( $cluster ); /** * Get a cached (tracked) load balancer for external storage * - * @param string $cluster External storage cluster, or false for core - * @param bool|string $domain Domain ID, or false for the current domain + * @param string $cluster External storage cluster name * @return ILoadBalancer */ - public function getExternalLB( $cluster, $domain = false ); + public function getExternalLB( $cluster ); /** * Execute a function for each tracked load balancer diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php b/includes/libs/rdbms/lbfactory/LBFactory.php index f3a3275e75..d21289be1a 100644 --- a/includes/libs/rdbms/lbfactory/LBFactory.php +++ b/includes/libs/rdbms/lbfactory/LBFactory.php @@ -153,18 +153,16 @@ abstract class LBFactory implements ILBFactory { /** * @see ILBFactory::newExternalLB() * @param string $cluster - * @param bool $domain * @return LoadBalancer */ - abstract public function newExternalLB( $cluster, $domain = false ); + abstract public function newExternalLB( $cluster ); /** * @see ILBFactory::getExternalLB() * @param string $cluster - * @param bool $domain * @return LoadBalancer */ - abstract public function getExternalLB( $cluster, $domain = false ); + abstract public function getExternalLB( $cluster ); /** * Call a method of each tracked load balancer diff --git a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php index 83ca65076a..a7cc16c643 100644 --- a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php +++ b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php @@ -255,13 +255,7 @@ class LBFactoryMulti extends LBFactory { return $this->mainLBs[$section]; } - /** - * @param string $cluster - * @param DatabaseDomain|string|bool $domain Domain ID, or false for the current domain - * @throws InvalidArgumentException - * @return LoadBalancer - */ - public function newExternalLB( $cluster, $domain = false ) { + public function newExternalLB( $cluster ) { if ( !isset( $this->externalLoads[$cluster] ) ) { throw new InvalidArgumentException( __METHOD__ . ": Unknown cluster \"$cluster\"" ); } @@ -281,14 +275,9 @@ class LBFactoryMulti extends LBFactory { ); } - /** - * @param string $cluster External storage cluster, or false for core - * @param DatabaseDomain|string|bool $domain Domain ID, or false for the current domain - * @return LoadBalancer - */ - public function getExternalLB( $cluster, $domain = false ) { + public function getExternalLB( $cluster ) { if ( !isset( $this->extLBs[$cluster] ) ) { - $this->extLBs[$cluster] = $this->newExternalLB( $cluster, $domain ); + $this->extLBs[$cluster] = $this->newExternalLB( $cluster ); $this->getChronologyProtector()->initLB( $this->extLBs[$cluster] ); } diff --git a/includes/libs/rdbms/lbfactory/LBFactorySimple.php b/includes/libs/rdbms/lbfactory/LBFactorySimple.php index 674bafd991..1e69d8fd3c 100644 --- a/includes/libs/rdbms/lbfactory/LBFactorySimple.php +++ b/includes/libs/rdbms/lbfactory/LBFactorySimple.php @@ -91,13 +91,7 @@ class LBFactorySimple extends LBFactory { return $this->mainLB; } - /** - * @param string $cluster - * @param bool|string $domain - * @return LoadBalancer - * @throws InvalidArgumentException - */ - public function newExternalLB( $cluster, $domain = false ) { + public function newExternalLB( $cluster ) { if ( !isset( $this->externalClusters[$cluster] ) ) { throw new InvalidArgumentException( __METHOD__ . ": Unknown cluster \"$cluster\"." ); } @@ -105,14 +99,9 @@ class LBFactorySimple extends LBFactory { return $this->newLoadBalancer( $this->externalClusters[$cluster] ); } - /** - * @param string $cluster - * @param bool|string $domain - * @return LoadBalancer - */ - public function getExternalLB( $cluster, $domain = false ) { + public function getExternalLB( $cluster ) { if ( !isset( $this->extLBs[$cluster] ) ) { - $this->extLBs[$cluster] = $this->newExternalLB( $cluster, $domain ); + $this->extLBs[$cluster] = $this->newExternalLB( $cluster ); $this->getChronologyProtector()->initLB( $this->extLBs[$cluster] ); } diff --git a/includes/libs/rdbms/lbfactory/LBFactorySingle.php b/includes/libs/rdbms/lbfactory/LBFactorySingle.php index a64117ffa8..e1168882ac 100644 --- a/includes/libs/rdbms/lbfactory/LBFactorySingle.php +++ b/includes/libs/rdbms/lbfactory/LBFactorySingle.php @@ -55,36 +55,34 @@ class LBFactorySingle extends LBFactory { } /** - * @param bool|string $wiki + * @param bool|string $domain (unused) * @return LoadBalancerSingle */ - public function newMainLB( $wiki = false ) { + public function newMainLB( $domain = false ) { return $this->lb; } /** - * @param bool|string $wiki + * @param bool|string $domain (unused) * @return LoadBalancerSingle */ - public function getMainLB( $wiki = false ) { + public function getMainLB( $domain = false ) { return $this->lb; } /** - * @param string $cluster External storage cluster, or false for core - * @param bool|string $wiki Wiki ID, or false for the current wiki + * @param string $cluster External storage cluster name (unused) * @return LoadBalancerSingle */ - public function newExternalLB( $cluster, $wiki = false ) { + public function newExternalLB( $cluster ) { return $this->lb; } /** - * @param string $cluster External storage cluster, or false for core - * @param bool|string $wiki Wiki ID, or false for the current wiki + * @param string $cluster External storage cluster name (unused) * @return LoadBalancerSingle */ - public function getExternalLB( $cluster, $wiki = false ) { + public function getExternalLB( $cluster ) { return $this->lb; } -- 2.20.1